diff --git a/.clang-format b/.clang-format
index c700d9700..1b47c9d29 100644
--- a/.clang-format
+++ b/.clang-format
@@ -70,7 +70,7 @@ IncludeCategories:
   - Regex:           '^<.*'
     Priority:        3
 # IncludeIsMainRegex: '(Test)?$'
-IndentCaseLabels: false 
+IndentCaseLabels: false
 #IndentPPDirectives: AfterHash
 IndentWidth:     4
 # IndentWrappedFunctionNames: false
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 2c5ca438b..9acad9d41 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -7,14 +7,147 @@ on:
     branches: [ master ]
 
 permissions:
-  contents: read # to fetch code (actions/checkout)
+  contents: write # to fetch code (actions/checkout),and release
 
 jobs:
-  job:
+  build:
     name: ${{ matrix.name }}-build-and-test
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
+      matrix:
+        name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, windows-latest-clang.exe, ubuntu-latest-clang++]
+        # For Windows msvc, for Linux and macOS let's use the clang compiler, use gcc for Linux.
+        include:
+          - name: windows-latest-clang.exe
+            os: windows-latest
+            cxx: clang++.exe
+            cc: clang.exe
+          - name: windows-latest-cl.exe
+            os: windows-latest
+            cxx: cl.exe
+            cc: cl.exe
+          - name: windows-hunter-latest-cl.exe
+            os: windows-latest
+            cxx: cl.exe
+            cc: cl.exe
+          - name: ubuntu-latest-clang++
+            os: ubuntu-latest
+            cxx: clang++
+            cc: clang
+          - name: macos-latest-clang++
+            os: macos-latest
+            cxx: clang++
+            cc: clang
+          - name: ubuntu-latest-g++
+            os: ubuntu-latest
+            cxx: g++
+            cc: gcc
+
+    steps:
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2
+      
+    - uses: actions/checkout@v4
+      with:
+          submodules: true
+          
+    - uses: lukka/get-cmake@latest
+    
+    - uses: ilammy/msvc-dev-cmd@v1
+    
+    - name: Set Compiler Environment
+      uses: lukka/set-shell-env@v1
+      with:
+        CXX: ${{ matrix.cxx }}
+        CC: ${{ matrix.cc }}
+
+    - name: Cache DX SDK
+      id: dxcache
+      if: contains(matrix.name, 'windows')
+      uses: actions/cache@v4
+      with:
+        path: '${{ github.workspace }}/DX_SDK'
+        key: ${{ runner.os }}-DX_SDK
+        restore-keys: |
+          ${{ runner.os }}-DX_SDK
+
+    - name: Download DXSetup
+      if: contains(matrix.name, 'windows-latest-cl.exe') && steps.dxcache.outputs.cache-hit != 'true'
+      run: |
+        curl -s -o DXSDK_Jun10.exe --location https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe
+        cmd.exe /c start /wait .\DXSDK_Jun10.exe /U /O /F /S /P "${{ github.workspace }}\DX_SDK"
+
+    - name: Set Windows specific CMake arguments
+      if: contains(matrix.name, 'windows-latest-cl.exe')
+      id: windows_extra_cmake_args
+      run: echo ":set-output name=args::=-DASSIMP_BUILD_ASSIMP_TOOLS=1 -DASSIMP_BUILD_ASSIMP_VIEW=1" >> $GITHUB_OUTPUT
+    
+    - name: Set Hunter specific CMake arguments
+      if: contains(matrix.name, 'hunter')
+      id: hunter_extra_cmake_args
+      run: echo "args=-DBUILD_SHARED_LIBS=OFF -DASSIMP_HUNTER_ENABLED=ON -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/cmake/polly/${{ matrix.toolchain }}.cmake" >> $GITHUB_OUTPUT
+
+    - name: configure and build
+      uses: lukka/run-cmake@v3
+      env:
+        DXSDK_DIR: '${{ github.workspace }}/DX_SDK'
+
+      with:
+        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
+        cmakeAppendedArgs: '-GNinja -DCMAKE_BUILD_TYPE=Release ${{ steps.windows_extra_cmake_args.outputs.args }} ${{ steps.hunter_extra_cmake_args.outputs.args }}'
+        buildWithCMakeArgs: '--parallel 24 -v'
+        buildDirectory: '${{ github.workspace }}/build/'
+        
+    - name: Exclude certain tests in Hunter specific builds
+      if: contains(matrix.name, 'hunter')
+      id: hunter_extra_test_args
+      run: echo "args=--gtest_filter=-utOpenGEXImportExport.Importissue1340_EmptyCameraObject:utColladaZaeImportExport.importBlenFromFileTest" >> $GITHUB_OUTPUT
+
+    - name: test
+      run: cd build/bin && ./unit ${{ steps.hunter_extra_test_args.outputs.args }}
+      shell: bash
+
+    - uses: actions/upload-artifact@v4
+      if: matrix.name == 'windows-msvc'
+      with:
+        name: 'assimp-bins-${{ matrix.name }}'
+        path: build/bin/assimp*.exe
+        
+    - uses: marvinpinto/action-automatic-releases@latest
+      if: contains(matrix.name, 'windows-msvc-hunter')
+      with:
+        repo_token: "${{ secrets.GITHUB_TOKEN }}"
+        automatic_release_tag: "master"
+        prerelease: true
+        title: "AutoRelease"
+        files: |
+          build/bin/assimp*.exe
+
+  create-release:
+    needs: [build]
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+      - id: create-release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: '${{secrets.GITHUB_TOKEN}}'
+        with:
+          tag_name: '${{github.ref}}'
+          release_name: 'Release ${{github.ref}}'
+          draft: false
+          prerelease: true
+      - run: |
+          echo '${{steps.create-release.outputs.upload_url}}' > release_upload_url.txt
+      - uses: actions/upload-artifact@v4
+        with:
+          name: create-release
+          path: release_upload_url.txt
+
+  upload-release:
+    strategy:
       matrix:
         name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, ubuntu-latest-clang++, ubuntu-gcc-hunter, macos-clang-hunter, windows-msvc-hunter]
         # For Windows msvc, for Linux and macOS let's use the clang compiler, use gcc for Linux.
@@ -44,85 +177,24 @@ jobs:
           - name: windows-msvc-hunter
             os: windows-latest
             toolchain: ninja-vs-win64-cxx17
-
+            
+    needs: [create-release]
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
     steps:
-    - uses: actions/checkout@v4
-      with:
-          submodules: true
-          
-    - uses: lukka/get-cmake@latest
-    
-    - uses: ilammy/msvc-dev-cmd@v1
-    
-    - name: Set Compiler Environment
-      if: "!endsWith(matrix.name, 'hunter')"
-      uses: lukka/set-shell-env@v1
-      with:
-        CXX: ${{ matrix.cxx }}
-        CC: ${{ matrix.cc }}
-
-    - name: Set Compiler Environment for Hunter on Windows
-      if: startsWith(matrix.name, 'windows') && endsWith(matrix.name, 'hunter')
-      uses: lukka/set-shell-env@v1
-      with:
-        VS160COMNTOOLS: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools
-
-    - name: Checkout Hunter toolchains
-      if: endsWith(matrix.name, 'hunter')
-      uses: actions/checkout@v4
-      with:
-        repository: cpp-pm/polly
-        path: cmake/polly
-
-    - name: Cache DX SDK
-      id: dxcache
-      if: contains(matrix.name, 'windows')
-      uses: actions/cache@v3
-      with:
-        path: '${{ github.workspace }}/DX_SDK'
-        key: ${{ runner.os }}-DX_SDK
-        restore-keys: |
-          ${{ runner.os }}-DX_SDK
-
-    - name: Download DXSetup
-      if: contains(matrix.name, 'windows') && steps.dxcache.outputs.cache-hit != 'true'
-      run: |
-        curl -s -o DXSDK_Jun10.exe --location https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe
-        cmd.exe /c start /wait .\DXSDK_Jun10.exe /U /O /F /S /P "${{ github.workspace }}\DX_SDK"
-
-    - name: Set Windows specific CMake arguments
-      if: contains(matrix.name, 'windows')
-      id: windows_extra_cmake_args
-      run: echo "::set-output name=args::-DASSIMP_BUILD_ASSIMP_TOOLS=1 -DASSIMP_BUILD_ASSIMP_VIEW=1 -DASSIMP_BUILD_ZLIB=1"
-    
-    - name: Set Hunter specific CMake arguments
-      if: contains(matrix.name, 'hunter')
-      id: hunter_extra_cmake_args
-      run: echo "::set-output name=args::-DBUILD_SHARED_LIBS=OFF -DASSIMP_HUNTER_ENABLED=ON -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/cmake/polly/${{ matrix.toolchain }}.cmake"
-
-    - name: configure and build
-      uses: lukka/run-cmake@v3
-      env:
-        DXSDK_DIR: '${{ github.workspace }}/DX_SDK'
-
-      with:
-        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
-        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
-        cmakeAppendedArgs: '-GNinja -DCMAKE_BUILD_TYPE=Release ${{ steps.windows_extra_cmake_args.outputs.args }} ${{ steps.hunter_extra_cmake_args.outputs.args }}'
-        buildWithCMakeArgs: '--parallel 24 -v'
-        buildDirectory: '${{ github.workspace }}/build/'
-        
-    - name: Exclude certain tests in Hunter specific builds
-      if: contains(matrix.name, 'hunter')
-      id: hunter_extra_test_args
-      run: echo "::set-output name=args::--gtest_filter=-utOpenGEXImportExport.Importissue1340_EmptyCameraObject:utColladaZaeImportExport.importBlenFromFileTest"
-
-    - name: test
-      run: cd build/bin && ./unit ${{ steps.hunter_extra_test_args.outputs.args }}
-      shell: bash
-
-    - uses: actions/upload-artifact@v3
-      if: matrix.name == 'windows-msvc'
-      with:
-        name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}'
-        path: build/bin
+      - uses: softprops/action-gh-release@v2
+        with:
+          name: create-release
+      - id: upload-url
+        run: |
+          echo "url=$(cat create-release/release_upload_url.txt)" >> $GITHUB_OUTPUT
+      - uses: actions/download-artifact@v4
+        with:
+          name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}'
+      - uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: '${{secrets.GITHUB_TOKEN}}'
+        with:
+          files: |
+            *.zip
+ 
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
new file mode 100644
index 000000000..a5ec10c7a
--- /dev/null
+++ b/.github/workflows/cd.yml
@@ -0,0 +1,52 @@
+name: Build and Publish Prebuilt Binaries
+
+on:
+  release:
+    types: [created]
+    
+jobs:
+  build:
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: windows-x64
+            os: windows-latest
+            arch: x64
+          - name: windows-x86
+            os: windows-latest
+            arch: x86
+            cmake_args: -A Win32
+          - name: macos-x64
+            os: macos-13
+          - name: macos-arm64
+            os: macos-latest
+          - name: linux-x64
+            os: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4.2.2
+
+      - uses: lukka/get-cmake@latest
+
+      - uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{ matrix.arch }}
+      
+      - name: Build
+        run: |
+          cmake -B build -S . ${{ matrix.cmake_args }} -DCMAKE_BUILD_TYPE=Release -DASSIMP_BUILD_TESTS=OFF
+          cmake --build build --config Release
+
+      - uses: TheDoctor0/zip-release@0.7.6
+        with:
+          filename: ${{ matrix.name }}-${{ github.event.release.tag_name }}.zip
+          directory: build/bin/
+
+      - uses: softprops/action-gh-release@v2
+        with:
+          files: build/bin/${{ matrix.name }}-${{ github.event.release.tag_name }}.zip
+          append_body: true
+          fail_on_unmatched_files: true
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index a84be8cbc..38f54ce06 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -19,7 +19,7 @@ jobs:
         dry-run: false
         language: c++
     - name: Upload Crash
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts
diff --git a/.github/workflows/inno_setup b/.github/workflows/inno_setup
new file mode 100644
index 000000000..92f16918e
--- /dev/null
+++ b/.github/workflows/inno_setup
@@ -0,0 +1,51 @@
+name: Build Windows Installer
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+jobs:
+  build:
+    name: Build the Inno Setup Installer
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: lukka/get-cmake@latest
+      - uses: ilammy/msvc-dev-cmd@v1
+
+
+      - name: Cache DX SDK
+        id: dxcache
+        uses: actions/cache@v4
+        with:
+          path: '${{ github.workspace }}/DX_SDK'
+          key: ${{ runner.os }}-DX_SDK
+          restore-keys: |
+            ${{ runner.os }}-DX_SDK
+
+      - name: Download DXSetup
+        run: |
+          curl -s -o DXSDK_Jun10.exe --location https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe
+          cmd.exe /c start /wait .\DXSDK_Jun10.exe /U /O /F /S /P "${{ github.workspace }}\DX_SDK"
+
+      - name: Set Windows specific CMake arguments
+        id: windows_extra_cmake_args
+        run: echo "::set-output name=args::-DASSIMP_BUILD_ASSIMP_TOOLS=1 -DASSIMP_BUILD_ASSIMP_VIEW=1 -DASSIMP_BUILD_ZLIB=1"
+
+      - name: configure and build
+        uses: lukka/run-cmake@v3
+        env:
+          DXSDK_DIR: '${{ github.workspace }}/DX_SDK'
+
+        with:
+          cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+          cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
+          cmakeAppendedArgs: '-GNinja -DCMAKE_BUILD_TYPE=Release ${{ steps.windows_extra_cmake_args.outputs.args }} ${{ steps.hunter_extra_cmake_args.outputs.args }}'
+          buildWithCMakeArgs: '--parallel 24 -v'
+          buildDirectory: '${{ github.workspace }}/build/'
+
+      - name: Compile .ISS to .EXE Installer
+        uses: Minionguyjpro/Inno-Setup-Action@v1.2.5
+        with:
+          path: packaging/windows-innosetup/script_x64.iss
+          options: /O+
diff --git a/.gitignore b/.gitignore
index 09d631ee8..68b6e8de4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,3 +120,9 @@ tools/assimp_qt_viewer/ui_mainwindow.h
 
 #Generated directory
 generated/*
+
+# 3rd party cloned repos/tarballs etc
+# meshlab repo, automatically cloned via CMake (to gain 2 source files for VRML file format conversion)
+contrib/meshlab/autoclone
+# tinyusdz repo, automatically cloned via CMake
+contrib/tinyusdz/autoclone
diff --git a/Build.md b/Build.md
index 9440a0073..440410032 100644
--- a/Build.md
+++ b/Build.md
@@ -1,36 +1,12 @@
 # Build / Install Instructions
 
-## Install on all platforms using vcpkg
-You can download and install assimp using the [vcpkg](https://github.com/Microsoft/vcpkg/) dependency manager:
-```bash
-    git clone https://github.com/Microsoft/vcpkg.git
-    cd vcpkg
-    ./bootstrap-vcpkg.sh
-    ./vcpkg integrate install
-    ./vcpkg install assimp
-```
-The assimp port in vcpkg is kept up to date by Microsoft team members and community contributors. If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository.
-
-## Install on Ubuntu
-You can install the Asset-Importer-Lib via apt:
-```
-sudo apt-get update
-sudo apt-get install libassimp-dev
-```
-
-## Install pyassimp
-You need to have pip installed:
-```
-pip install pyassimp
-```
-
 ## Manual build instructions
-
-### Install CMake
-Asset-Importer-Lib can be built for a lot of different platforms. We are using cmake to generate the build environment for these via cmake. So you have to make sure that you have a working cmake-installation on your system. You can download it at https://cmake.org/ or for linux install it via
-```bash
-sudo apt-get install cmake
-```
+### Install prerequisites
+You need to install
+* cmake
+* Your compiler (must support C++17 and C99 at least)
+* For Windows
+  *  DX-SDK 9 if you want to use our 3D-Viewer
 
 ### Get the source
 Make sure you have a working git-installation. Open a command prompt and clone the Asset-Importer-Lib via:
@@ -38,15 +14,22 @@ Make sure you have a working git-installation. Open a command prompt and clone t
 git clone https://github.com/assimp/assimp.git
 ```
 ### Build from source:
+* For *assimp.lib* without any tools:
 ```bash
 cd assimp
-cmake CMakeLists.txt 
+cmake CMakeLists.txt
+cmake --build .
+```
+
+* For assimp with the common tools like *assimp-cmd*
+```bash
+cd assimp
+cmake CMakeLists.txt -DASSIMP_BUILD_ASSIMP_TOOLS=ON
 cmake --build .
 ```
 Note that by default this builds a shared library into the `bin` directory. If you want to build it as a static library see the build options at the bottom of this file.
 
 ### Build instructions for Windows with Visual-Studio
-
 First, you have to install Visual-Studio on your windows-system. You can get the Community-Version for free here: https://visualstudio.microsoft.com/de/downloads/
 To generate the build environment for your IDE open a command prompt, navigate to your repo and type:
 ```bash
@@ -57,19 +40,8 @@ This will generate the project files for the visual studio. All dependencies use
 ### Build instructions for Windows with UWP
 See <https://stackoverflow.com/questions/40803170/cmake-uwp-using-cmake-to-build-universal-windows-app>
 
-### Build instructions for Linux / Unix
-Open a terminal and got to your repository. You can generate the makefiles and build the library via:
-
-```bash
-cmake CMakeLists.txt
-make -j4
-```
-The option -j describes the number of parallel processes for the build. In this case make will try to use 4 cores for the build.
-
-If you want to use an IDE for linux you can try QTCreator for instance. 
-
 ### Build instructions for MinGW
- Older versions of MinGW's compiler (e.g. 5.1.0) do not support the -mbig_obj flag 
+ Older versions of MinGW's compiler (e.g. 5.1.0) do not support the -mbig_obj flag
 required to compile some of assimp's files, especially for debug builds.
 Version 7.3.0 of g++-mingw-w64 & gcc-mingw-w64 appears to work.
 
@@ -111,3 +83,31 @@ The cmake-build-environment provides options to configure the build. The followi
 - **USE_STATIC_CRT (default OFF)**: Link against the static MSVC runtime libraries.
 - **ASSIMP_BUILD_DRACO (default OFF)**: Build Draco libraries. Primarily for glTF.
 - **ASSIMP_BUILD_ASSIMP_VIEW (default ON, if DirectX found, OFF otherwise)**: Build Assimp view tool (requires DirectX).
+
+### Install prebuild binaries
+## Install on all platforms using vcpkg
+You can download and install assimp using the [vcpkg](https://github.com/Microsoft/vcpkg/) dependency manager:
+```bash
+    git clone https://github.com/Microsoft/vcpkg.git
+    cd vcpkg
+    ./bootstrap-vcpkg.sh
+    ./vcpkg integrate install
+    ./vcpkg install assimp
+```
+The assimp port in vcpkg is kept up to date by Microsoft team members and community contributors. If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository.
+
+### Install on Ubuntu
+You can install the Asset-Importer-Lib via apt:
+```
+sudo apt-get update
+sudo apt-get install libassimp-dev
+```
+
+### Install pyassimp
+You need to have pip installed:
+```
+pip install pyassimp
+```
+
+### Get the SDK from itchi.io
+Just check [itchi.io](https://kimkulling.itch.io/the-asset-importer-lib)
diff --git a/CHANGES b/CHANGES
index c0c73b98c..3c4242239 100644
--- a/CHANGES
+++ b/CHANGES
@@ -290,7 +290,7 @@ FEATURES:
 	- Added support for 64 bit version header introduced in FbxSdk2016
 	- Travis: enable coverall support.
 	- PyAssimp: New version of the pyASSIMP 3D viewer, with much improved 3D controls
-    - Morph animation support for collada	
+    - Morph animation support for collada
 	- Added support for parameters Ni and Tf in OBJ/MTL file format
 	- aiScene: add method to add children
 	- Added new option to IFC importer to control tessellation angle + removed unused IFC option
@@ -300,7 +300,7 @@ FEATURES:
 	- travis ci: enable sudo support.
 	- openddlparser: integrate release v0.4.0
 	- aiMetaData: Added support for metadata in assbin format
-	
+
 FIXES/HOUSEKEEPING:
     - Introduce usage of #pragma statement
 	- Put cmake-scripts into their own folder
@@ -352,7 +352,7 @@ FIXES/HOUSEKEEPING:
 	- add vertex color export support ( issue 809 )
 	- Fix memory leak in Collada importer ( issue 1169 )
 	- add stp to the list of supported extensions for step-files ( issue 1183 )
-	- fix clang build ( Issue-1169 ) 
+	- fix clang build ( Issue-1169 )
 	- fix for FreeBSD
 	- Import FindPkgMacros to main CMake Configuration
 	- Extended support for tessellation parameter to more IFC shapes
@@ -375,7 +375,7 @@ FIXES/HOUSEKEEPING:
 	- Obj-Importer: do not break when detecting an overflow ( issue 1244 )
 	- Obj-Importer: fix parsing of multible line data definitions
 	- Fixed bug where IFC models with multiple IFCSite only loaded 1 site instead of the complete model
-	- PLYImporter: - optimize memory and speed on ply importer / change parser to use a file stream - manage texture path in ply 
+	- PLYImporter: - optimize memory and speed on ply importer / change parser to use a file stream - manage texture path in ply
 	  import - manage texture coords on faces in ply import - correction on point cloud faces generation
 	- Utf8: integrate new lib ( issue 1158 )
 	- fixed CMAKE_MODULE_PATH overwriting previous values
@@ -400,7 +400,7 @@ FIXES/HOUSEKEEPING:
 	- Remove std functions deprecated by C++11.
 	- X-Importer: make it deal with lines
 	- use correct path for compilers ( issue 1335 )
-	- Collada: add workaround to deal with polygon with holes 
+	- Collada: add workaround to deal with polygon with holes
 	- update python readme
 	- Use unique node names when loading Collada files
 	- Fixed many FBX bugs
@@ -429,7 +429,7 @@ FEATURES:
     - C4D: update to latest Melange-SDK
     - Add a gitter channel
     - Coverity check enabled
-    - Switch to <...> include brackets for public headers 
+    - Switch to <...> include brackets for public headers
     - Enable export by pyAssimp
     - CI: check windows build
     - Add functionality to perform a singlepost-processing step
@@ -564,7 +564,7 @@ API CHANGES:
      currently used, however ...)
    - Some Assimp::Importer methods are const now.
 
-   
+
 1.1 (2010-04-17)
 This is the list of relevant changes from the 1.0 (r412) release to 1.1 (r700).
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88f69174a..b0633b4e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Open Asset Import Library (assimp)
 # ----------------------------------------------------------------------
-# Copyright (c) 2006-2023, assimp team
+# Copyright (c) 2006-2025, assimp team
 #
 # All rights reserved.
 #
@@ -38,24 +38,76 @@ SET(CMAKE_POLICY_DEFAULT_CMP0012 NEW)
 SET(CMAKE_POLICY_DEFAULT_CMP0074 NEW)
 SET(CMAKE_POLICY_DEFAULT_CMP0092 NEW)
 
-CMAKE_MINIMUM_REQUIRED( VERSION 3.10 )
+CMAKE_MINIMUM_REQUIRED( VERSION 3.22 )
+
+#================================================================================#
+#                    Model formats not enabled by default
+#
+#    3rd party projects may not adhere to strict standards enforced by assimp,
+#    in which case those formats must be opt-in; otherwise the 3rd party code
+#    would fail assimp CI checks
+#================================================================================#
+# M3D format import support (assimp integration no longer supported by M3D format author)
+# User may override these in their CMake script to provide M3D import/export support
+# (M3D importer/exporter was disabled for assimp release 5.1 or later)
+OPTION(ASSIMP_BUILD_M3D_IMPORTER "Enable M3D file import" off)
+OPTION(ASSIMP_BUILD_M3D_EXPORTER "Enable M3D file export" off)
+
+# Experimental USD importer: disabled, need to opt-in
+# Note: assimp github PR automatic checks will fail the PR due to compiler warnings in
+# the external, 3rd party tinyusdz code which isn't technically part of the PR since it's
+# auto-cloned during build; so MUST disable the feature or the PR will be rejected
+OPTION(ASSIMP_BUILD_USD_IMPORTER "Enable USD file import" off)
+OPTION(ASSIMP_BUILD_USD_VERBOSE_LOGS "Enable verbose USD import debug logging" off)
+
+# VRML (.wrl/.x3dv) file import support by leveraging X3D importer and 3rd party file
+# format converter to convert .wrl/.x3dv files to X3D-compatible .xml
+# (Need to make this opt-in because 3rd party code triggers lots of CI code quality warnings)
+OPTION(ASSIMP_BUILD_VRML_IMPORTER "Enable VRML (.wrl/.x3dv) file import" off)
+
+#--------------------------------------------------------------------------------#
+#                  Internal impl for optional model formats
+#--------------------------------------------------------------------------------#
+# Internal/private M3D logic
+if (NOT ASSIMP_BUILD_M3D_IMPORTER)
+    ADD_DEFINITIONS( -DASSIMP_BUILD_NO_M3D_IMPORTER)
+endif () # if (not ASSIMP_BUILD_M3D_IMPORTER)
+if (NOT ASSIMP_BUILD_M3D_EXPORTER)
+    ADD_DEFINITIONS( -DASSIMP_BUILD_NO_M3D_EXPORTER)
+endif () # if (not ASSIMP_BUILD_M3D_EXPORTER)
+
+# Internal/private VRML logic
+if (NOT ASSIMP_BUILD_VRML_IMPORTER)
+    ADD_DEFINITIONS( -DASSIMP_BUILD_NO_VRML_IMPORTER)
+endif () # if (not ASSIMP_BUILD_VRML_IMPORTER)
+#================================================================================#
+
+option(ASSIMP_BUILD_USE_CCACHE "Use ccache to speed up compilation." on)
+
+IF(ASSIMP_BUILD_USE_CCACHE)
+  find_program(CCACHE_PATH ccache)
+  IF (CCACHE_PATH)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_PATH})
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_PATH})
+  ENDIF()
+ENDIF()
 
-# Disabled importers: m3d for 5.1
-ADD_DEFINITIONS( -DASSIMP_BUILD_NO_M3D_IMPORTER)
-ADD_DEFINITIONS( -DASSIMP_BUILD_NO_M3D_EXPORTER)
 # Toggles the use of the hunter package manager
 option(ASSIMP_HUNTER_ENABLED "Enable Hunter package manager support" OFF)
 
 IF(ASSIMP_HUNTER_ENABLED)
   include("cmake-modules/HunterGate.cmake")
   HunterGate(
-    URL "https://github.com/cpp-pm/hunter/archive/v0.24.18.tar.gz"
-    SHA1 "1292e4d661e1770d6d6ca08c12c07cf34a0bf718"
+    URL "https://github.com/cpp-pm/hunter/archive/v0.25.8.tar.gz"
+    SHA1 "26c79d587883ec910bce168e25f6ac4595f97033"
   )
-  add_definitions(-DASSIMP_USE_HUNTER)
+  ADD_DEFINITIONS(-DASSIMP_USE_HUNTER)
 ENDIF()
 
-PROJECT(Assimp VERSION 5.3.0)
+PROJECT(Assimp VERSION 6.0.2
+  LANGUAGES C CXX
+  DESCRIPTION "Open Asset Import Library (Assimp) is a library to import various well-known 3D model formats in a uniform manner."
+)
 
 # All supported options ###############################################
 
@@ -131,35 +183,35 @@ OPTION ( ASSIMP_IGNORE_GIT_HASH
 
 IF (WIN32)
   OPTION( ASSIMP_BUILD_ZLIB
-    "Build your own zlib"
+    "Build your zlib"
     ON
   )
 ELSE()
   OPTION( ASSIMP_BUILD_ZLIB
-    "Build your own zlib"
-    ON
+    "Build your zlib"
+    OFF
   )
 ENDIF()
 
 IF (WIN32)
-  # Use subset of Windows.h
+  # Use a subset of Windows.h
   ADD_DEFINITIONS( -DWIN32_LEAN_AND_MEAN )
 
   IF(MSVC)
     OPTION( ASSIMP_INSTALL_PDB
-      "Install MSVC debug files."
+      "Create MSVC debug symbol files and add to Install target."
       ON )
     IF(NOT (MSVC_VERSION LESS 1900))
-      # Multibyte character set is deprecated since at least MSVC2015 (possibly earlier)
+      # Multibyte character set has been deprecated since at least MSVC2015 (possibly earlier)
       ADD_DEFINITIONS( -DUNICODE -D_UNICODE )
     ENDIF()
 
-    # Link statically against c/c++ lib to avoid missing redistriburable such as
+    # Link statically against c/c++ lib to avoid missing redistributable such as
     # "VCRUNTIME140.dll not found. Try reinstalling the app.", but give users
     # a choice to opt for the shared runtime if they want.
     option(USE_STATIC_CRT "Link against the static runtime libraries." OFF)
 
-    # The CMAKE_CXX_FLAGS vars can be overriden by some Visual Studio generators, so we use an alternative
+    # The CMAKE_CXX_FLAGS vars can be overridden by some Visual Studio generators, so we use an alternative
     # global method here:
     if (${USE_STATIC_CRT})
       add_compile_options(
@@ -197,7 +249,7 @@ SET (ASSIMP_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
 SET (ASSIMP_VERSION_MINOR ${PROJECT_VERSION_MINOR})
 SET (ASSIMP_VERSION_PATCH ${PROJECT_VERSION_PATCH})
 SET (ASSIMP_VERSION ${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}.${ASSIMP_VERSION_PATCH})
-SET (ASSIMP_SOVERSION 5)
+SET (ASSIMP_SOVERSION 6)
 
 SET( ASSIMP_PACKAGE_VERSION "0" CACHE STRING "the package-specific version used for uploading the sources" )
 set(CMAKE_CXX_STANDARD 17)
@@ -249,21 +301,32 @@ SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names")
 IF( UNIX )
   # Use GNUInstallDirs for Unix predefined directories
   INCLUDE(GNUInstallDirs)
-  # Ensure that we do not run into issues like http://www.tcm.phy.cam.ac.uk/sw/inodes64.html on 32 bit linux
+  # Ensure that we do not run into issues like http://www.tcm.phy.cam.ac.uk/sw/inodes64.html on 32 bit Linux
   IF(NOT ${OPERATING_SYSTEM} MATCHES "Android")
-    IF ( CMAKE_SIZEOF_VOID_P EQUAL 4) # only necessary for 32-bit linux
+    IF ( CMAKE_SIZEOF_VOID_P EQUAL 4) # only necessary for 32-bit Linux
       ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 )
     ENDIF()
   ENDIF()
 ENDIF()
 
+IF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND WIN32)
+  ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
+  ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
+ENDIF()
+
+IF( MSVC OR "${CMAKE_CXX_SIMULATE_ID}" MATCHES "MSVC") # clang with MSVC ABI
+  ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
+  ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
+endif ()
+
+
 # Grouped compiler settings ########################################
 IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW AND NOT HAIKU)
   IF(NOT ASSIMP_HUNTER_ENABLED)
     SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
   ENDIF()
-  
-  IF(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 13)
+
+  IF(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 13 AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     MESSAGE(STATUS "GCC13 detected disabling \"-Wdangling-reference\" in Cpp files as it appears to be a false positive")
     ADD_COMPILE_OPTIONS("$<$<COMPILE_LANGUAGE:CXX>:-Wno-dangling-reference>")
   ENDIF()
@@ -284,22 +347,31 @@ ELSEIF(MSVC)
   ELSE() # msvc
     ADD_COMPILE_OPTIONS(/MP /bigobj)
   ENDIF()
-  
+
   # disable "elements of array '' will be default initialized" warning on MSVC2013
   IF(MSVC12)
-    ADD_COMPILE_OPTIONS(/wd4351)	
+    ADD_COMPILE_OPTIONS(/wd4351)
   ENDIF()
-  # supress warning for double to float conversion if Double precission is activated
-  ADD_COMPILE_OPTIONS(/wd4244) 
+  # supress warning for double to float conversion if Double precision 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}")
-  SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF")
+  # Allow user to disable PDBs
+  if(ASSIMP_INSTALL_PDB)
+    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
+    SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF")
+  elseif((GENERATOR_IS_MULTI_CONFIG) OR (CMAKE_BUILD_TYPE MATCHES Release))
+    message("-- MSVC PDB generation disabled. Release binary will not be debuggable.")
+  endif()
+  if(NOT /utf-8 IN_LIST CMAKE_CXX_FLAGS)
+    # Source code is encoded in UTF-8
+    ADD_COMPILE_OPTIONS(/source-charset:utf-8)
+  endif()
 ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
   IF(NOT ASSIMP_HUNTER_ENABLED)
     SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
   ENDIF()
-  SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long ${CMAKE_CXX_FLAGS}" )
-  SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
+  SET(CMAKE_CXX_FLAGS "-Wno-deprecated-non-prototype -fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long ${CMAKE_CXX_FLAGS}" )
+  SET(CMAKE_C_FLAGS "-Wno-deprecated-non-prototype -fno-strict-aliasing ${CMAKE_C_FLAGS}")
 ELSEIF( MINGW )
   IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
     message(FATAL_ERROR "MinGW is too old to be supported. Please update MinGW and try again.")
@@ -311,9 +383,9 @@ ELSEIF( MINGW )
     SET(CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS}")
   ENDIF()
     IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
-      SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long -Wa,-mbig-obj -g ${CMAKE_CXX_FLAGS}")
+      SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wno-dangling-reference -Wall -Wno-long-long -Wa,-mbig-obj -g ${CMAKE_CXX_FLAGS}")
     ELSE()
-      SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long -Wa,-mbig-obj -O3 ${CMAKE_CXX_FLAGS}")
+      SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wno-dangling-reference -Wall -Wno-long-long -Wa,-mbig-obj -O3 ${CMAKE_CXX_FLAGS}")
     ENDIF()
     SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
 ENDIF()
@@ -330,7 +402,7 @@ ENDIF()
 
 IF (ASSIMP_COVERALLS)
   MESSAGE(STATUS "Coveralls enabled")
-  
+
   INCLUDE(Coveralls)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
@@ -338,7 +410,7 @@ ENDIF()
 
 IF (ASSIMP_ASAN)
   MESSAGE(STATUS "AddressSanitizer enabled")
-  
+
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
   SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fsanitize=address")
 ENDIF()
@@ -422,20 +494,20 @@ ENDIF()
 set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
 
 IF(ASSIMP_HUNTER_ENABLED)
-  set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}")
-  set(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-hunter-config.cmake.in")
-  set(NAMESPACE "${PROJECT_NAME}::")
-  set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
-  set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
-  set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake")
+  SET(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}")
+  SET(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-hunter-config.cmake.in")
+  SET(NAMESPACE "${PROJECT_NAME}::")
+  SET(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
+  SET(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
+  SET(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake")
 ELSE()
-  set(CONFIG_INSTALL_DIR "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}")
-  set(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-plain-config.cmake.in")
+  SET(CONFIG_INSTALL_DIR "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}")
+  SET(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-plain-config.cmake.in")
   string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE)
-  set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::")
-  set(TARGETS_EXPORT_NAME "${PROJECT_NAME_LOWERCASE}Targets")
-  set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME_LOWERCASE}ConfigVersion.cmake")
-  set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME_LOWERCASE}Config.cmake")
+  SET(NAMESPACE "${PROJECT_NAME_LOWERCASE}::")
+  SET(TARGETS_EXPORT_NAME "${PROJECT_NAME_LOWERCASE}Targets")
+  SET(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME_LOWERCASE}ConfigVersion.cmake")
+  SET(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME_LOWERCASE}Config.cmake")
 ENDIF()
 
 set(INCLUDE_INSTALL_DIR "include")
@@ -452,18 +524,20 @@ configure_package_config_file(
     INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}"
 )
 
-install(
-    FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}"
-    DESTINATION "${CONFIG_INSTALL_DIR}"
-    COMPONENT ${LIBASSIMP-DEV_COMPONENT}
-)
+IF(ASSIMP_INSTALL)
+  INSTALL(
+      FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}"
+      DESTINATION "${CONFIG_INSTALL_DIR}"
+      COMPONENT ${LIBASSIMP-DEV_COMPONENT}
+  )
 
-install(
-    EXPORT "${TARGETS_EXPORT_NAME}"
-    NAMESPACE "${NAMESPACE}"
-    DESTINATION "${CONFIG_INSTALL_DIR}"
-    COMPONENT ${LIBASSIMP-DEV_COMPONENT}
-)
+  INSTALL(
+      EXPORT "${TARGETS_EXPORT_NAME}"
+      NAMESPACE "${NAMESPACE}"
+      DESTINATION "${CONFIG_INSTALL_DIR}"
+      COMPONENT ${LIBASSIMP-DEV_COMPONENT}
+  )
+ENDIF()
 
 IF( ASSIMP_BUILD_DOCS )
   ADD_SUBDIRECTORY(doc)
@@ -476,12 +550,12 @@ IF(ASSIMP_HUNTER_ENABLED)
   find_package(ZLIB CONFIG REQUIRED)
 
   add_definitions(-DASSIMP_BUILD_NO_OWN_ZLIB)
-  set(ZLIB_FOUND TRUE)
-  set(ZLIB_LIBRARIES ZLIB::zlib)
-  set(ASSIMP_BUILD_MINIZIP TRUE)
+  SET(ZLIB_FOUND TRUE)
+  SET(ZLIB_LIBRARIES ZLIB::zlib)
+  SET(ASSIMP_BUILD_MINIZIP TRUE)
 ELSE()
   # If the zlib is already found outside, add an export in case assimpTargets can't find it.
-  IF( ZLIB_FOUND )
+  IF( ZLIB_FOUND AND ASSIMP_INSTALL)
     INSTALL( TARGETS zlib zlibstatic
         EXPORT "${TARGETS_EXPORT_NAME}")
   ENDIF()
@@ -505,8 +579,8 @@ ELSE()
     #		https://github.com/madler/zlib/issues/41#issuecomment-125848075
     # Also prevents these options from "polluting" the cmake options if assimp is being
     # included as a submodule.
-    set( ASM686 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE )
-    set( AMD64 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE )
+    SET(ASM686 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE )
+    SET(AMD64 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE )
 
     # compile from sources
     ADD_SUBDIRECTORY(contrib/zlib)
@@ -529,7 +603,7 @@ IF( NOT IOS )
 ELSE ()
   IF( NOT BUILD_SHARED_LIBS )
     IF( NOT ASSIMP_BUILD_MINIZIP )
-      use_pkgconfig(UNZIP minizip)
+      USE_PKGCONFIG(UNZIP minizip)
     ENDIF()
   ENDIF ()
 ENDIF ()
@@ -563,9 +637,9 @@ SET ( ASSIMP_BUILD_NONFREE_C4D_IMPORTER OFF CACHE BOOL
 )
 
 IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
-  IF ( MSVC )
-    SET(C4D_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/contrib/Cineware/includes")
+  SET(C4D_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/contrib/Cineware/includes")
 
+  IF (WIN32)
     # pick the correct prebuilt library
     IF(MSVC143)
       SET(C4D_LIB_POSTFIX "_2022")
@@ -583,7 +657,7 @@ IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
       SET(C4D_LIB_POSTFIX "_2010")
     ELSE()
       MESSAGE( FATAL_ERROR
-        "C4D is currently only supported with MSVC 10, 11, 12, 14, 14.2, 14.3"
+        "C4D for Windows is currently only supported with MSVC 10, 11, 12, 14, 14.2, 14.3"
       )
     ENDIF()
 
@@ -601,68 +675,90 @@ IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
     # winsock and winmm are necessary (and undocumented) dependencies of Cineware SDK because
     # it can be used to communicate with a running Cinema 4D instance
     SET(C4D_EXTRA_LIBRARIES WSock32.lib Winmm.lib)
-  ELSE ()
-    MESSAGE( FATAL_ERROR
-      "C4D is currently only available on Windows with Cineware SDK installed in contrib/Cineware"
+  ELSEIF (APPLE)
+    SET(C4D_LIB_BASE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/contrib/Cineware/libraries/osx")
+
+    SET(C4D_DEBUG_LIBRARIES
+      "${C4D_LIB_BASE_PATH}/debug/libcinewarelib.a"
+      "${C4D_LIB_BASE_PATH}/debug/libjpeglib.a"
     )
-  ENDIF ()
+    SET(C4D_RELEASE_LIBRARIES
+      "${C4D_LIB_BASE_PATH}/release/libcinewarelib.a"
+      "${C4D_LIB_BASE_PATH}/release/libjpeglib.a"
+    )
+  ELSE()
+    MESSAGE( FATAL_ERROR
+      "C4D is currently only available on Windows and macOS with Cineware SDK installed in contrib/Cineware"
+    )
+  ENDIF()
 ELSE ()
   ADD_DEFINITIONS( -DASSIMP_BUILD_NO_C4D_IMPORTER )
 ENDIF ()
 
+IF(ASSIMP_BUILD_DRACO_STATIC)
+  SET(ASSIMP_BUILD_DRACO ON)
+ENDIF()
+
 # Draco requires cmake 3.12
 IF (DEFINED CMAKE_VERSION AND "${CMAKE_VERSION}" VERSION_LESS "3.12")
-  message(NOTICE "draco requires cmake 3.12 or newer, cmake is ${CMAKE_VERSION} . Draco is disabled")
+  MESSAGE(NOTICE "draco requires cmake 3.12 or newer, cmake is ${CMAKE_VERSION} . Draco is disabled")
   SET ( ASSIMP_BUILD_DRACO OFF CACHE BOOL "Disabled: Draco requires newer cmake" FORCE )
 ELSE()
   OPTION ( ASSIMP_BUILD_DRACO "If the Draco libraries are to be built. Primarily for glTF" OFF )
   IF ( ASSIMP_BUILD_DRACO )
     # Primarily for glTF v2
     # Enable Draco glTF feature set
-    set(DRACO_GLTF ON CACHE BOOL "" FORCE)
+    SET(DRACO_GLTF_BITSTREAM ON CACHE BOOL "" FORCE)
     # Disable unnecessary or omitted components
-    set(DRACO_JS_GLUE OFF CACHE BOOL "" FORCE)
-    set(DRACO_WASM OFF CACHE BOOL "" FORCE)
-    set(DRACO_MAYA_PLUGIN OFF CACHE BOOL "" FORCE)
-    set(DRACO_UNITY_PLUGIN OFF CACHE BOOL "" FORCE)
-    set(DRACO_TESTS OFF CACHE BOOL "" FORCE)
+    SET(DRACO_JS_GLUE OFF CACHE BOOL "" FORCE)
+    SET(DRACO_WASM OFF CACHE BOOL "" FORCE)
+    SET(DRACO_MAYA_PLUGIN OFF CACHE BOOL "" FORCE)
+    SET(DRACO_UNITY_PLUGIN OFF CACHE BOOL "" FORCE)
+    SET(DRACO_TESTS OFF CACHE BOOL "" FORCE)
 
     IF(ASSIMP_HUNTER_ENABLED)
       hunter_add_package(draco)
       find_package(draco CONFIG REQUIRED)
-      set(draco_LIBRARIES draco::draco)
+      SET(draco_LIBRARIES draco::draco)
     ELSE()
       # Draco 1.4.1 has many warnings and will not build with /WX or -Werror
       # See https://github.com/google/draco/issues/672
       # and https://github.com/google/draco/issues/673
       IF(MSVC)
-        set(DRACO_CXX_FLAGS "/W0")
+        SET(DRACO_CXX_FLAGS "/W0")
       ELSE()
-        list(APPEND DRACO_CXX_FLAGS
+        LIST(APPEND DRACO_CXX_FLAGS
           "-Wno-bool-compare"
           "-Wno-comment"
           "-Wno-maybe-uninitialized"
           "-Wno-sign-compare"
           "-Wno-unused-local-typedefs"
         )
-        # Draco 1.4.1 does not explicitly export any symbols under GCC/clang
-        list(APPEND DRACO_CXX_FLAGS
-          "-fvisibility=default"
-        )
+
+        IF(NOT ASSIMP_BUILD_DRACO_STATIC)
+          # Draco 1.4.1 does not explicitly export any symbols under GCC/clang
+          LIST(APPEND DRACO_CXX_FLAGS
+            "-fvisibility=default"
+          )
+        ENDIF()
       ENDIF()
 
       # Don't build or install all of Draco by default
       ADD_SUBDIRECTORY( "contrib/draco" EXCLUDE_FROM_ALL )
 
-      if(MSVC OR WIN32)
-        set(draco_LIBRARIES "draco")
-      else()
-        if(BUILD_SHARED_LIBS)
-          set(draco_LIBRARIES "draco_shared")
-        else()
-          set(draco_LIBRARIES "draco_static")
-        endif()
-      endif()
+      IF(ASSIMP_BUILD_DRACO_STATIC)
+        set_property(DIRECTORY "contrib/draco" PROPERTY BUILD_SHARED_LIBS OFF)
+      ENDIF()
+
+      IF(MSVC OR WIN32)
+        SET(draco_LIBRARIES "draco")
+      ELSE()
+        IF(ASSIMP_BUILD_DRACO_STATIC)
+          SET(draco_LIBRARIES "draco_static")
+        ELSE()
+          SET(draco_LIBRARIES "draco_shared")
+        ENDIF()
+      ENDIF()
 
       # Don't build the draco command-line tools by default
       set_target_properties(draco_encoder draco_decoder PROPERTIES
@@ -680,18 +776,20 @@ ELSE()
       TARGET_USE_COMMON_OUTPUT_DIRECTORY(draco_encoder)
       TARGET_USE_COMMON_OUTPUT_DIRECTORY(draco_decoder)
 
-      set(draco_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/contrib/draco/src")
+      SET(draco_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/contrib/draco/src")
 
       # This is probably wrong
-      INSTALL( TARGETS ${draco_LIBRARIES}
-        EXPORT "${TARGETS_EXPORT_NAME}"
-        LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-        ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-        RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR}
-        FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-        COMPONENT ${LIBASSIMP_COMPONENT}
-        INCLUDES DESTINATION include
-      )
+      IF (ASSIMP_INSTALL)
+        INSTALL( TARGETS ${draco_LIBRARIES}
+          EXPORT "${TARGETS_EXPORT_NAME}"
+          LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
+          ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
+          RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR}
+          FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
+          COMPONENT ${LIBASSIMP_COMPONENT}
+          INCLUDES DESTINATION include
+        )
+      ENDIF()
     ENDIF()
   ENDIF()
 ENDIF()
@@ -735,8 +833,8 @@ IF ( ASSIMP_INSTALL )
 ENDIF()
 
 CONFIGURE_FILE(
-  ${CMAKE_CURRENT_LIST_DIR}/revision.h.in
-  ${CMAKE_CURRENT_BINARY_DIR}/revision.h
+  ${CMAKE_CURRENT_LIST_DIR}/include/assimp/revision.h.in
+  ${CMAKE_CURRENT_BINARY_DIR}/include/assimp/revision.h
 )
 
 CONFIGURE_FILE(
@@ -824,24 +922,24 @@ if(WIN32)
   IF(MSVC12 OR MSVC14 OR MSVC15 )
     ADD_CUSTOM_TARGET(UpdateAssimpLibsDebugSymbolsAndDLLs COMMENT "Copying Assimp Libraries ..." VERBATIM)
     IF(CMAKE_GENERATOR MATCHES "^Visual Studio")
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Release/assimp-${ASSIMP_MSVC_VERSION}-mt.dll	${BIN_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.dll VERBATIM)
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Release/assimp-${ASSIMP_MSVC_VERSION}-mt.exp	${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.exp VERBATIM)
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Release/assimp-${ASSIMP_MSVC_VERSION}-mt.lib	${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.lib VERBATIM)
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.dll		${BIN_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.dll  VERBATIM)
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.exp		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.exp VERBATIM)
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.ilk		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.ilk VERBATIM)
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.lib		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.lib VERBATIM)
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Release/assimp-${ASSIMP_MSVC_VERSION}-mt.dll	${BIN_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.dll VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Release/assimp-${ASSIMP_MSVC_VERSION}-mt.exp	${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.exp VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Release/assimp-${ASSIMP_MSVC_VERSION}-mt.lib	${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.lib VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.dll		${BIN_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.dll  VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.exp		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.exp VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.ilk		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.ilk VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.lib		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.lib VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM)
     ELSE()
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mt.dll	${BIN_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.dll VERBATIM)
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mt.exp	${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.exp VERBATIM)
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mt.lib	${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.lib VERBATIM)
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.dll		${BIN_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.dll  VERBATIM)
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.exp		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.exp VERBATIM)
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.ilk		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.ilk VERBATIM)
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.lib		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.lib VERBATIM)
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM)
-      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mt.dll	${BIN_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.dll VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mt.exp	${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.exp VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mt.lib	${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mt.lib VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.dll		${BIN_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.dll  VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.exp		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.exp VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.ilk		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.ilk VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.lib		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.lib VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM)
+      ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb		${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM)
     ENDIF()
   ENDIF()
 ENDIF ()
diff --git a/CREDITS b/CREDITS
index 26e21d2f4..62b449614 100644
--- a/CREDITS
+++ b/CREDITS
@@ -60,7 +60,7 @@ The GUY who performed some of the CSM mocaps.
 Contributed fixes for the documentation and the doxygen markup
 
 - Zhao Lei
-Contributed several bugfixes fixing memory leaks and improving float parsing 
+Contributed several bugfixes fixing memory leaks and improving float parsing
 
 - sueastside
 Updated PyAssimp to the latest Assimp data structures and provided a script to keep the Python binding up-to-date.
@@ -129,7 +129,7 @@ Contributed a patch to fix the VertexTriangleAdjacency postprocessing step.
 Contributed the Debian build fixes ( architecture macro ).
 
 - gellule
-Several LWO and LWS fixes (pivoting). 
+Several LWO and LWS fixes (pivoting).
 
 - Marcel Metz
 GCC/Linux fixes for the SimpleOpenGL sample.
diff --git a/Dockerfile b/Dockerfile
index 5da5458f8..21dd41daa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,17 @@
-FROM ubuntu:22.04
+FROM gcc:1.5.1.0
 
-RUN apt-get update && apt-get install -y ninja-build \
-    git cmake build-essential software-properties-common
+RUN apt-get update \
+    apt-get install --no-install-recommends -y ninja-build cmake zlib1g-dev
 
-RUN add-apt-repository ppa:ubuntu-toolchain-r/test && apt-get update 
+WORKDIR /app
 
-WORKDIR /opt
+COPY . .
 
-# Build Assimp
-RUN git clone https://github.com/assimp/assimp.git /opt/assimp
-
-WORKDIR /opt/assimp
-
-RUN git checkout master \
-    && mkdir build && cd build && \
+RUN mkdir build && cd build && \
     cmake -G 'Ninja' \
     -DCMAKE_BUILD_TYPE=Release \
     -DASSIMP_BUILD_ASSIMP_TOOLS=ON \
     .. && \
     ninja -j4 && ninja install
+
+CMD ["/app/build/bin/unit"]
diff --git a/INSTALL b/INSTALL
index 410050b10..e5e5938cb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,17 +1,17 @@
-	
+
 ========================================================================
-Open Asset Import Library (assimp) INSTALL 
+Open Asset Import Library (assimp) INSTALL
 ========================================================================
 
 ------------------------------
 Getting the documentation
 ------------------------------
 
-A regularly-updated copy is available at 
+A regularly-updated copy is available at
 https://assimp-docs.readthedocs.io/en/latest/
 
 ------------------------------
-Building Assimp 
+Building Assimp
 ------------------------------
 
 Just check the build-instructions which you can find here: https://github.com/assimp/assimp/blob/master/Build.md
diff --git a/Readme.md b/Readme.md
index a1f707a95..262456b6a 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,57 +1,61 @@
 Open Asset Import Library (assimp)
 ==================================
 
-Open Asset Import Library is a library to load various 3d file formats into a shared, in-memory format. It supports more than __40 file formats__ for import and a growing selection of file formats for export.
+Open Asset Import Library is a library that loads various 3D file formats into a shared, in-memory format. It supports more than __40 file formats__ for import and a growing selection of file formats for export.
 
 ### Current project status ###
-[![Financial Contributors on Open Collective](https://opencollective.com/assimp/all/badge.svg?label=financial+contributors)](https://opencollective.com/assimp) 
 ![C/C++ CI](https://github.com/assimp/assimp/workflows/C/C++%20CI/badge.svg)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/9973693b7bdd4543b07084d5d9cf4745)](https://www.codacy.com/gh/assimp/assimp/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=assimp/assimp&amp;utm_campaign=Badge_Grade)
-[![Join the chat at https://gitter.im/assimp/assimp](https://badges.gitter.im/assimp/assimp.svg)](https://gitter.im/assimp/assimp?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=assimp_assimp&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=assimp_assimp)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/assimp/assimp.svg)](http://isitmaintained.com/project/assimp/assimp "Average time to resolve an issue")
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/assimp/assimp.svg)](http://isitmaintained.com/project/assimp/assimp "Percentage of issues still open")
+[![Gurubase](https://img.shields.io/badge/Gurubase-Ask%20assimp%20Guru-006BFF)](https://gurubase.io/g/assimp)
+[![Financial Contributors on Open Collective](https://opencollective.com/assimp/all/badge.svg?label=financial+contributors)](https://opencollective.com/assimp)
 <br>
 
-APIs are provided for C and C++. There are various bindings to other languages (C#, Java, Python, Delphi, D). Assimp also runs on Android and iOS.
+APIs are provided for C and C++. Various bindings exist to other languages (C#, Java, Python, Delphi, D). Assimp also runs on Android and iOS.
 Additionally, assimp features various __mesh post-processing tools__: normals and tangent space generation, triangulation, vertex cache locality optimization, removal of degenerate primitives and duplicate vertices, sorting by primitive type, merging of redundant materials and many more.
 
+## Project activity ##
+![Alt](https://repobeats.axiom.co/api/embed/997f84e5f9fcf772da1e687f3a4f3a8afdbf4cf0.svg "Repobeats analytics image")
+
 ### Documentation ###
-Please check the latest documents at [Asset-Importer-Lib-Doc](https://assimp-docs.readthedocs.io/en/latest/). 
+Read [our latest documentation](https://the-asset-importer-lib-documentation.readthedocs.io/en/latest/).
 
 ### Pre-built binaries ###
-Please check our [Itchi Projectspace](https://kimkulling.itch.io/the-asset-importer-lib)
+Download binaries from [our Itchi Projectspace](https://kimkulling.itch.io/the-asset-importer-lib).
 
-If you want to check our Model-Database, use the following repo: https://github.com/assimp/assimp-mdb
+### Test data ###
+Clone [our model database](https://github.com/assimp/assimp-mdb).
 
 ### Communities ###
-- Ask a question at [The Assimp-Discussion Board](https://github.com/assimp/assimp/discussions)
-- Ask on [Assimp-Community on Reddit](https://www.reddit.com/r/Assimp/)
-- Ask on [StackOverflow with the assimp-tag](http://stackoverflow.com/questions/tagged/assimp?sort=newest). 
-- Nothing has worked? File a question or an issue-report at [The Assimp-Issue Tracker](https://github.com/assimp/assimp/issues)
-
-And we also have a Gitter-channel:Gitter [![Join the chat at https://gitter.im/assimp/assimp](https://badges.gitter.im/assimp/assimp.svg)](https://gitter.im/assimp/assimp?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)<br>
+- Ask questions at [the Assimp Discussion Board](https://github.com/assimp/assimp/discussions).
+- Find us on [https://discord.gg/s9KJfaem](https://discord.gg/kKazXMXDy2)
+- Ask [the Assimp community on Reddit](https://www.reddit.com/r/Assimp/).
+- Ask on [StackOverflow with the assimp-tag](http://stackoverflow.com/questions/tagged/assimp?sort=newest).
+- Nothing has worked? File a question or an issue report at [The Assimp-Issue Tracker](https://github.com/assimp/assimp/issues)
 
 #### Supported file formats ####
-You can find the complete list of supported file-formats [here](https://github.com/assimp/assimp/blob/master/doc/Fileformats.md)
+See [the complete list of supported formats](https://github.com/assimp/assimp/blob/master/doc/Fileformats.md).
 
 ### Building ###
-Take a look [here](https://github.com/assimp/assimp/blob/master/Build.md) to get started. We are available in vcpkg, and our build system is CMake; if you used CMake before there is a good chance you know what to do.
+Start by reading [our build instructions](https://github.com/assimp/assimp/blob/master/Build.md). We are available in vcpkg, and our build system is CMake; if you used CMake before there is a good chance you know what to do.
 
 ### Ports ###
 * [Android](port/AndroidJNI/README.md)
 * [Python](port/PyAssimp/README.md)
-* [.NET](https://bitbucket.org/Starnick/assimpnet/src/master/)
+* [.NET](https://github.com/Saalvage/AssimpNetter)
 * [Pascal](port/AssimpPascal/Readme.md)
 * [Javascript (Alpha)](https://github.com/makc/assimp2json)
 * [Javascript/Node.js Interface](https://github.com/kovacsv/assimpjs)
 * [Unity 3d Plugin](https://ricardoreis.net/trilib-2/)
 * [Unreal Engine Plugin](https://github.com/irajsb/UE4_Assimp/)
-* [JVM](https://github.com/kotlin-graphics/assimp) Full jvm port (current [status](https://github.com/kotlin-graphics/assimp/wiki/Status))
+* [JVM](https://github.com/kotlin-graphics/assimp) Full JVM port (current [status](https://github.com/kotlin-graphics/assimp/wiki/Status))
 * [HAXE-Port](https://github.com/longde123/assimp-haxe) The Assimp-HAXE-port.
 * [Rust](https://github.com/jkvargas/russimp)
 
 ### Other tools ###
-[open3mod](https://github.com/acgessler/open3mod) is a powerful 3D model viewer based on Assimp's import and export abilities.
+[Qt5-ModelViewer](https://github.com/sharjith/ModelViewer-Qt5) is a powerful viewer based on Qt5 and Assimp's import and export abilities.<br>
 [Assimp-Viewer](https://github.com/assimp/assimp_view) is an experimental implementation for an Asset-Viewer based on ImGUI and Assimp (experimental).
 
 #### Repository structure ####
@@ -59,7 +63,7 @@ Open Asset Import Library is implemented in C++. The directory structure looks l
 
 	/code		Source code
 	/contrib	Third-party libraries
-	/doc		Documentation (doxysource and pre-compiled docs)
+	/doc		Documentation (Doxygen source and pre-compiled docs)
 	/fuzz           Contains the test code for the Google Fuzzer project
 	/include	Public header C and C++ header files
 	/scripts 	Scripts are used to generate the loading code for some formats
@@ -79,7 +83,7 @@ The source code is organized in the following way:
 	code/AssetLib/<FormatName>	Implementation for import and export of the format
 
 ### Contributing ###
-Contributions to assimp are highly appreciated. The easiest way to get involved is to submit
+I would greatly appreciate contributing to assimp. The easiest way to get involved is to submit
 a pull request with your changes against the main repository's `master` branch.
 
 ## Contributors
@@ -101,7 +105,7 @@ Become a financial contributor and help us sustain our community. [[Contribute](
 
 #### Organizations
 
-Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/assimp/contribute)]
+You can support the project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/assimp/contribute)]
 
 <a href="https://opencollective.com/assimp/organization/0/website"><img src="https://opencollective.com/assimp/organization/0/avatar.svg"></a>
 
@@ -111,6 +115,3 @@ Our license is based on the modified, __3-clause BSD__-License.
 An _informal_ summary is: do whatever you want, but include Assimp's license text with your product -
 and don't sue us if our code doesn't work. Note that, unlike LGPLed code, you may link statically to Assimp.
 For the legal details, see the `LICENSE` file.
-
-### Why this name ###
-Sorry, we're germans :-), no English native speakers ...
diff --git a/SECURITY.md b/SECURITY.md
index e4915cd1c..eee961e7f 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -7,10 +7,10 @@ currently being supported with security updates.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 5.2.4   | :white_check_mark: |
+| 6.0.2   | :white_check_mark: |
 
 ## Reporting a Vulnerability
 
-If you have found any security vulnerability you can contact us via 
+If you have found any security vulnerability you can contact us via
 kim.kulling@googlemail.com
 
diff --git a/cmake-modules/DebSourcePPA.cmake b/cmake-modules/DebSourcePPA.cmake
index d8a786fb2..ebf129b4f 100644
--- a/cmake-modules/DebSourcePPA.cmake
+++ b/cmake-modules/DebSourcePPA.cmake
@@ -6,7 +6,7 @@
 # Creates source debian files and manages library dependencies
 #
 # Features:
-# 
+#
 # - Automatically generates symbols and run-time dependencies from the build dependencies
 # - Custom copy of source directory via CPACK_DEBIAN_PACKAGE_SOURCE_COPY
 # - Simultaneous output of multiple debian source packages for each distribution
@@ -114,7 +114,6 @@ foreach(RELEASE ${CPACK_DEBIAN_DISTRIBUTION_RELEASES})
     endif( CPACK_DEBIAN_BUILD_DEPENDS_${DISTRIBUTION_NAME_UPPER} )
   endif( CPACK_DEBIAN_BUILD_DEPENDS_${DISTRIBUTION_NAME_UPPER}_${RELEASE_UPPER} )
 
-    
   file(APPEND ${DEBIAN_CONTROL} "\n"
     "Standards-Version: 3.8.4\n"
     "Homepage: ${CPACK_PACKAGE_VENDOR}\n"
@@ -173,7 +172,7 @@ foreach(RELEASE ${CPACK_DEBIAN_DISTRIBUTION_RELEASES})
       endforeach(DEP ${CPACK_DEBIAN_PACKAGE_SUGGESTS})
     endif( CPACK_DEBIAN_PACKAGE_SUGGESTS_${DISTRIBUTION_NAME_UPPER} )
   endif( CPACK_DEBIAN_PACKAGE_SUGGESTS_${DISTRIBUTION_NAME_UPPER}_${RELEASE_UPPER} )
-  
+
   file(APPEND ${DEBIAN_CONTROL} "\n"
     "Description: ${CPACK_PACKAGE_DISPLAY_NAME} ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}\n"
     "${DEB_LONG_DESCRIPTION}"
diff --git a/cmake-modules/FindDirectX.cmake b/cmake-modules/FindDirectX.cmake
index b37bc12a3..adc836902 100644
--- a/cmake-modules/FindDirectX.cmake
+++ b/cmake-modules/FindDirectX.cmake
@@ -26,7 +26,7 @@ if(WIN32) # The only platform it makes sense to check for DirectX SDK
   getenv_path(DIRECTX_BASE)
 
   # construct search paths
-  set(DirectX_PREFIX_PATH 
+  set(DirectX_PREFIX_PATH
     "${DXSDK_DIR}" "${ENV_DXSDK_DIR}"
     "${DIRECTX_HOME}" "${ENV_DIRECTX_HOME}"
     "${DIRECTX_ROOT}" "${ENV_DIRECTX_ROOT}"
@@ -66,7 +66,7 @@ if(WIN32) # The only platform it makes sense to check for DirectX SDK
   find_library(DirectX_D3DCOMPILER_LIBRARY NAMES d3dcompiler HINTS ${DirectX_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX_LIBPATH_SUFFIX})
 
   findpkg_finish(DirectX)
-  set(DirectX_LIBRARIES ${DirectX_LIBRARIES} 
+  set(DirectX_LIBRARIES ${DirectX_LIBRARIES}
     ${DirectX_D3DX9_LIBRARY}
     ${DirectX_DXERR_LIBRARY}
     ${DirectX_DXGUID_LIBRARY}
@@ -82,7 +82,7 @@ if(WIN32) # The only platform it makes sense to check for DirectX SDK
       get_filename_component(DirectX_LIBRARY_DIR "${DirectX_LIBRARY}" PATH)
       message(STATUS "DX lib dir: ${DirectX_LIBRARY_DIR}")
     find_library(DirectX_D3D11_LIBRARY NAMES d3d11 HINTS ${DirectX_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX_LIBPATH_SUFFIX})
-    find_library(DirectX_D3DX11_LIBRARY NAMES d3dx11 HINTS ${DirectX_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX_LIBPATH_SUFFIX})	
+    find_library(DirectX_D3DX11_LIBRARY NAMES d3dx11 HINTS ${DirectX_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX_LIBPATH_SUFFIX})
     if (DirectX_D3D11_INCLUDE_DIR AND DirectX_D3D11_LIBRARY)
       set(DirectX_D3D11_FOUND TRUE)
       set(DirectX_D3D11_INCLUDE_DIR ${DirectX_D3D11_INCLUDE_DIR})
@@ -92,8 +92,8 @@ if(WIN32) # The only platform it makes sense to check for DirectX SDK
 	${DirectX_DXGI_LIBRARY}
 	${DirectX_DXERR_LIBRARY}
 	${DirectX_DXGUID_LIBRARY}
-	${DirectX_D3DCOMPILER_LIBRARY}        	  
-      )	
+	${DirectX_D3DCOMPILER_LIBRARY}
+      )
     endif ()
     mark_as_advanced(DirectX_D3D11_INCLUDE_DIR DirectX_D3D11_LIBRARY DirectX_D3DX11_LIBRARY)
   endif ()
diff --git a/cmake-modules/Findassimp.cmake b/cmake-modules/Findassimp.cmake
index 663645574..c5d7e269b 100644
--- a/cmake-modules/Findassimp.cmake
+++ b/cmake-modules/Findassimp.cmake
@@ -3,7 +3,7 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
 	set(ASSIMP_ARCHITECTURE "32")
 endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	
+
 if(WIN32)
 	set(ASSIMP_ROOT_DIR CACHE PATH "ASSIMP root directory")
 
@@ -17,29 +17,29 @@ if(WIN32)
 
 	if(MSVC12)
 		set(ASSIMP_MSVC_VERSION "vc120")
-	elseif(MSVC14)	
+	elseif(MSVC14)
 		set(ASSIMP_MSVC_VERSION "vc140")
 	endif(MSVC12)
-	
+
 	if(MSVC12 OR MSVC14)
-	
+
 		find_path(ASSIMP_LIBRARY_DIR
 			NAMES
 				assimp-${ASSIMP_MSVC_VERSION}-mt.lib
 			HINTS
 				${ASSIMP_ROOT_DIR}/lib${ASSIMP_ARCHITECTURE}
 		)
-		
+
 		find_library(ASSIMP_LIBRARY_RELEASE				assimp-${ASSIMP_MSVC_VERSION}-mt.lib 			PATHS ${ASSIMP_LIBRARY_DIR})
 		find_library(ASSIMP_LIBRARY_DEBUG				assimp-${ASSIMP_MSVC_VERSION}-mtd.lib			PATHS ${ASSIMP_LIBRARY_DIR})
-		
-		set(ASSIMP_LIBRARY 
+
+		set(ASSIMP_LIBRARY
 			optimized 	${ASSIMP_LIBRARY_RELEASE}
 			debug		${ASSIMP_LIBRARY_DEBUG}
 		)
-		
+
 		set(ASSIMP_LIBRARIES "ASSIMP_LIBRARY_RELEASE" "ASSIMP_LIBRARY_DEBUG")
-	
+
 		FUNCTION(ASSIMP_COPY_BINARIES TargetDirectory)
 			ADD_CUSTOM_TARGET(AssimpCopyBinaries
 				COMMAND ${CMAKE_COMMAND} -E copy ${ASSIMP_ROOT_DIR}/bin${ASSIMP_ARCHITECTURE}/assimp-${ASSIMP_MSVC_VERSION}-mtd.dll 	${TargetDirectory}/Debug/assimp-${ASSIMP_MSVC_VERSION}-mtd.dll
@@ -47,9 +47,37 @@ if(WIN32)
 			COMMENT "Copying Assimp binaries to '${TargetDirectory}'"
 			VERBATIM)
 		ENDFUNCTION(ASSIMP_COPY_BINARIES)
-	
+
+		if (NOT TARGET ASSIMP)
+			set(INCLUDE_DIRS ${ASSIMP_ROOT_DIR}/include)
+
+			find_library(ASSIMP_LIB_DEBUG
+				NAMES assimp-${ASSIMP_MSVC_VERSION}-mtd.lib
+				PATHS ${ASSIMP_LIBRARY_DIR})
+
+			find_file(ASSIMP_DLL_DEBUG
+				NAMES assimp-${ASSIMP_MSVC_VERSION}-mtd.dll
+				PATHS ${ASSIMP_ROOT_DIR}/bin${ASSIMP_ARCHITECTURE})
+
+			find_library(ASSIMP_LIB_RELEASE
+				NAMES assimp-${ASSIMP_MSVC_VERSION}-mt.lib
+				PATHS ${ASSIMP_LIBRARY_DIR})
+
+			find_file(ASSIMP_DLL_RELEASE
+				NAMES assimp-${ASSIMP_MSVC_VERSION}-mt.dll
+				PATHS ${ASSIMP_ROOT_DIR}/bin${ASSIMP_ARCHITECTURE})
+
+			add_library(ASSIMP SHARED IMPORTED)
+			set_target_properties(ASSIMP PROPERTIES
+				INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIRS}"
+				IMPORTED_IMPLIB_DEBUG ${ASSIMP_LIB_DEBUG}
+				IMPORTED_IMPLIB_RELEASE ${ASSIMP_LIB_RELEASE}
+				IMPORTED_LOCATION_DEBUG ${ASSIMP_DLL_DEBUG}
+				IMPORTED_LOCATION_RELEASE ${ASSIMP_DLL_RELEASE}
+			)
+		endif()
 	endif()
-	
+
 else(WIN32)
 
 	find_path(
@@ -81,5 +109,5 @@ else(WIN32)
 		message(FATAL_ERROR "Could not find asset importer library")
 	  endif (assimp_FIND_REQUIRED)
 	endif (assimp_FOUND)
-	
+
 endif(WIN32)
diff --git a/cmake-modules/HunterGate.cmake b/cmake-modules/HunterGate.cmake
index 6d9cc2401..48bd50658 100644
--- a/cmake-modules/HunterGate.cmake
+++ b/cmake-modules/HunterGate.cmake
@@ -22,45 +22,16 @@
 # 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.
 
-# This is a gate file to Hunter package manager.
-# Include this file using `include` command and add package you need, example:
-#
-#     cmake_minimum_required(VERSION 3.2)
-#
-#     include("cmake/HunterGate.cmake")
-#     HunterGate(
-#         URL "https://github.com/path/to/hunter/archive.tar.gz"
-#         SHA1 "798501e983f14b28b10cda16afa4de69eee1da1d"
-#     )
-#
-#     project(MyProject)
-#
-#     hunter_add_package(Foo)
-#     hunter_add_package(Boo COMPONENTS Bar Baz)
-#
-# Projects:
-#     * https://github.com/hunter-packages/gate/
-#     * https://github.com/ruslo/hunter
 
 option(HUNTER_ENABLED "Enable Hunter package manager support" ON)
 
-if(HUNTER_ENABLED)
-  if(CMAKE_VERSION VERSION_LESS "3.2")
-    message(
-        FATAL_ERROR
-        "At least CMake version 3.2 required for Hunter dependency management."
-        " Update CMake or set HUNTER_ENABLED to OFF."
-    )
-  endif()
-endif()
-
 include(CMakeParseArguments) # cmake_parse_arguments
 
 option(HUNTER_STATUS_PRINT "Print working status" ON)
 option(HUNTER_STATUS_DEBUG "Print a lot info" OFF)
 option(HUNTER_TLS_VERIFY "Enable/disable TLS certificate checking on downloads" ON)
 
-set(HUNTER_ERROR_PAGE "https://docs.hunter.sh/en/latest/reference/errors")
+set(HUNTER_ERROR_PAGE "https://hunter.readthedocs.io/en/latest/reference/errors")
 
 function(hunter_gate_status_print)
   if(HUNTER_STATUS_PRINT OR HUNTER_STATUS_DEBUG)
diff --git a/cmake-modules/PrecompiledHeader.cmake b/cmake-modules/PrecompiledHeader.cmake
index 6af7866f5..92ae592c9 100644
--- a/cmake-modules/PrecompiledHeader.cmake
+++ b/cmake-modules/PrecompiledHeader.cmake
@@ -9,14 +9,14 @@ MACRO(ADD_MSVC_PRECOMPILED_HEADER PrecompiledHeader PrecompiledSource SourcesVar
       OBJECT_OUTPUTS "${PrecompiledBinary}")
 
     # Do not consider .c files
-    foreach(fname ${Sources}) 
+    foreach(fname ${Sources})
       GET_FILENAME_COMPONENT(fext ${fname} EXT)
       if(fext STREQUAL ".cpp")
 	SET_SOURCE_FILES_PROPERTIES(${fname}
 	  PROPERTIES COMPILE_FLAGS "/Yu\"${PrecompiledBinary}\" /FI\"${PrecompiledBinary}\" /Fp\"${PrecompiledBinary}\""
-          OBJECT_DEPENDS "${PrecompiledBinary}")     
+          OBJECT_DEPENDS "${PrecompiledBinary}")
       endif(fext STREQUAL ".cpp")
-    endforeach(fname) 
+    endforeach(fname)
 
   ENDIF(MSVC)
   # Add precompiled header to SourcesVar
diff --git a/code/.editorconfig b/code/.editorconfig
deleted file mode 100644
index 4a194a317..000000000
--- a/code/.editorconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-# See <http://EditorConfig.org> for details
-
-[*.{h,hpp,c,cpp}]
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-indent_size = 4
-indent_style = space
diff --git a/code/AssetLib/3DS/3DSConverter.cpp b/code/AssetLib/3DS/3DSConverter.cpp
index 6d3f09cb7..5718ebbc0 100644
--- a/code/AssetLib/3DS/3DSConverter.cpp
+++ b/code/AssetLib/3DS/3DSConverter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -91,15 +91,12 @@ void Discreet3DSImporter::ReplaceDefaultMaterial() {
     // now iterate through all meshes and through all faces and
     // find all faces that are using the default material
     unsigned int cnt = 0;
-    for (std::vector<D3DS::Mesh>::iterator
-                    i = mScene->mMeshes.begin();
-            i != mScene->mMeshes.end(); ++i) {
-        for (std::vector<unsigned int>::iterator
-                        a = (*i).mFaceMaterials.begin();
-                a != (*i).mFaceMaterials.end(); ++a) {
+    for (auto i = mScene->mMeshes.begin(); i != mScene->mMeshes.end(); ++i) {
+        for (auto a = (*i).mFaceMaterials.begin(); a != (*i).mFaceMaterials.end(); ++a) {
             // NOTE: The additional check seems to be necessary,
             // some exporters seem to generate invalid data here
-            if (0xcdcdcdcd == (*a)) {
+
+            if (NotSet == (*a)) {
                 (*a) = idx;
                 ++cnt;
             } else if ((*a) >= mScene->mMaterials.size()) {
@@ -111,7 +108,7 @@ void Discreet3DSImporter::ReplaceDefaultMaterial() {
     }
     if (cnt && idx == mScene->mMaterials.size()) {
         // We need to create our own default material
-        D3DS::Material sMat("%%%DEFAULT");
+        Material sMat("%%%DEFAULT");
         sMat.mDiffuse = aiColor3D(0.3f, 0.3f, 0.3f);
         mScene->mMaterials.push_back(sMat);
 
@@ -121,17 +118,17 @@ void Discreet3DSImporter::ReplaceDefaultMaterial() {
 
 // ------------------------------------------------------------------------------------------------
 // Check whether all indices are valid. Otherwise we'd crash before the validation step is reached
-void Discreet3DSImporter::CheckIndices(D3DS::Mesh &sMesh) {
-    for (std::vector<D3DS::Face>::iterator i = sMesh.mFaces.begin(); i != sMesh.mFaces.end(); ++i) {
+void Discreet3DSImporter::CheckIndices(Mesh &sMesh) {
+    for (auto i = sMesh.mFaces.begin(); i != sMesh.mFaces.end(); ++i) {
         // check whether all indices are in range
         for (unsigned int a = 0; a < 3; ++a) {
             if ((*i).mIndices[a] >= sMesh.mPositions.size()) {
                 ASSIMP_LOG_WARN("3DS: Vertex index overflow)");
-                (*i).mIndices[a] = (uint32_t)sMesh.mPositions.size() - 1;
+                (*i).mIndices[a] = static_cast<uint32_t>(sMesh.mPositions.size() - 1);
             }
             if (!sMesh.mTexCoords.empty() && (*i).mIndices[a] >= sMesh.mTexCoords.size()) {
                 ASSIMP_LOG_WARN("3DS: Texture coordinate index overflow)");
-                (*i).mIndices[a] = (uint32_t)sMesh.mTexCoords.size() - 1;
+                (*i).mIndices[a] = static_cast<uint32_t>(sMesh.mTexCoords.size() - 1);
             }
         }
     }
@@ -139,7 +136,7 @@ void Discreet3DSImporter::CheckIndices(D3DS::Mesh &sMesh) {
 
 // ------------------------------------------------------------------------------------------------
 // Generate out unique verbose format representation
-void Discreet3DSImporter::MakeUnique(D3DS::Mesh &sMesh) {
+void Discreet3DSImporter::MakeUnique(Mesh &sMesh) {
     // TODO: really necessary? I don't think. Just a waste of memory and time
     // to do it now in a separate buffer.
 
@@ -150,7 +147,7 @@ void Discreet3DSImporter::MakeUnique(D3DS::Mesh &sMesh) {
         vNew2.resize(sMesh.mFaces.size() * 3);
 
     for (unsigned int i = 0, base = 0; i < sMesh.mFaces.size(); ++i) {
-        D3DS::Face &face = sMesh.mFaces[i];
+        Face &face = sMesh.mFaces[i];
 
         // Positions
         for (unsigned int a = 0; a < 3; ++a, ++base) {
@@ -167,10 +164,9 @@ void Discreet3DSImporter::MakeUnique(D3DS::Mesh &sMesh) {
 
 // ------------------------------------------------------------------------------------------------
 // Convert a 3DS texture to texture keys in an aiMaterial
-void CopyTexture(aiMaterial &mat, D3DS::Texture &texture, aiTextureType type) {
+void CopyTexture(aiMaterial &mat, Texture &texture, aiTextureType type) {
     // Setup the texture name
-    aiString tex;
-    tex.Set(texture.mMapName);
+    aiString tex(texture.mMapName);
     mat.AddProperty(&tex, AI_MATKEY_TEXTURE(type, 0));
 
     // Setup the texture blend factor
@@ -197,13 +193,11 @@ void CopyTexture(aiMaterial &mat, D3DS::Texture &texture, aiTextureType type) {
 
 // ------------------------------------------------------------------------------------------------
 // Convert a 3DS material to an aiMaterial
-void Discreet3DSImporter::ConvertMaterial(D3DS::Material &oldMat,
-        aiMaterial &mat) {
+void Discreet3DSImporter::ConvertMaterial(Material &oldMat, aiMaterial &mat) {
     // NOTE: Pass the background image to the viewer by bypassing the
     // material system. This is an evil hack, never do it again!
-    if (0 != mBackgroundImage.length() && bHasBG) {
-        aiString tex;
-        tex.Set(mBackgroundImage);
+    if (mBackgroundImage.empty() && bHasBG) {
+        aiString tex(mBackgroundImage);
         mat.AddProperty(&tex, AI_MATKEY_GLOBAL_BACKGROUND_IMAGE);
 
         // Be sure this is only done for the first material
@@ -215,8 +209,7 @@ void Discreet3DSImporter::ConvertMaterial(D3DS::Material &oldMat,
     oldMat.mAmbient.g += mClrAmbient.g;
     oldMat.mAmbient.b += mClrAmbient.b;
 
-    aiString name;
-    name.Set(oldMat.mName);
+    aiString name(oldMat.mName);
     mat.AddProperty(&name, AI_MATKEY_NAME);
 
     // Material colors
@@ -226,10 +219,9 @@ void Discreet3DSImporter::ConvertMaterial(D3DS::Material &oldMat,
     mat.AddProperty(&oldMat.mEmissive, 1, AI_MATKEY_COLOR_EMISSIVE);
 
     // Phong shininess and shininess strength
-    if (D3DS::Discreet3DS::Phong == oldMat.mShading ||
-            D3DS::Discreet3DS::Metal == oldMat.mShading) {
+    if (Discreet3DS::Phong == oldMat.mShading || Discreet3DS::Metal == oldMat.mShading) {
         if (!oldMat.mSpecularExponent || !oldMat.mShininessStrength) {
-            oldMat.mShading = D3DS::Discreet3DS::Gouraud;
+            oldMat.mShading = Discreet3DS::Gouraud;
         } else {
             mat.AddProperty(&oldMat.mSpecularExponent, 1, AI_MATKEY_SHININESS);
             mat.AddProperty(&oldMat.mShininessStrength, 1, AI_MATKEY_SHININESS_STRENGTH);
@@ -251,40 +243,41 @@ void Discreet3DSImporter::ConvertMaterial(D3DS::Material &oldMat,
     // Shading mode
     aiShadingMode eShading = aiShadingMode_NoShading;
     switch (oldMat.mShading) {
-    case D3DS::Discreet3DS::Flat:
+    case Discreet3DS::Flat:
         eShading = aiShadingMode_Flat;
         break;
 
     // I don't know what "Wire" shading should be,
     // assume it is simple lambertian diffuse shading
-    case D3DS::Discreet3DS::Wire: {
+    case Discreet3DS::Wire: {
         // Set the wireframe flag
         unsigned int iWire = 1;
         mat.AddProperty<int>((int *)&iWire, 1, AI_MATKEY_ENABLE_WIREFRAME);
     }
         [[fallthrough]];
 
-    case D3DS::Discreet3DS::Gouraud:
+    case Discreet3DS::Gouraud:
         eShading = aiShadingMode_Gouraud;
         break;
 
     // assume cook-torrance shading for metals.
-    case D3DS::Discreet3DS::Phong:
+    case Discreet3DS::Phong:
         eShading = aiShadingMode_Phong;
         break;
 
-    case D3DS::Discreet3DS::Metal:
+    case Discreet3DS::Metal:
         eShading = aiShadingMode_CookTorrance;
         break;
 
         // FIX to workaround a warning with GCC 4 who complained
         // about a missing case Blinn: here - Blinn isn't a valid
         // value in the 3DS Loader, it is just needed for ASE
-    case D3DS::Discreet3DS::Blinn:
+    case Discreet3DS::Blinn:
         eShading = aiShadingMode_Blinn;
         break;
     }
-    int eShading_ = static_cast<int>(eShading);
+
+    const int eShading_ = eShading;
     mat.AddProperty<int>(&eShading_, 1, AI_MATKEY_SHADING_MODEL);
 
     // DIFFUSE texture
@@ -643,11 +636,17 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene *pcSOut, aiNode *pcOut,
     }
 
     // Allocate storage for children
-    pcOut->mNumChildren = (unsigned int)pcIn->mChildren.size();
+    const unsigned int size = static_cast<unsigned int>(pcIn->mChildren.size());
+
+    pcOut->mNumChildren = size;
+    if (size == 0) {
+        return;
+    }
+
     pcOut->mChildren = new aiNode *[pcIn->mChildren.size()];
 
     // Recursively process all children
-    const unsigned int size = static_cast<unsigned int>(pcIn->mChildren.size());
+
     for (unsigned int i = 0; i < size; ++i) {
         pcOut->mChildren[i] = new aiNode();
         pcOut->mChildren[i]->mParent = pcOut;
@@ -709,7 +708,7 @@ void Discreet3DSImporter::GenerateNodeGraph(aiScene *pcOut) {
             pcNode->mNumMeshes = 1;
 
             // Build a name for the node
-            pcNode->mName.length = ai_snprintf(pcNode->mName.data, MAXLEN, "3DSMesh_%u", i);
+            pcNode->mName.length = ai_snprintf(pcNode->mName.data, AI_MAXLEN, "3DSMesh_%u", i);
         }
 
         // Build dummy nodes for all cameras
@@ -777,7 +776,7 @@ void Discreet3DSImporter::GenerateNodeGraph(aiScene *pcOut) {
 // Convert all meshes in the scene and generate the final output scene.
 void Discreet3DSImporter::ConvertScene(aiScene *pcOut) {
     // Allocate enough storage for all output materials
-    pcOut->mNumMaterials = (unsigned int)mScene->mMaterials.size();
+    pcOut->mNumMaterials = static_cast<unsigned int>(mScene->mMaterials.size());
     pcOut->mMaterials = new aiMaterial *[pcOut->mNumMaterials];
 
     //  ... and convert the 3DS materials to aiMaterial's
@@ -791,17 +790,17 @@ void Discreet3DSImporter::ConvertScene(aiScene *pcOut) {
     ConvertMeshes(pcOut);
 
     // Now copy all light sources to the output scene
-    pcOut->mNumLights = (unsigned int)mScene->mLights.size();
+    pcOut->mNumLights = static_cast<unsigned int>(mScene->mLights.size());
     if (pcOut->mNumLights) {
         pcOut->mLights = new aiLight *[pcOut->mNumLights];
-        ::memcpy(pcOut->mLights, &mScene->mLights[0], sizeof(void *) * pcOut->mNumLights);
+        memcpy(pcOut->mLights, &mScene->mLights[0], sizeof(void *) * pcOut->mNumLights);
     }
 
     // Now copy all cameras to the output scene
-    pcOut->mNumCameras = (unsigned int)mScene->mCameras.size();
+    pcOut->mNumCameras = static_cast<unsigned int>(mScene->mCameras.size());
     if (pcOut->mNumCameras) {
         pcOut->mCameras = new aiCamera *[pcOut->mNumCameras];
-        ::memcpy(pcOut->mCameras, &mScene->mCameras[0], sizeof(void *) * pcOut->mNumCameras);
+        memcpy(pcOut->mCameras, &mScene->mCameras[0], sizeof(void *) * pcOut->mNumCameras);
     }
 }
 
diff --git a/code/AssetLib/3DS/3DSExporter.cpp b/code/AssetLib/3DS/3DSExporter.cpp
index 1b335a272..443011c0d 100644
--- a/code/AssetLib/3DS/3DSExporter.cpp
+++ b/code/AssetLib/3DS/3DSExporter.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -52,6 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/StringComparison.h>
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/Exporter.hpp>
+#include <assimp/Exceptional.h>
 #include <assimp/IOSystem.hpp>
 
 #include <memory>
@@ -102,7 +102,7 @@ private:
 // preserves the mesh's given name if it has one. |index| is the index
 // of the mesh in |aiScene::mMeshes|.
 std::string GetMeshName(const aiMesh &mesh, unsigned int index, const aiNode &node) {
-    static const char underscore = '_';
+    static constexpr char underscore = '_';
     char postfix[10] = { 0 };
     ASSIMP_itoa10(postfix, index);
 
@@ -208,9 +208,6 @@ Discreet3DSExporter::Discreet3DSExporter(std::shared_ptr<IOStream> &outfile, con
     }
 }
 
-// ------------------------------------------------------------------------------------------------
-Discreet3DSExporter::~Discreet3DSExporter() = default;
-
 // ------------------------------------------------------------------------------------------------
 int Discreet3DSExporter::WriteHierarchy(const aiNode &node, int seq, int sibling_level) {
     // 3DS scene hierarchy is serialized as in http://www.martinreddy.net/gfx/3d/3DS.spec
diff --git a/code/AssetLib/3DS/3DSExporter.h b/code/AssetLib/3DS/3DSExporter.h
index 66e91e10d..27804d461 100644
--- a/code/AssetLib/3DS/3DSExporter.h
+++ b/code/AssetLib/3DS/3DSExporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -63,10 +63,10 @@ namespace Assimp {
  *  @brief  Helper class to export a given scene to a 3DS file.
  */
 // ------------------------------------------------------------------------------------------------
-class Discreet3DSExporter {
+class Discreet3DSExporter final {
 public:
     Discreet3DSExporter(std::shared_ptr<IOStream> &outfile, const aiScene* pScene);
-    ~Discreet3DSExporter();
+    ~Discreet3DSExporter() = default;
 
 private:
     void WriteMeshes();
@@ -88,7 +88,6 @@ private:
 
     using MeshesByNodeMap = std::multimap<const aiNode*, unsigned int>;
     MeshesByNodeMap meshes;
-
 };
 
 } // Namespace Assimp
diff --git a/code/AssetLib/3DS/3DSHelper.h b/code/AssetLib/3DS/3DSHelper.h
index 2279d105c..64ddff819 100644
--- a/code/AssetLib/3DS/3DSHelper.h
+++ b/code/AssetLib/3DS/3DSHelper.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -365,14 +364,13 @@ struct Texture {
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif // _MSC_VER
-
 // ---------------------------------------------------------------------------
 /** Helper structure representing a 3ds material */
 struct Material {
     //! Default constructor has been deleted
     Material() :
             mName(),
-            mDiffuse(ai_real(0.6), ai_real(0.6), ai_real(0.6)),
+            mDiffuse(0.6f, 0.6f, 0.6f),
             mSpecularExponent(ai_real(0.0)),
             mShininessStrength(ai_real(1.0)),
             mShading(Discreet3DS::Gouraud),
@@ -385,7 +383,7 @@ struct Material {
     //! Constructor with explicit name
     explicit Material(const std::string &name) :
             mName(name),
-            mDiffuse(ai_real(0.6), ai_real(0.6), ai_real(0.6)),
+            mDiffuse(0.6f, 0.6f, 0.6f),
             mSpecularExponent(ai_real(0.0)),
             mShininessStrength(ai_real(1.0)),
             mShading(Discreet3DS::Gouraud),
diff --git a/code/AssetLib/3DS/3DSLoader.cpp b/code/AssetLib/3DS/3DSLoader.cpp
index a406ea1d2..1ee0b8b28 100644
--- a/code/AssetLib/3DS/3DSLoader.cpp
+++ b/code/AssetLib/3DS/3DSLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -106,7 +106,7 @@ Discreet3DSImporter::Discreet3DSImporter() :
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool Discreet3DSImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    static const uint16_t token[] = { 0x4d4d, 0x3dc2 /*, 0x3daa */ };
+    static constexpr uint16_t token[] = { 0x4d4d, 0x3dc2 /*, 0x3daa */ };
     return CheckMagicToken(pIOHandler, pFile, token, AI_COUNT_OF(token), 0, sizeof token[0]);
 }
 
diff --git a/code/AssetLib/3DS/3DSLoader.h b/code/AssetLib/3DS/3DSLoader.h
index c579507e0..fab1c0950 100644
--- a/code/AssetLib/3DS/3DSLoader.h
+++ b/code/AssetLib/3DS/3DSLoader.h
@@ -1,10 +1,8 @@
-
 /*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -57,14 +55,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct aiNode;
 
-namespace Assimp    {
+namespace Assimp {
 
 using namespace D3DS;
 
 // ---------------------------------------------------------------------------------
 /** Importer class for 3D Studio r3 and r4 3DS files
  */
-class Discreet3DSImporter : public BaseImporter {
+class Discreet3DSImporter final : public BaseImporter {
 public:
     Discreet3DSImporter();
     ~Discreet3DSImporter() override = default;
@@ -126,7 +124,6 @@ protected:
     void ParseColorChunk(aiColor3D* p_pcOut,
         bool p_bAcceptPercent = true);
 
-
     // -------------------------------------------------------------------
     /** Skip a chunk in the file
     */
diff --git a/code/AssetLib/3MF/3MFTypes.h b/code/AssetLib/3MF/3MFTypes.h
index 8207b568b..b123cd7c7 100644
--- a/code/AssetLib/3MF/3MFTypes.h
+++ b/code/AssetLib/3MF/3MFTypes.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -57,6 +57,7 @@ enum class ResourceType {
     RT_BaseMaterials,
     RT_EmbeddedTexture2D,
     RT_Texture2DGroup,
+    RT_ColorGroup,
     RT_Unknown
 }; // To be extended with other resource types (eg. material extension resources like Texture2d, Texture2dGroup...)
 
@@ -117,6 +118,21 @@ public:
     }
 };
 
+class ColorGroup : public Resource {
+public:
+    std::vector<aiColor4D> mColors;
+    ColorGroup(int id) :
+            Resource(id){
+        // empty
+    }
+
+    ~ColorGroup() override = default;
+
+    ResourceType getType() const override {
+        return ResourceType::RT_ColorGroup;
+    }
+};
+
 class BaseMaterials : public Resource {
 public:
     std::vector<unsigned int> mMaterialIndex;
diff --git a/code/AssetLib/3MF/3MFXmlTags.h b/code/AssetLib/3MF/3MFXmlTags.h
index 333d169aa..2efa4c9ff 100644
--- a/code/AssetLib/3MF/3MFXmlTags.h
+++ b/code/AssetLib/3MF/3MFXmlTags.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -98,6 +98,11 @@ namespace XmlTag {
     const char *const texture_cuurd_u = "u";
     const char *const texture_cuurd_v = "v";
 
+    // vertex color definitions
+    const char *const colorgroup = "m:colorgroup";
+    const char *const color_item = "m:color";
+    const char *const color_vaule = "color";
+
     // Meta info tags
     const char* const CONTENT_TYPES_ARCHIVE = "[Content_Types].xml";
     const char* const ROOT_RELATIONSHIPS_ARCHIVE = "_rels/.rels";
diff --git a/code/AssetLib/3MF/D3MFExporter.cpp b/code/AssetLib/3MF/D3MFExporter.cpp
index 4ba3bbf24..64b94e593 100644
--- a/code/AssetLib/3MF/D3MFExporter.cpp
+++ b/code/AssetLib/3MF/D3MFExporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -249,10 +249,10 @@ void D3MFExporter::writeBaseMaterials() {
             if (color.r <= 1 && color.g <= 1 && color.b <= 1 && color.a <= 1) {
 
                 hexDiffuseColor = ai_rgba2hex(
-                        (int)((ai_real)color.r) * 255,
-                        (int)((ai_real)color.g) * 255,
-                        (int)((ai_real)color.b) * 255,
-                        (int)((ai_real)color.a) * 255,
+                        (int)(((ai_real)color.r) * 255),
+                        (int)(((ai_real)color.g) * 255),
+                        (int)(((ai_real)color.b) * 255),
+                        (int)(((ai_real)color.a) * 255),
                         true);
 
             } else {
diff --git a/code/AssetLib/3MF/D3MFExporter.h b/code/AssetLib/3MF/D3MFExporter.h
index 680d54f91..7830086d2 100644
--- a/code/AssetLib/3MF/D3MFExporter.h
+++ b/code/AssetLib/3MF/D3MFExporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/3MF/D3MFImporter.cpp b/code/AssetLib/3MF/D3MFImporter.cpp
index e8529064c..25ba6ef88 100644
--- a/code/AssetLib/3MF/D3MFImporter.cpp
+++ b/code/AssetLib/3MF/D3MFImporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -81,12 +81,17 @@ static constexpr aiImporterDesc desc = {
     "3mf"
 };
 
-bool D3MFImporter::CanRead(const std::string &filename, IOSystem *pIOHandler, bool /*checkSig*/) const {
+bool D3MFImporter::CanRead(const std::string &filename, IOSystem *pIOHandler, bool ) const {
     if (!ZipArchiveIOSystem::isZipArchive(pIOHandler, filename)) {
         return false;
     }
-    D3MF::D3MFOpcPackage opcPackage(pIOHandler, filename);
-    return opcPackage.validate();
+    static constexpr char ModelRef[] = "3D/3dmodel.model";
+    ZipArchiveIOSystem archive(pIOHandler, filename);
+    if (!archive.Exists(ModelRef)) {
+        return false;
+    }
+
+    return true;
 }
 
 void D3MFImporter::SetupProperties(const Importer*) {
@@ -102,7 +107,7 @@ void D3MFImporter::InternReadFile(const std::string &filename, aiScene *pScene,
 
     XmlParser xmlParser;
     if (xmlParser.parse(opcPackage.RootStream())) {
-        XmlSerializer xmlSerializer(&xmlParser);
+        XmlSerializer xmlSerializer(xmlParser);
         xmlSerializer.ImportXml(pScene);
 
         const std::vector<aiTexture*> &tex =  opcPackage.GetEmbeddedTextures();
diff --git a/code/AssetLib/3MF/D3MFImporter.h b/code/AssetLib/3MF/D3MFImporter.h
index 9ae68acb0..215b8b870 100644
--- a/code/AssetLib/3MF/D3MFImporter.h
+++ b/code/AssetLib/3MF/D3MFImporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/3MF/D3MFOpcPackage.cpp b/code/AssetLib/3MF/D3MFOpcPackage.cpp
index e772d8b7e..b54e80e15 100644
--- a/code/AssetLib/3MF/D3MFOpcPackage.cpp
+++ b/code/AssetLib/3MF/D3MFOpcPackage.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -119,9 +119,9 @@ public:
 
 static bool IsEmbeddedTexture( const std::string &filename ) {
     const std::string extension = BaseImporter::GetExtension(filename);
-    if (extension == "jpg" || extension == "png") {
+    if (extension == "jpg" || extension == "png" || extension == "jpeg") {
         std::string::size_type pos = filename.find("thumbnail");
-        if (pos == std::string::npos) {
+        if (pos != std::string::npos) {
             return false;
         }
         return true;
diff --git a/code/AssetLib/3MF/D3MFOpcPackage.h b/code/AssetLib/3MF/D3MFOpcPackage.h
index f6803a0ef..05d93ed87 100644
--- a/code/AssetLib/3MF/D3MFOpcPackage.h
+++ b/code/AssetLib/3MF/D3MFOpcPackage.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/3MF/XmlSerializer.cpp b/code/AssetLib/3MF/XmlSerializer.cpp
index 5fcdc0ccc..44293800d 100644
--- a/code/AssetLib/3MF/XmlSerializer.cpp
+++ b/code/AssetLib/3MF/XmlSerializer.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -57,8 +57,8 @@ static constexpr size_t ColRGBA_Len = 9;
 static constexpr size_t ColRGB_Len = 7;
 
 // format of the color string: #RRGGBBAA or #RRGGBB (3MF Core chapter 5.1.1)
-bool validateColorString(const char *color) {
-    const size_t len = strlen(color);
+bool validateColorString(const std::string color) {
+    const size_t len = color.size();
     if (ColRGBA_Len != len && ColRGB_Len != len) {
         return false;
     }
@@ -75,7 +75,7 @@ aiFace ReadTriangle(XmlNode &node, int &texId0, int &texId1, int &texId2) {
     face.mIndices[1] = static_cast<unsigned int>(std::atoi(node.attribute(XmlTag::v2).as_string()));
     face.mIndices[2] = static_cast<unsigned int>(std::atoi(node.attribute(XmlTag::v3).as_string()));
 
-    texId0 = texId1 = texId2 = -1;
+    texId0 = texId1 = texId2 = IdNotSet;
     XmlParser::getIntAttribute(node, XmlTag::p1, texId0);
     XmlParser::getIntAttribute(node, XmlTag::p2, texId1);
     XmlParser::getIntAttribute(node, XmlTag::p3, texId2);
@@ -157,8 +157,8 @@ aiMatrix4x4 parseTransformMatrix(const std::string& matrixStr) {
     return transformMatrix;
 }
 
-bool parseColor(const char *color, aiColor4D &diffuse) {
-    if (nullptr == color) {
+bool parseColor(const std::string &color, aiColor4D &diffuse) {
+    if (color.empty()) {
         return false;
     }
 
@@ -178,7 +178,7 @@ bool parseColor(const char *color, aiColor4D &diffuse) {
 
     char b[3] = { color[5], color[6], '\0' };
     diffuse.b = static_cast<ai_real>(strtol(b, nullptr, 16)) / ai_real(255.0);
-    const size_t len = strlen(color);
+    const size_t len = color.size();
     if (ColRGB_Len == len) {
         return true;
     }
@@ -199,11 +199,11 @@ void assignDiffuseColor(XmlNode &node, aiMaterial *mat) {
 
 } // namespace
 
-XmlSerializer::XmlSerializer(XmlParser *xmlParser) :
+XmlSerializer::XmlSerializer(XmlParser &xmlParser) :
         mResourcesDictionnary(),
         mMeshCount(0),
         mXmlParser(xmlParser) {
-    ai_assert(nullptr != xmlParser);
+    // empty
 }
 
 XmlSerializer::~XmlSerializer() {
@@ -218,7 +218,7 @@ void XmlSerializer::ImportXml(aiScene *scene) {
     }
 
     scene->mRootNode = new aiNode(XmlTag::RootTag);
-    XmlNode node = mXmlParser->getRootNode().child(XmlTag::model);
+    XmlNode node = mXmlParser.getRootNode().child(XmlTag::model);
     if (node.empty()) {
         return;
     }
@@ -236,6 +236,8 @@ void XmlSerializer::ImportXml(aiScene *scene) {
             ReadBaseMaterials(currentNode);
         } else if (currentNodeName == XmlTag::meta) {
             ReadMetadata(currentNode);
+        } else if (currentNodeName == XmlTag::colorgroup) {
+            ReadColorGroup(currentNode);
         }
     }
     StoreMaterialsInScene(scene);
@@ -331,9 +333,49 @@ void XmlSerializer::ReadObject(XmlNode &node) {
 
             if (hasPid) {
                 auto it = mResourcesDictionnary.find(pid);
-                if (hasPindex && it != mResourcesDictionnary.end() && it->second->getType() == ResourceType::RT_BaseMaterials) {
-                    BaseMaterials *materials = static_cast<BaseMaterials *>(it->second);
-                    mesh->mMaterialIndex = materials->mMaterialIndex[pindex];
+                if (hasPindex && it != mResourcesDictionnary.end()) {
+                    if (it->second->getType() == ResourceType::RT_BaseMaterials) {
+                        BaseMaterials *materials = static_cast<BaseMaterials *>(it->second);
+                        mesh->mMaterialIndex = materials->mMaterialIndex[pindex];
+                    } else if (it->second->getType() == ResourceType::RT_Texture2DGroup) {
+                        Texture2DGroup *group = static_cast<Texture2DGroup *>(it->second);
+                        if (mesh->mTextureCoords[0] == nullptr) {
+                            mesh->mNumUVComponents[0] = 2;
+                            for (unsigned int i = 1; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i) {
+                                mesh->mNumUVComponents[i] = 0;
+                            }
+
+                            const std::string name = ai_to_string(group->mTexId);
+                            for (size_t i = 0; i < mMaterials.size(); ++i) {
+                                if (name == mMaterials[i]->GetName().C_Str()) {
+                                    mesh->mMaterialIndex = static_cast<unsigned int>(i);
+                                }
+                            }
+
+                            mesh->mTextureCoords[0] = new aiVector3D[mesh->mNumVertices];
+                            for (unsigned int vertex_idx = 0; vertex_idx < mesh->mNumVertices; vertex_idx++) {
+                                mesh->mTextureCoords[0][vertex_idx] =
+                                        aiVector3D(group->mTex2dCoords[pindex].x, group->mTex2dCoords[pindex].y, 0.0f);
+                            }
+                        } else {
+                            for (unsigned int vertex_idx = 0; vertex_idx < mesh->mNumVertices; vertex_idx++) {
+                                if (mesh->mTextureCoords[0][vertex_idx].z < 0) {
+                                    // use default
+                                    mesh->mTextureCoords[0][vertex_idx] =
+                                            aiVector3D(group->mTex2dCoords[pindex].x, group->mTex2dCoords[pindex].y, 0.0f);
+                                }
+                            }
+                        }
+                    }else if (it->second->getType() == ResourceType::RT_ColorGroup) {
+                        if (mesh->mColors[0] == nullptr) {
+                            mesh->mColors[0] = new aiColor4D[mesh->mNumVertices];
+
+                            ColorGroup *group = static_cast<ColorGroup *>(it->second);
+                            for (unsigned int vertex_idx = 0; vertex_idx < mesh->mNumVertices; vertex_idx++) {
+                                mesh->mColors[0][vertex_idx] = group->mColors[pindex];
+                            }
+                        }
+                    }
                 }
             }
 
@@ -415,27 +457,36 @@ void XmlSerializer::ImportTriangles(XmlNode &node, aiMesh *mesh) {
     for (XmlNode &currentNode : node.children()) {
         const std::string currentName = currentNode.name();
         if (currentName == XmlTag::triangle) {
-            int pid = IdNotSet, p1 = IdNotSet;
+            int pid = IdNotSet;
             bool hasPid = getNodeAttribute(currentNode, D3MF::XmlTag::pid, pid);
-            bool hasP1 = getNodeAttribute(currentNode, D3MF::XmlTag::p1, p1);
 
-            int texId[3];
-            Texture2DGroup *group = nullptr;
-            aiFace face = ReadTriangle(currentNode, texId[0], texId[1], texId[2]);
-            if (hasPid && hasP1) {
+            int pindex[3];
+            aiFace face = ReadTriangle(currentNode, pindex[0], pindex[1], pindex[2]);
+            if (hasPid && (pindex[0] != IdNotSet || pindex[1] != IdNotSet || pindex[2] != IdNotSet)) {
                 auto it = mResourcesDictionnary.find(pid);
                 if (it != mResourcesDictionnary.end()) {
                     if (it->second->getType() == ResourceType::RT_BaseMaterials) {
                         BaseMaterials *baseMaterials = static_cast<BaseMaterials *>(it->second);
-                        mesh->mMaterialIndex = baseMaterials->mMaterialIndex[p1];
+
+                        auto update_material = [&](int idx) {
+                            if (pindex[idx] != IdNotSet) {
+                                mesh->mMaterialIndex = baseMaterials->mMaterialIndex[pindex[idx]];
+                            }
+                        };
+
+                        update_material(0);
+                        update_material(1);
+                        update_material(2);
+
                     } else if (it->second->getType() == ResourceType::RT_Texture2DGroup) {
+                        // Load texture coordinates into mesh, when any
+                        Texture2DGroup *group = static_cast<Texture2DGroup *>(it->second); // fix bug
                         if (mesh->mTextureCoords[0] == nullptr) {
                             mesh->mNumUVComponents[0] = 2;
                             for (unsigned int i = 1; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i) {
                                 mesh->mNumUVComponents[i] = 0;
                             }
 
-                            group = static_cast<Texture2DGroup *>(it->second);
                             const std::string name = ai_to_string(group->mTexId);
                             for (size_t i = 0; i < mMaterials.size(); ++i) {
                                 if (name == mMaterials[i]->GetName().C_Str()) {
@@ -443,21 +494,44 @@ void XmlSerializer::ImportTriangles(XmlNode &node, aiMesh *mesh) {
                                 }
                             }
                             mesh->mTextureCoords[0] = new aiVector3D[mesh->mNumVertices];
+                            for (unsigned int vertex_index = 0; vertex_index < mesh->mNumVertices; vertex_index++) {
+                                mesh->mTextureCoords[0][vertex_index].z = IdNotSet;//mark not set
+                            }
                         }
+
+                        auto update_texture = [&](int idx) {
+                            if (pindex[idx] != IdNotSet) {
+                                size_t vertex_index = face.mIndices[idx];
+                                mesh->mTextureCoords[0][vertex_index] =
+                                        aiVector3D(group->mTex2dCoords[pindex[idx]].x, group->mTex2dCoords[pindex[idx]].y, 0.0f);
+                            }
+                        };
+
+                        update_texture(0);
+                        update_texture(1);
+                        update_texture(2);
+
+                    } else if (it->second->getType() == ResourceType::RT_ColorGroup) {
+                        // Load vertex color into mesh, when any
+                        ColorGroup *group = static_cast<ColorGroup *>(it->second);
+                        if (mesh->mColors[0] == nullptr) {
+                            mesh->mColors[0] = new aiColor4D[mesh->mNumVertices];
+                        }
+
+                        auto update_color = [&](int idx) {
+                            if (pindex[idx] != IdNotSet) {
+                                size_t vertex_index = face.mIndices[idx];
+                                mesh->mColors[0][vertex_index] = group->mColors[pindex[idx]];
+                            }
+                        };
+
+                        update_color(0);
+                        update_color(1);
+                        update_color(2);
                     }
                 }
             }
 
-            // Load texture coordinates into mesh, when any
-            if (group != nullptr) {
-                size_t i0 = face.mIndices[0];
-                size_t i1 = face.mIndices[1];
-                size_t i2 = face.mIndices[2];
-                mesh->mTextureCoords[0][i0] = aiVector3D(group->mTex2dCoords[texId[0]].x, group->mTex2dCoords[texId[0]].y, 0.0f);
-                mesh->mTextureCoords[0][i1] = aiVector3D(group->mTex2dCoords[texId[1]].x, group->mTex2dCoords[texId[1]].y, 0.0f);
-                mesh->mTextureCoords[0][i2] = aiVector3D(group->mTex2dCoords[texId[2]].x, group->mTex2dCoords[texId[2]].y, 0.0f);
-            }
-
             faces.push_back(face);
         }
     }
@@ -598,6 +672,38 @@ aiMaterial *XmlSerializer::readMaterialDef(XmlNode &node, unsigned int basemater
     return material;
 }
 
+void XmlSerializer::ReadColor(XmlNode &node, ColorGroup *colorGroup) {
+    if (node.empty() || nullptr == colorGroup) {
+        return;
+    }
+
+    for (XmlNode currentNode : node.children()) {
+        const std::string currentName = currentNode.name();
+        if (currentName == XmlTag::color_item) {
+            const char *color = currentNode.attribute(XmlTag::color_vaule).as_string();
+            aiColor4D color_value;
+            if (parseColor(color, color_value)) {
+                colorGroup->mColors.push_back(color_value);
+            }
+        }
+    }
+}
+
+void XmlSerializer::ReadColorGroup(XmlNode &node) {
+    if (node.empty()) {
+        return;
+    }
+
+    int id = IdNotSet;
+    if (!XmlParser::getIntAttribute(node, XmlTag::id, id)) {
+        return;
+    }
+
+    ColorGroup *group = new ColorGroup(id);
+    ReadColor(node, group);
+    mResourcesDictionnary.insert(std::make_pair(id, group));
+}
+
 void XmlSerializer::StoreMaterialsInScene(aiScene *scene) {
     if (nullptr == scene) {
         return;
diff --git a/code/AssetLib/3MF/XmlSerializer.h b/code/AssetLib/3MF/XmlSerializer.h
index 6cf6a70a9..4072a5df5 100644
--- a/code/AssetLib/3MF/XmlSerializer.h
+++ b/code/AssetLib/3MF/XmlSerializer.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -57,10 +57,11 @@ class D3MFOpcPackage;
 class Object;
 class Texture2DGroup;
 class EmbeddedTexture;
+class ColorGroup;
 
-class XmlSerializer {
+class XmlSerializer final {
 public:
-    XmlSerializer(XmlParser *xmlParser);
+    XmlSerializer(XmlParser &xmlParser);
     ~XmlSerializer();
     void ImportXml(aiScene *scene);
 
@@ -78,6 +79,8 @@ private:
     void ReadTextureGroup(XmlNode &node);
     aiMaterial *readMaterialDef(XmlNode &node, unsigned int basematerialsId);
     void StoreMaterialsInScene(aiScene *scene);
+    void ReadColorGroup(XmlNode &node);
+    void ReadColor(XmlNode &node, ColorGroup *colorGroup);
 
 private:
     struct MetaEntry {
@@ -89,7 +92,7 @@ private:
     std::vector<aiMaterial *> mMaterials;
     std::map<unsigned int, Resource *> mResourcesDictionnary;
     unsigned int mMeshCount;
-    XmlParser *mXmlParser;
+    XmlParser &mXmlParser;
 };
 
 } // namespace D3MF
diff --git a/code/AssetLib/AC/ACLoader.cpp b/code/AssetLib/AC/ACLoader.cpp
index 1bb77c441..f9ef505c7 100644
--- a/code/AssetLib/AC/ACLoader.cpp
+++ b/code/AssetLib/AC/ACLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -77,8 +77,8 @@ static constexpr aiImporterDesc desc = {
 
 // ------------------------------------------------------------------------------------------------
 // skip to the next token
-inline const char *AcSkipToNextToken(const char *buffer) {
-    if (!SkipSpaces(&buffer)) {
+inline const char *AcSkipToNextToken(const char *buffer, const char *end) {
+    if (!SkipSpaces(&buffer, end)) {
         ASSIMP_LOG_ERROR("AC3D: Unexpected EOF/EOL");
     }
     return buffer;
@@ -86,13 +86,13 @@ inline const char *AcSkipToNextToken(const char *buffer) {
 
 // ------------------------------------------------------------------------------------------------
 // read a string (may be enclosed in double quotation marks). buffer must point to "
-inline const char *AcGetString(const char *buffer, std::string &out) {
+inline const char *AcGetString(const char *buffer, const char *end, std::string &out) {
     if (*buffer == '\0') {
         throw DeadlyImportError("AC3D: Unexpected EOF in string");
     }
     ++buffer;
     const char *sz = buffer;
-    while ('\"' != *buffer) {
+    while ('\"' != *buffer && buffer != end) {
         if (IsLineEnd(*buffer)) {
             ASSIMP_LOG_ERROR("AC3D: Unexpected EOF/EOL in string");
             out = "ERROR";
@@ -112,8 +112,8 @@ inline const char *AcGetString(const char *buffer, std::string &out) {
 // ------------------------------------------------------------------------------------------------
 // read 1 to n floats prefixed with an optional predefined identifier
 template <class T>
-inline const char *TAcCheckedLoadFloatArray(const char *buffer, const char *name, size_t name_length, size_t num, T *out) {
-    buffer = AcSkipToNextToken(buffer);
+inline const char *TAcCheckedLoadFloatArray(const char *buffer, const char *end, const char *name, size_t name_length, size_t num, T *out) {
+    buffer = AcSkipToNextToken(buffer, end);
     if (0 != name_length) {
         if (0 != strncmp(buffer, name, name_length) || !IsSpace(buffer[name_length])) {
             ASSIMP_LOG_ERROR("AC3D: Unexpected token. ", name, " was expected.");
@@ -122,7 +122,7 @@ inline const char *TAcCheckedLoadFloatArray(const char *buffer, const char *name
         buffer += name_length + 1;
     }
     for (unsigned int _i = 0; _i < num; ++_i) {
-        buffer = AcSkipToNextToken(buffer);
+        buffer = AcSkipToNextToken(buffer, end);
         buffer = fast_atoreal_move<float>(buffer, ((float *)out)[_i]);
     }
 
@@ -132,7 +132,7 @@ inline const char *TAcCheckedLoadFloatArray(const char *buffer, const char *name
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
 AC3DImporter::AC3DImporter() :
-        buffer(),
+        mBuffer(),
         configSplitBFCull(),
         configEvalSubdivision(),
         mNumMeshes(),
@@ -144,14 +144,10 @@ AC3DImporter::AC3DImporter() :
     // nothing to be done here
 }
 
-// ------------------------------------------------------------------------------------------------
-// Destructor, private as well
-AC3DImporter::~AC3DImporter() = default;
-
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool AC3DImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    static const uint32_t tokens[] = { AI_MAKE_MAGIC("AC3D") };
+    static constexpr uint32_t tokens[] = { AI_MAKE_MAGIC("AC3D") };
     return CheckMagicToken(pIOHandler, pFile, tokens, AI_COUNT_OF(tokens));
 }
 
@@ -164,17 +160,18 @@ const aiImporterDesc *AC3DImporter::GetInfo() const {
 // ------------------------------------------------------------------------------------------------
 // Get a pointer to the next line from the file
 bool AC3DImporter::GetNextLine() {
-    SkipLine(&buffer);
-    return SkipSpaces(&buffer);
+    SkipLine(&mBuffer.data, mBuffer.end);
+    return SkipSpaces(&mBuffer.data, mBuffer.end);
 }
 
 // ------------------------------------------------------------------------------------------------
 // Parse an object section in an AC file
-void AC3DImporter::LoadObjectSection(std::vector<Object> &objects) {
-    if (!TokenMatch(buffer, "OBJECT", 6))
-        return;
+bool AC3DImporter::LoadObjectSection(std::vector<Object> &objects) {
+    if (!TokenMatch(mBuffer.data, "OBJECT", 6)) {
+        return false;
+    }
 
-    SkipSpaces(&buffer);
+    SkipSpaces(&mBuffer.data, mBuffer.end);
 
     ++mNumMeshes;
 
@@ -182,7 +179,7 @@ void AC3DImporter::LoadObjectSection(std::vector<Object> &objects) {
     Object &obj = objects.back();
 
     aiLight *light = nullptr;
-    if (!ASSIMP_strincmp(buffer, "light", 5)) {
+    if (!ASSIMP_strincmp(mBuffer.data, "light", 5)) {
         // This is a light source. Add it to the list
         mLights->push_back(light = new aiLight());
 
@@ -192,68 +189,73 @@ void AC3DImporter::LoadObjectSection(std::vector<Object> &objects) {
         light->mAttenuationConstant = 1.f;
 
         // Generate a default name for both the light source and the node
-        // FIXME - what's the right way to print a size_t? Is 'zu' universally available? stick with the safe version.
-        light->mName.length = ::ai_snprintf(light->mName.data, MAXLEN, "ACLight_%i", static_cast<unsigned int>(mLights->size()) - 1);
+        light->mName.length = ::ai_snprintf(light->mName.data, AI_MAXLEN, "ACLight_%i", static_cast<unsigned int>(mLights->size()) - 1);
         obj.name = std::string(light->mName.data);
 
         ASSIMP_LOG_VERBOSE_DEBUG("AC3D: Light source encountered");
         obj.type = Object::Light;
-    } else if (!ASSIMP_strincmp(buffer, "group", 5)) {
+    } else if (!ASSIMP_strincmp(mBuffer.data, "group", 5)) {
         obj.type = Object::Group;
-    } else if (!ASSIMP_strincmp(buffer, "world", 5)) {
+    } else if (!ASSIMP_strincmp(mBuffer.data, "world", 5)) {
         obj.type = Object::World;
-    } else
+    } else {
         obj.type = Object::Poly;
+    }
+
     while (GetNextLine()) {
-        if (TokenMatch(buffer, "kids", 4)) {
-            SkipSpaces(&buffer);
-            unsigned int num = strtoul10(buffer, &buffer);
+        if (TokenMatch(mBuffer.data, "kids", 4)) {
+            SkipSpaces(&mBuffer.data, mBuffer.end);
+            unsigned int num = strtoul10(mBuffer.data, &mBuffer.data);
             GetNextLine();
             if (num) {
                 // load the children of this object recursively
                 obj.children.reserve(num);
-                for (unsigned int i = 0; i < num; ++i)
-                    LoadObjectSection(obj.children);
+                for (unsigned int i = 0; i < num; ++i) {
+                    if (!LoadObjectSection(obj.children)) {
+                        ASSIMP_LOG_WARN("AC3D: wrong number of kids");
+                        break;
+                    }
+                }
             }
-            return;
-        } else if (TokenMatch(buffer, "name", 4)) {
-            SkipSpaces(&buffer);
-            buffer = AcGetString(buffer, obj.name);
+            return true;
+        } else if (TokenMatch(mBuffer.data, "name", 4)) {
+            SkipSpaces(&mBuffer.data, mBuffer.data);
+            mBuffer.data = AcGetString(mBuffer.data, mBuffer.end, obj.name);
 
             // If this is a light source, we'll also need to store
             // the name of the node in it.
             if (light) {
                 light->mName.Set(obj.name);
             }
-        } else if (TokenMatch(buffer, "texture", 7)) {
-            SkipSpaces(&buffer);
+        } else if (TokenMatch(mBuffer.data, "texture", 7)) {
+            SkipSpaces(&mBuffer.data, mBuffer.end);
             std::string texture;
-            buffer = AcGetString(buffer, texture);
+            mBuffer.data = AcGetString(mBuffer.data, mBuffer.end, texture);
             obj.textures.push_back(texture);
-        } else if (TokenMatch(buffer, "texrep", 6)) {
-            SkipSpaces(&buffer);
-            buffer = TAcCheckedLoadFloatArray(buffer, "", 0, 2, &obj.texRepeat);
+        } else if (TokenMatch(mBuffer.data, "texrep", 6)) {
+            SkipSpaces(&mBuffer.data, mBuffer.end);
+            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "", 0, 2, &obj.texRepeat);
             if (!obj.texRepeat.x || !obj.texRepeat.y)
                 obj.texRepeat = aiVector2D(1.f, 1.f);
-        } else if (TokenMatch(buffer, "texoff", 6)) {
-            SkipSpaces(&buffer);
-            buffer = TAcCheckedLoadFloatArray(buffer, "", 0, 2, &obj.texOffset);
-        } else if (TokenMatch(buffer, "rot", 3)) {
-            SkipSpaces(&buffer);
-            buffer = TAcCheckedLoadFloatArray(buffer, "", 0, 9, &obj.rotation);
-        } else if (TokenMatch(buffer, "loc", 3)) {
-            SkipSpaces(&buffer);
-            buffer = TAcCheckedLoadFloatArray(buffer, "", 0, 3, &obj.translation);
-        } else if (TokenMatch(buffer, "subdiv", 6)) {
-            SkipSpaces(&buffer);
-            obj.subDiv = strtoul10(buffer, &buffer);
-        } else if (TokenMatch(buffer, "crease", 6)) {
-            SkipSpaces(&buffer);
-            obj.crease = fast_atof(buffer);
-        } else if (TokenMatch(buffer, "numvert", 7)) {
-            SkipSpaces(&buffer);
+        } else if (TokenMatch(mBuffer.data, "texoff", 6)) {
+            SkipSpaces(&mBuffer.data, mBuffer.end);
+            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "", 0, 2, &obj.texOffset);
+        } else if (TokenMatch(mBuffer.data, "rot", 3)) {
+            SkipSpaces(&mBuffer.data, mBuffer.end);
+            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "", 0, 9, &obj.rotation);
+        } else if (TokenMatch(mBuffer.data, "loc", 3)) {
+            SkipSpaces(&mBuffer.data, mBuffer.end);
+            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "", 0, 3, &obj.translation);
+        } else if (TokenMatch(mBuffer.data, "subdiv", 6)) {
+            SkipSpaces(&mBuffer.data, mBuffer.end);
+            obj.subDiv = strtoul10(mBuffer.data, &mBuffer.data);
+        } else if (TokenMatch(mBuffer.data, "crease", 6)) {
+            SkipSpaces(&mBuffer.data, mBuffer.end);
+            obj.crease = fast_atof(mBuffer.data);
+        } else if (TokenMatch(mBuffer.data, "numvert", 7)) {
+            SkipSpaces(&mBuffer.data, mBuffer.end);
 
-            unsigned int t = strtoul10(buffer, &buffer);
+            unsigned int t = strtoul10(mBuffer.data, &mBuffer.data);
             if (t >= AI_MAX_ALLOC(aiVector3D)) {
                 throw DeadlyImportError("AC3D: Too many vertices, would run out of memory");
             }
@@ -262,59 +264,59 @@ void AC3DImporter::LoadObjectSection(std::vector<Object> &objects) {
                 if (!GetNextLine()) {
                     ASSIMP_LOG_ERROR("AC3D: Unexpected EOF: not all vertices have been parsed yet");
                     break;
-                } else if (!IsNumeric(*buffer)) {
+                } else if (!IsNumeric(*mBuffer.data)) {
                     ASSIMP_LOG_ERROR("AC3D: Unexpected token: not all vertices have been parsed yet");
-                    --buffer; // make sure the line is processed a second time
+                    --mBuffer.data; // make sure the line is processed a second time
                     break;
                 }
                 obj.vertices.emplace_back();
                 aiVector3D &v = obj.vertices.back();
-                buffer = TAcCheckedLoadFloatArray(buffer, "", 0, 3, &v.x);
+                mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "", 0, 3, &v.x);
             }
-        } else if (TokenMatch(buffer, "numsurf", 7)) {
-            SkipSpaces(&buffer);
+        } else if (TokenMatch(mBuffer.data, "numsurf", 7)) {
+            SkipSpaces(&mBuffer.data, mBuffer.end);
 
             bool Q3DWorkAround = false;
 
-            const unsigned int t = strtoul10(buffer, &buffer);
+            const unsigned int t = strtoul10(mBuffer.data, &mBuffer.data);
             obj.surfaces.reserve(t);
             for (unsigned int i = 0; i < t; ++i) {
                 GetNextLine();
-                if (!TokenMatch(buffer, "SURF", 4)) {
+                if (!TokenMatch(mBuffer.data, "SURF", 4)) {
                     // FIX: this can occur for some files - Quick 3D for
                     // example writes no surf chunks
                     if (!Q3DWorkAround) {
                         ASSIMP_LOG_WARN("AC3D: SURF token was expected");
                         ASSIMP_LOG_VERBOSE_DEBUG("Continuing with Quick3D Workaround enabled");
                     }
-                    --buffer; // make sure the line is processed a second time
+                    --mBuffer.data; // make sure the line is processed a second time
                     // break; --- see fix notes above
 
                     Q3DWorkAround = true;
                 }
-                SkipSpaces(&buffer);
+                SkipSpaces(&mBuffer.data, mBuffer.end);
                 obj.surfaces.emplace_back();
                 Surface &surf = obj.surfaces.back();
-                surf.flags = strtoul_cppstyle(buffer);
+                surf.flags = strtoul_cppstyle(mBuffer.data);
 
                 while (true) {
                     if (!GetNextLine()) {
                         throw DeadlyImportError("AC3D: Unexpected EOF: surface is incomplete");
                     }
-                    if (TokenMatch(buffer, "mat", 3)) {
-                        SkipSpaces(&buffer);
-                        surf.mat = strtoul10(buffer);
-                    } else if (TokenMatch(buffer, "refs", 4)) {
+                    if (TokenMatch(mBuffer.data, "mat", 3)) {
+                        SkipSpaces(&mBuffer.data, mBuffer.end);
+                        surf.mat = strtoul10(mBuffer.data);
+                    } else if (TokenMatch(mBuffer.data, "refs", 4)) {
                         // --- see fix notes above
                         if (Q3DWorkAround) {
                             if (!surf.entries.empty()) {
-                                buffer -= 6;
+                                mBuffer.data -= 6;
                                 break;
                             }
                         }
 
-                        SkipSpaces(&buffer);
-                        const unsigned int m = strtoul10(buffer);
+                        SkipSpaces(&mBuffer.data, mBuffer.end);
+                        const unsigned int m = strtoul10(mBuffer.data);
                         surf.entries.reserve(m);
 
                         obj.numRefs += m;
@@ -327,12 +329,12 @@ void AC3DImporter::LoadObjectSection(std::vector<Object> &objects) {
                             surf.entries.emplace_back();
                             Surface::SurfaceEntry &entry = surf.entries.back();
 
-                            entry.first = strtoul10(buffer, &buffer);
-                            SkipSpaces(&buffer);
-                            buffer = TAcCheckedLoadFloatArray(buffer, "", 0, 2, &entry.second);
+                            entry.first = strtoul10(mBuffer.data, &mBuffer.data);
+                            SkipSpaces(&mBuffer.data, mBuffer.end);
+                            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "", 0, 2, &entry.second);
                         }
                     } else {
-                        --buffer; // make sure the line is processed a second time
+                        --mBuffer.data; // make sure the line is processed a second time
                         break;
                     }
                 }
@@ -340,6 +342,8 @@ void AC3DImporter::LoadObjectSection(std::vector<Object> &objects) {
         }
     }
     ASSIMP_LOG_ERROR("AC3D: Unexpected EOF: \'kids\' line was expected");
+
+    return false;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -445,7 +449,7 @@ aiNode *AC3DImporter::ConvertObjectSection(Object &object,
                     idx = 0;
                 }
                 if ((*it).entries.empty()) {
-                    ASSIMP_LOG_WARN("AC3D: surface her zero vertex references");
+                    ASSIMP_LOG_WARN("AC3D: surface has zero vertex references");
                 }
 
                 // validate all vertex indices to make sure we won't crash here
@@ -463,16 +467,15 @@ aiNode *AC3DImporter::ConvertObjectSection(Object &object,
                 }
 
                 switch ((*it).GetType()) {
-                    // closed line
-                case Surface::ClosedLine:
-                    needMat[idx].first += (unsigned int)(*it).entries.size();
-                    needMat[idx].second += (unsigned int)(*it).entries.size() << 1u;
+                case Surface::ClosedLine: // closed line
+                    needMat[idx].first += static_cast<unsigned int>((*it).entries.size());
+                    needMat[idx].second += static_cast<unsigned int>((*it).entries.size() << 1u);
                     break;
 
                     // unclosed line
                 case Surface::OpenLine:
-                    needMat[idx].first += (unsigned int)(*it).entries.size() - 1;
-                    needMat[idx].second += ((unsigned int)(*it).entries.size() - 1) << 1u;
+                    needMat[idx].first += static_cast<unsigned int>((*it).entries.size() - 1);
+                    needMat[idx].second += static_cast<unsigned int>(((*it).entries.size() - 1) << 1u);
                     break;
 
                     // triangle strip
@@ -574,15 +577,6 @@ aiNode *AC3DImporter::ConvertObjectSection(Object &object,
                                 const Surface::SurfaceEntry &entry2 = src.entries[i + 1];
                                 const Surface::SurfaceEntry &entry3 = src.entries[i + 2];
 
-                                // skip degenerate triangles
-                                if (object.vertices[entry1.first] == object.vertices[entry2.first] ||
-                                        object.vertices[entry1.first] == object.vertices[entry3.first] ||
-                                        object.vertices[entry2.first] == object.vertices[entry3.first]) {
-                                    mesh->mNumFaces--;
-                                    mesh->mNumVertices -= 3;
-                                    continue;
-                                }
-
                                 aiFace &face = *faces++;
                                 face.mNumIndices = 3;
                                 face.mIndices = new unsigned int[face.mNumIndices];
@@ -701,18 +695,18 @@ aiNode *AC3DImporter::ConvertObjectSection(Object &object,
         // generate a name depending on the type of the node
         switch (object.type) {
         case Object::Group:
-            node->mName.length = ::ai_snprintf(node->mName.data, MAXLEN, "ACGroup_%i", mGroupsCounter++);
+            node->mName.length = ::ai_snprintf(node->mName.data, AI_MAXLEN, "ACGroup_%i", mGroupsCounter++);
             break;
         case Object::Poly:
-            node->mName.length = ::ai_snprintf(node->mName.data, MAXLEN, "ACPoly_%i", mPolysCounter++);
+            node->mName.length = ::ai_snprintf(node->mName.data, AI_MAXLEN, "ACPoly_%i", mPolysCounter++);
             break;
         case Object::Light:
-            node->mName.length = ::ai_snprintf(node->mName.data, MAXLEN, "ACLight_%i", mLightsCounter++);
+            node->mName.length = ::ai_snprintf(node->mName.data, AI_MAXLEN, "ACLight_%i", mLightsCounter++);
             break;
 
             // there shouldn't be more than one world, but we don't care
         case Object::World:
-            node->mName.length = ::ai_snprintf(node->mName.data, MAXLEN, "ACWorld_%i", mWorldsCounter++);
+            node->mName.length = ::ai_snprintf(node->mName.data, AI_MAXLEN, "ACWorld_%i", mWorldsCounter++);
             break;
         }
     }
@@ -760,17 +754,18 @@ void AC3DImporter::InternReadFile(const std::string &pFile,
     std::vector<char> mBuffer2;
     TextFileToBuffer(file.get(), mBuffer2);
 
-    buffer = &mBuffer2[0];
+    mBuffer.data = &mBuffer2[0];
+    mBuffer.end = &mBuffer2[0] + mBuffer2.size();
     mNumMeshes = 0;
 
     mLightsCounter = mPolysCounter = mWorldsCounter = mGroupsCounter = 0;
 
-    if (::strncmp(buffer, "AC3D", 4)) {
+    if (::strncmp(mBuffer.data, "AC3D", 4)) {
         throw DeadlyImportError("AC3D: No valid AC3D file, magic sequence not found");
     }
 
     // print the file format version to the console
-    unsigned int version = HexDigitToDecimal(buffer[4]);
+    unsigned int version = HexDigitToDecimal(mBuffer.data[4]);
     char msg[3];
     ASSIMP_itoa10(msg, 3, version);
     ASSIMP_LOG_INFO("AC3D file format version: ", msg);
@@ -785,30 +780,31 @@ void AC3DImporter::InternReadFile(const std::string &pFile,
     mLights = &lights;
 
     while (GetNextLine()) {
-        if (TokenMatch(buffer, "MATERIAL", 8)) {
+        if (TokenMatch(mBuffer.data, "MATERIAL", 8)) {
             materials.emplace_back();
             Material &mat = materials.back();
 
             // manually parse the material ... sscanf would use the buldin atof ...
             // Format: (name) rgb %f %f %f  amb %f %f %f  emis %f %f %f  spec %f %f %f  shi %d  trans %f
 
-            buffer = AcSkipToNextToken(buffer);
-            if ('\"' == *buffer) {
-                buffer = AcGetString(buffer, mat.name);
-                buffer = AcSkipToNextToken(buffer);
+            mBuffer.data = AcSkipToNextToken(mBuffer.data, mBuffer.end);
+            if ('\"' == *mBuffer.data) {
+                mBuffer.data = AcGetString(mBuffer.data, mBuffer.end, mat.name);
+                mBuffer.data = AcSkipToNextToken(mBuffer.data, mBuffer.end);
             }
 
-            buffer = TAcCheckedLoadFloatArray(buffer, "rgb", 3, 3, &mat.rgb);
-            buffer = TAcCheckedLoadFloatArray(buffer, "amb", 3, 3, &mat.amb);
-            buffer = TAcCheckedLoadFloatArray(buffer, "emis", 4, 3, &mat.emis);
-            buffer = TAcCheckedLoadFloatArray(buffer, "spec", 4, 3, &mat.spec);
-            buffer = TAcCheckedLoadFloatArray(buffer, "shi", 3, 1, &mat.shin);
-            buffer = TAcCheckedLoadFloatArray(buffer, "trans", 5, 1, &mat.trans);
+            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "rgb", 3, 3, &mat.rgb);
+            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "amb", 3, 3, &mat.amb);
+            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "emis", 4, 3, &mat.emis);
+            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "spec", 4, 3, &mat.spec);
+            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "shi", 3, 1, &mat.shin);
+            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "trans", 5, 1, &mat.trans);
+        } else {
+            LoadObjectSection(rootObjects);
         }
-        LoadObjectSection(rootObjects);
     }
 
-    if (rootObjects.empty() || !mNumMeshes) {
+    if (rootObjects.empty() || mNumMeshes == 0u) {
         throw DeadlyImportError("AC3D: No meshes have been loaded");
     }
     if (materials.empty()) {
@@ -824,7 +820,7 @@ void AC3DImporter::InternReadFile(const std::string &pFile,
     materials.reserve(mNumMeshes);
 
     // generate a dummy root if there are multiple objects on the top layer
-    Object *root;
+    Object *root = nullptr;
     if (1 == rootObjects.size())
         root = &rootObjects[0];
     else {
@@ -837,7 +833,7 @@ void AC3DImporter::InternReadFile(const std::string &pFile,
         delete root;
     }
 
-    if (!::strncmp(pScene->mRootNode->mName.data, "Node", 4)) {
+    if (::strncmp(pScene->mRootNode->mName.data, "Node", 4) == 0) {
         pScene->mRootNode->mName.Set("<AC3DWorld>");
     }
 
@@ -856,7 +852,7 @@ void AC3DImporter::InternReadFile(const std::string &pFile,
 
     // copy lights
     pScene->mNumLights = (unsigned int)lights.size();
-    if (lights.size()) {
+    if (!lights.empty()) {
         pScene->mLights = new aiLight *[lights.size()];
         ::memcpy(pScene->mLights, &lights[0], lights.size() * sizeof(void *));
     }
diff --git a/code/AssetLib/AC/ACLoader.h b/code/AssetLib/AC/ACLoader.h
index 7f8dfd03c..ed9ca0274 100644
--- a/code/AssetLib/AC/ACLoader.h
+++ b/code/AssetLib/AC/ACLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -63,7 +63,7 @@ namespace Assimp {
 class AC3DImporter : public BaseImporter {
 public:
     AC3DImporter();
-    ~AC3DImporter() override;
+    ~AC3DImporter() override = default;
 
     // Represents an AC3D material
     struct Material {
@@ -103,7 +103,7 @@ public:
 
         unsigned int mat, flags;
 
-        typedef std::pair<unsigned int, aiVector2D> SurfaceEntry;
+        using SurfaceEntry = std::pair<unsigned int, aiVector2D>;
         std::vector<SurfaceEntry> entries;
 
         // Type is low nibble of flags
@@ -216,7 +216,7 @@ private:
      *  load subobjects, the method returns after a 'kids 0' was
      *  encountered.
      *  @objects List of output objects*/
-    void LoadObjectSection(std::vector<Object> &objects);
+    bool LoadObjectSection(std::vector<Object> &objects);
 
     // -------------------------------------------------------------------
     /** Convert all objects into meshes and nodes.
@@ -242,7 +242,7 @@ private:
 
 private:
     // points to the next data line
-    const char *buffer;
+    aiBuffer mBuffer;
 
     // Configuration option: if enabled, up to two meshes
     // are generated per material: those faces who have
diff --git a/code/AssetLib/AMF/AMFImporter.cpp b/code/AssetLib/AMF/AMFImporter.cpp
index eabdb35e1..9417e9142 100644
--- a/code/AssetLib/AMF/AMFImporter.cpp
+++ b/code/AssetLib/AMF/AMFImporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -178,28 +178,6 @@ bool AMFImporter::XML_SearchNode(const std::string &nodeName) {
     return nullptr != mXmlParser->findNode(nodeName);
 }
 
-void AMFImporter::ParseHelper_FixTruncatedFloatString(const char *pInStr, std::string &pOutString) {
-    size_t instr_len;
-
-    pOutString.clear();
-    instr_len = strlen(pInStr);
-    if (!instr_len) return;
-
-    pOutString.reserve(instr_len * 3 / 2);
-    // check and correct floats in format ".x". Must be "x.y".
-    if (pInStr[0] == '.') pOutString.push_back('0');
-
-    pOutString.push_back(pInStr[0]);
-    for (size_t ci = 1; ci < instr_len; ci++) {
-        if ((pInStr[ci] == '.') && ((pInStr[ci - 1] == ' ') || (pInStr[ci - 1] == '-') || (pInStr[ci - 1] == '+') || (pInStr[ci - 1] == '\t'))) {
-            pOutString.push_back('0');
-            pOutString.push_back('.');
-        } else {
-            pOutString.push_back(pInStr[ci]);
-        }
-    }
-}
-
 static bool ParseHelper_Decode_Base64_IsBase64(const char pChar) {
     return (isalnum((unsigned char)pChar) || (pChar == '+') || (pChar == '/'));
 }
@@ -213,7 +191,10 @@ void AMFImporter::ParseHelper_Decode_Base64(const std::string &pInputBase64, std
     uint8_t arr4[4], arr3[3];
 
     // check input data
-    if (pInputBase64.size() % 4) throw DeadlyImportError("Base64-encoded data must have size multiply of four.");
+    if (pInputBase64.size() % 4) {
+        throw DeadlyImportError("Base64-encoded data must have size multiply of four.");
+    }
+
     // prepare output place
     pOutputData.clear();
     pOutputData.reserve(pInputBase64.size() / 4 * 3);
@@ -403,17 +384,17 @@ void AMFImporter::ParseNode_Instance(XmlNode &node) {
         for (auto &currentNode : node.children()) {
             const std::string &currentName = currentNode.name();
             if (currentName == "deltax") {
-                XmlParser::getValueAsFloat(currentNode, als.Delta.x);
+                XmlParser::getValueAsReal(currentNode, als.Delta.x);
             } else if (currentName == "deltay") {
-                XmlParser::getValueAsFloat(currentNode, als.Delta.y);
+                XmlParser::getValueAsReal(currentNode, als.Delta.y);
             } else if (currentName == "deltaz") {
-                XmlParser::getValueAsFloat(currentNode, als.Delta.z);
+                XmlParser::getValueAsReal(currentNode, als.Delta.z);
             } else if (currentName == "rx") {
-                XmlParser::getValueAsFloat(currentNode, als.Delta.x);
+                XmlParser::getValueAsReal(currentNode, als.Delta.x);
             } else if (currentName == "ry") {
-                XmlParser::getValueAsFloat(currentNode, als.Delta.y);
+                XmlParser::getValueAsReal(currentNode, als.Delta.y);
             } else if (currentName == "rz") {
-                XmlParser::getValueAsFloat(currentNode, als.Delta.z);
+                XmlParser::getValueAsReal(currentNode, als.Delta.z);
             }
         }
         ParseHelper_Node_Exit();
@@ -493,7 +474,7 @@ void AMFImporter::ParseNode_Metadata(XmlNode &node) {
 
     // read attribute
     ne = new AMFMetadata(mNodeElement_Cur);
-    ((AMFMetadata *)ne)->Type = type;
+    ((AMFMetadata *)ne)->MetaType = type;
     ((AMFMetadata *)ne)->Value = value;
     mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element
     mNodeElement_List.push_back(ne); // and to node element list because its a new object in graph.
diff --git a/code/AssetLib/AMF/AMFImporter.hpp b/code/AssetLib/AMF/AMFImporter.hpp
index fbaf4fc6d..a80114f68 100644
--- a/code/AssetLib/AMF/AMFImporter.hpp
+++ b/code/AssetLib/AMF/AMFImporter.hpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -168,7 +168,6 @@ public:
     AI_WONT_RETURN void Throw_ID_NotFound(const std::string &pID) const AI_WONT_RETURN_SUFFIX;
     void XML_CheckNode_MustHaveChildren(pugi::xml_node &node);
     bool XML_SearchNode(const std::string &nodeName);
-    void ParseHelper_FixTruncatedFloatString(const char *pInStr, std::string &pOutString);
     AMFImporter(const AMFImporter &pScene) = delete;
     AMFImporter &operator=(const AMFImporter &pScene) = delete;
 
diff --git a/code/AssetLib/AMF/AMFImporter_Geometry.cpp b/code/AssetLib/AMF/AMFImporter_Geometry.cpp
index 341999f56..1df03231b 100644
--- a/code/AssetLib/AMF/AMFImporter_Geometry.cpp
+++ b/code/AssetLib/AMF/AMFImporter_Geometry.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -167,11 +167,11 @@ void AMFImporter::ParseNode_Coordinates(XmlNode &node) {
             AMFCoordinates &als = *((AMFCoordinates *)ne); // alias for convenience
             const std::string &currentName = ai_tolower(currentNode.name());
             if (currentName == "x") {
-                XmlParser::getValueAsFloat(currentNode, als.Coordinate.x);
+                XmlParser::getValueAsReal(currentNode, als.Coordinate.x);
             } else if (currentName == "y") {
-                XmlParser::getValueAsFloat(currentNode, als.Coordinate.y);
+                XmlParser::getValueAsReal(currentNode, als.Coordinate.y);
             } else if (currentName == "z") {
-                XmlParser::getValueAsFloat(currentNode, als.Coordinate.z);
+                XmlParser::getValueAsReal(currentNode, als.Coordinate.z);
             }
         }
         ParseHelper_Node_Exit();
@@ -202,7 +202,7 @@ void AMFImporter::ParseNode_Volume(XmlNode &node) {
 
     ((AMFVolume *)ne)->MaterialID = node.attribute("materialid").as_string();
 
-    ((AMFVolume *)ne)->Type = type;
+    ((AMFVolume *)ne)->VolumeType = type;
     // Check for child nodes
     bool col_read = false;
     if (!node.empty()) {
diff --git a/code/AssetLib/AMF/AMFImporter_Material.cpp b/code/AssetLib/AMF/AMFImporter_Material.cpp
index 676e74856..e48780e29 100644
--- a/code/AssetLib/AMF/AMFImporter_Material.cpp
+++ b/code/AssetLib/AMF/AMFImporter_Material.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -263,26 +263,25 @@ void AMFImporter::ParseNode_TexMap(XmlNode &node, const bool pUseOldName) {
             const std::string &name = currentNode.name();
             if (name == "utex1") {
 				read_flag[0] = true;
-                XmlParser::getValueAsFloat(node, als.TextureCoordinate[0].x);
+                XmlParser::getValueAsReal(currentNode, als.TextureCoordinate[0].x);
             } else if (name == "utex2") {
 				read_flag[1] = true;
-                XmlParser::getValueAsFloat(node, als.TextureCoordinate[1].x);
+                XmlParser::getValueAsReal(currentNode, als.TextureCoordinate[1].x);
             } else if (name == "utex3") {
 				read_flag[2] = true;
-                XmlParser::getValueAsFloat(node, als.TextureCoordinate[2].x);
+                XmlParser::getValueAsReal(currentNode, als.TextureCoordinate[2].x);
             } else if (name == "vtex1") {
 				read_flag[3] = true;
-                XmlParser::getValueAsFloat(node, als.TextureCoordinate[0].y);
+                XmlParser::getValueAsReal(currentNode, als.TextureCoordinate[0].y);
             } else if (name == "vtex2") {
 				read_flag[4] = true;
-                XmlParser::getValueAsFloat(node, als.TextureCoordinate[1].y);
+                XmlParser::getValueAsReal(currentNode, als.TextureCoordinate[1].y);
             } else if (name == "vtex3") {
 				read_flag[5] = true;
-                XmlParser::getValueAsFloat(node, als.TextureCoordinate[2].y);
+                XmlParser::getValueAsReal(currentNode, als.TextureCoordinate[2].y);
 			}
 		}
         ParseHelper_Node_Exit();
-
 	} else {
 		for (pugi::xml_attribute &attr : node.attributes()) {
             const std::string name = attr.name();
diff --git a/code/AssetLib/AMF/AMFImporter_Node.hpp b/code/AssetLib/AMF/AMFImporter_Node.hpp
index dd27316d3..8fb2abf6a 100644
--- a/code/AssetLib/AMF/AMFImporter_Node.hpp
+++ b/code/AssetLib/AMF/AMFImporter_Node.hpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -56,7 +56,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 
-/// \class CAMFImporter_NodeElement
 /// Base class for elements of nodes.
 class AMFNodeElementBase {
 public:
@@ -87,7 +86,8 @@ public:
 	AMFNodeElementBase *Parent; ///< Parent element. If nullptr then this node is root.
 	std::list<AMFNodeElementBase *> Child; ///< Child elements.
 
-public: /// Destructor, virtual..
+public:
+	/// Destructor, virtual..
 	virtual ~AMFNodeElementBase() = default;
 
 	/// Disabled copy constructor and co.
@@ -98,15 +98,14 @@ public: /// Destructor, virtual..
 
 protected:
 	/// In constructor inheritor must set element type.
-	/// \param [in] pType - element type.
+	/// \param [in] type - element type.
 	/// \param [in] pParent - parent element.
-	AMFNodeElementBase(const EType pType, AMFNodeElementBase *pParent) :
-			Type(pType), Parent(pParent) {
+	AMFNodeElementBase(EType type, AMFNodeElementBase *pParent) :
+			Type(type), Parent(pParent) {
 		// empty
 	}
 }; // class IAMFImporter_NodeElement
 
-/// \struct CAMFImporter_NodeElement_Constellation
 /// A collection of objects or constellations with specific relative locations.
 struct AMFConstellation : public AMFNodeElementBase {
 	/// Constructor.
@@ -116,7 +115,6 @@ struct AMFConstellation : public AMFNodeElementBase {
 
 }; // struct CAMFImporter_NodeElement_Constellation
 
-/// \struct CAMFImporter_NodeElement_Instance
 /// Part of constellation.
 struct AMFInstance : public AMFNodeElementBase {
 
@@ -135,12 +133,11 @@ struct AMFInstance : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Instance, pParent) {}
 };
 
-/// \struct CAMFImporter_NodeElement_Metadata
 /// Structure that define metadata node.
 struct AMFMetadata : public AMFNodeElementBase {
 
-	std::string Type; ///< Type of "Value".
-	std::string Value; ///< Value.
+	std::string MetaType; ///< Type of "Value".
+	std::string Value;    ///< Value.
 
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
@@ -148,7 +145,6 @@ struct AMFMetadata : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Metadata, pParent) {}
 };
 
-/// \struct CAMFImporter_NodeElement_Root
 /// Structure that define root node.
 struct AMFRoot : public AMFNodeElementBase {
 
@@ -161,7 +157,6 @@ struct AMFRoot : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Root, pParent) {}
 };
 
-/// \struct CAMFImporter_NodeElement_Color
 /// Structure that define object node.
 struct AMFColor : public AMFNodeElementBase {
 	bool Composed; ///< Type of color stored: if true then look for formula in \ref Color_Composed[4], else - in \ref Color.
@@ -177,7 +172,6 @@ struct AMFColor : public AMFNodeElementBase {
 	}
 };
 
-/// \struct CAMFImporter_NodeElement_Material
 /// Structure that define material node.
 struct AMFMaterial : public AMFNodeElementBase {
 
@@ -187,7 +181,6 @@ struct AMFMaterial : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Material, pParent) {}
 };
 
-/// \struct CAMFImporter_NodeElement_Object
 /// Structure that define object node.
 struct AMFObject : public AMFNodeElementBase {
 
@@ -206,7 +199,6 @@ struct AMFMesh : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Mesh, pParent) {}
 };
 
-/// \struct CAMFImporter_NodeElement_Vertex
 /// Structure that define vertex node.
 struct AMFVertex : public AMFNodeElementBase {
 	/// Constructor.
@@ -215,7 +207,6 @@ struct AMFVertex : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Vertex, pParent) {}
 };
 
-/// \struct CAMFImporter_NodeElement_Edge
 /// Structure that define edge node.
 struct AMFEdge : public AMFNodeElementBase {
 	/// Constructor.
@@ -224,7 +215,6 @@ struct AMFEdge : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Edge, pParent) {}
 };
 
-/// \struct CAMFImporter_NodeElement_Vertices
 /// Structure that define vertices node.
 struct AMFVertices : public AMFNodeElementBase {
 	/// Constructor.
@@ -233,11 +223,10 @@ struct AMFVertices : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Vertices, pParent) {}
 };
 
-/// \struct CAMFImporter_NodeElement_Volume
 /// Structure that define volume node.
 struct AMFVolume : public AMFNodeElementBase {
 	std::string MaterialID; ///< Which material to use.
-	std::string Type; ///< What this volume describes can be "region" or "support". If none specified, "object" is assumed.
+	std::string VolumeType; ///< What this volume describes can be "region" or "support". If none specified, "object" is assumed.
 
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
@@ -245,7 +234,6 @@ struct AMFVolume : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Volume, pParent) {}
 };
 
-/// \struct CAMFImporter_NodeElement_Coordinates
 /// Structure that define coordinates node.
 struct AMFCoordinates : public AMFNodeElementBase {
 	aiVector3D Coordinate; ///< Coordinate.
@@ -256,7 +244,6 @@ struct AMFCoordinates : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Coordinates, pParent) {}
 };
 
-/// \struct CAMFImporter_NodeElement_TexMap
 /// Structure that define texture coordinates node.
 struct AMFTexMap : public AMFNodeElementBase {
 	aiVector3D TextureCoordinate[3]; ///< Texture coordinates.
@@ -273,7 +260,6 @@ struct AMFTexMap : public AMFNodeElementBase {
 	}
 };
 
-/// \struct CAMFImporter_NodeElement_Triangle
 /// Structure that define triangle node.
 struct AMFTriangle : public AMFNodeElementBase {
 	size_t V[3]; ///< Triangle vertices.
diff --git a/code/AssetLib/AMF/AMFImporter_Postprocess.cpp b/code/AssetLib/AMF/AMFImporter_Postprocess.cpp
index d5160870a..f7a4b0892 100644
--- a/code/AssetLib/AMF/AMFImporter_Postprocess.cpp
+++ b/code/AssetLib/AMF/AMFImporter_Postprocess.cpp
@@ -1,9 +1,9 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -224,7 +224,8 @@ size_t AMFImporter::PostprocessHelper_GetTextureID_Or_Create(const std::string &
     }
 
     // Create format hint.
-    strcpy(converted_texture.FormatHint, "rgba0000"); // copy initial string.
+    constexpr char templateColor[] = "rgba0000";
+    memcpy(converted_texture.FormatHint, templateColor, 8);
     if (!r.empty()) converted_texture.FormatHint[4] = '8';
     if (!g.empty()) converted_texture.FormatHint[5] = '8';
     if (!b.empty()) converted_texture.FormatHint[6] = '8';
@@ -332,7 +333,7 @@ void AMFImporter::Postprocess_AddMetadata(const AMFMetaDataArray &metadataList,
     size_t meta_idx(0);
 
     for (const AMFMetadata *metadata : metadataList) {
-        sceneNode.mMetaData->Set(static_cast<unsigned int>(meta_idx++), metadata->Type, aiString(metadata->Value));
+        sceneNode.mMetaData->Set(static_cast<unsigned int>(meta_idx++), metadata->MetaType, aiString(metadata->Value));
     }
 }
 
@@ -867,7 +868,7 @@ nl_clean_loop:
             pScene->mTextures[idx]->mHeight = static_cast<unsigned int>(tex_convd.Height);
             pScene->mTextures[idx]->pcData = (aiTexel *)tex_convd.Data;
             // texture format description.
-            strcpy(pScene->mTextures[idx]->achFormatHint, tex_convd.FormatHint);
+            strncpy(pScene->mTextures[idx]->achFormatHint, tex_convd.FormatHint, HINTMAXTEXTURELEN);
             idx++;
         } // for(const SPP_Texture& tex_convd: mTexture_Converted)
 
diff --git a/code/AssetLib/ASE/ASELoader.cpp b/code/AssetLib/ASE/ASELoader.cpp
index f98316661..c63edcf6b 100644
--- a/code/AssetLib/ASE/ASELoader.cpp
+++ b/code/AssetLib/ASE/ASELoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -124,7 +124,7 @@ void ASEImporter::InternReadFile(const std::string &pFile,
     // Allocate storage and copy the contents of the file to a memory buffer
     std::vector<char> mBuffer2;
     TextFileToBuffer(file.get(), mBuffer2);
-
+    const size_t fileSize = mBuffer2.size();
     this->mBuffer = &mBuffer2[0];
     this->pcScene = pScene;
 
@@ -146,7 +146,7 @@ void ASEImporter::InternReadFile(const std::string &pFile,
     };
 
     // Construct an ASE parser and parse the file
-    ASE::Parser parser(mBuffer, defaultFormat);
+    ASE::Parser parser(mBuffer, fileSize, defaultFormat);
     mParser = &parser;
     mParser->Parse();
 
@@ -446,10 +446,9 @@ void ASEImporter::BuildLights() {
 }
 
 // ------------------------------------------------------------------------------------------------
-void ASEImporter::AddNodes(const std::vector<BaseNode *> &nodes,
-        aiNode *pcParent, const char *szName) {
+void ASEImporter::AddNodes(const std::vector<BaseNode *> &nodes, aiNode *pcParent, const std::string &name) {
     aiMatrix4x4 m;
-    AddNodes(nodes, pcParent, szName, m);
+    AddNodes(nodes, pcParent, name, m);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -506,10 +505,9 @@ void ASEImporter::AddMeshes(const ASE::BaseNode *snode, aiNode *node) {
 
 // ------------------------------------------------------------------------------------------------
 // Add child nodes to a given parent node
-void ASEImporter::AddNodes(const std::vector<BaseNode *> &nodes,
-        aiNode *pcParent, const char *szName,
+void ASEImporter::AddNodes(const std::vector<BaseNode *> &nodes, aiNode *pcParent, const std::string &name,
         const aiMatrix4x4 &mat) {
-    const size_t len = szName ? ::strlen(szName) : 0;
+    const size_t len = name.size();
     ai_assert(4 <= AI_MAX_NUMBER_OF_COLOR_SETS);
 
     // Receives child nodes for the pcParent node
@@ -519,16 +517,18 @@ void ASEImporter::AddNodes(const std::vector<BaseNode *> &nodes,
     // which has *us* as parent.
     for (std::vector<BaseNode *>::const_iterator it = nodes.begin(), end = nodes.end(); it != end; ++it) {
         const BaseNode *snode = *it;
-        if (szName) {
-            if (len != snode->mParent.length() || ::strcmp(szName, snode->mParent.c_str()))
+        if (!name.empty()) {
+            if (len != snode->mParent.length() || name != snode->mParent.c_str()) {
                 continue;
-        } else if (snode->mParent.length())
+            }
+        } else if (snode->mParent.length()) {
             continue;
+        }
 
         (*it)->mProcessed = true;
 
         // Allocate a new node and add it to the output data structure
-        apcNodes.push_back(new aiNode());
+        apcNodes.push_back(new aiNode);
         aiNode *node = apcNodes.back();
 
         node->mName.Set((snode->mName.length() ? snode->mName.c_str() : "Unnamed_Node"));
@@ -541,7 +541,7 @@ void ASEImporter::AddNodes(const std::vector<BaseNode *> &nodes,
 
         // Add sub nodes - prevent stack overflow due to recursive parenting
         if (node->mName != node->mParent->mName && node->mName != node->mParent->mParent->mName) {
-            AddNodes(nodes, node, node->mName.data, snode->mTransform);
+            AddNodes(nodes, node, node->mName.C_Str(), snode->mTransform);
         }
 
         // Further processing depends on the type of the node
@@ -619,7 +619,8 @@ void ASEImporter::BuildNodes(std::vector<BaseNode *> &nodes) {
     }
 
     // add all nodes
-    AddNodes(nodes, ch, nullptr);
+    static const std::string none = "";
+    AddNodes(nodes, ch, none);
 
     // now iterate through al nodes and find those that have not yet
     // been added to the nodegraph (= their parent could not be recognized)
@@ -730,6 +731,10 @@ void ASEImporter::BuildUniqueRepresentation(ASE::Mesh &mesh) {
     unsigned int iCurrent = 0, fi = 0;
     for (std::vector<ASE::Face>::iterator i = mesh.mFaces.begin(); i != mesh.mFaces.end(); ++i, ++fi) {
         for (unsigned int n = 0; n < 3; ++n, ++iCurrent) {
+            const uint32_t curIndex = (*i).mIndices[n];
+            if (curIndex >= mesh.mPositions.size()) {
+                throw DeadlyImportError("ASE: Invalid vertex index in face ", fi, ".");
+            }
             mPositions[iCurrent] = mesh.mPositions[(*i).mIndices[n]];
 
             // add texture coordinates
diff --git a/code/AssetLib/ASE/ASELoader.h b/code/AssetLib/ASE/ASELoader.h
index 2509671ef..05710718a 100644
--- a/code/AssetLib/ASE/ASELoader.h
+++ b/code/AssetLib/ASE/ASELoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -153,13 +153,13 @@ private:
      *  \param matrix Current transform
      */
     void AddNodes(const std::vector<ASE::BaseNode*>& nodes,
-        aiNode* pcParent,const char* szName);
+        aiNode* pcParent, const std::string &name);
 
     void AddNodes(const std::vector<ASE::BaseNode*>& nodes,
-        aiNode* pcParent,const char* szName,
+        aiNode* pcParent, const std::string &name,
         const aiMatrix4x4& matrix);
 
-    void AddMeshes(const ASE::BaseNode* snode,aiNode* node);
+    void AddMeshes(const ASE::BaseNode* snode, aiNode* node);
 
     // -------------------------------------------------------------------
     /** Generate a default material and add it to the parser's list
@@ -188,5 +188,4 @@ protected:
 
 } // end of namespace Assimp
 
-
 #endif // AI_3DSIMPORTER_H_INC
diff --git a/code/AssetLib/ASE/ASEParser.cpp b/code/AssetLib/ASE/ASEParser.cpp
index 90f462598..1f7c3c938 100644
--- a/code/AssetLib/ASE/ASEParser.cpp
+++ b/code/AssetLib/ASE/ASEParser.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -66,23 +66,24 @@ using namespace Assimp::ASE;
 // Handle a "top-level" section in the file. EOF is no error in this case.
 
 #define AI_ASE_HANDLE_TOP_LEVEL_SECTION()          \
-    else if ('{' == *filePtr) iDepth++;            \
-    else if ('}' == *filePtr) {                    \
+    else if ('{' == *mFilePtr)                     \
+        ++iDepth;                                  \
+    else if ('}' == *mFilePtr) {                   \
         if (0 == --iDepth) {                       \
-            ++filePtr;                             \
+            ++mFilePtr;                            \
             SkipToNextToken();                     \
             return;                                \
         }                                          \
     }                                              \
-    if ('\0' == *filePtr) {                        \
+    if ('\0' == *mFilePtr) {                       \
         return;                                    \
     }                                              \
-    if (IsLineEnd(*filePtr) && !bLastWasEndLine) { \
+    if (IsLineEnd(*mFilePtr) && !bLastWasEndLine) {\
         ++iLineNumber;                             \
         bLastWasEndLine = true;                    \
     } else                                         \
         bLastWasEndLine = false;                   \
-    ++filePtr;
+    ++mFilePtr;
 
 // ------------------------------------------------------------------------------------------------
 // Handle a nested section in the file. EOF is an error in this case
@@ -90,30 +91,32 @@ using namespace Assimp::ASE;
 // @param msg Full name of the section (including the asterisk)
 
 #define AI_ASE_HANDLE_SECTION(level, msg)                          \
-    if ('{' == *filePtr)                                           \
+    if ('{' == *mFilePtr)                                          \
         iDepth++;                                                  \
-    else if ('}' == *filePtr) {                                    \
+    else if ('}' == *mFilePtr) {                                   \
         if (0 == --iDepth) {                                       \
-            ++filePtr;                                             \
+            ++mFilePtr;                                            \
             SkipToNextToken();                                     \
             return;                                                \
         }                                                          \
-    } else if ('\0' == *filePtr) {                                 \
+    } else if ('\0' == *mFilePtr) {                                \
         LogError("Encountered unexpected EOL while parsing a " msg \
                  " chunk (Level " level ")");                      \
     }                                                              \
-    if (IsLineEnd(*filePtr) && !bLastWasEndLine) {                 \
+    if (IsLineEnd(*mFilePtr) && !bLastWasEndLine) {                \
         ++iLineNumber;                                             \
         bLastWasEndLine = true;                                    \
     } else                                                         \
         bLastWasEndLine = false;                                   \
-    ++filePtr;
+    ++mFilePtr;
 
 // ------------------------------------------------------------------------------------------------
-Parser::Parser(const char *szFile, unsigned int fileFormatDefault) {
-    ai_assert(nullptr != szFile);
+Parser::Parser(const char *file, size_t fileLen, unsigned int fileFormatDefault) :
+        mFilePtr(nullptr), mEnd (nullptr) {
+    ai_assert(file != nullptr);
 
-    filePtr = szFile;
+    mFilePtr = file;
+    mEnd = mFilePtr + fileLen;
     iFileFormat = fileFormatDefault;
 
     // make sure that the color values are invalid
@@ -177,7 +180,11 @@ AI_WONT_RETURN void Parser::LogError(const char *szWarn) {
 // ------------------------------------------------------------------------------------------------
 bool Parser::SkipToNextToken() {
     while (true) {
-        char me = *filePtr;
+        char me = *mFilePtr;
+
+        if (mFilePtr == mEnd) {
+            return false;
+        }
 
         // increase the line number counter if necessary
         if (IsLineEnd(me) && !bLastWasEndLine) {
@@ -185,10 +192,14 @@ bool Parser::SkipToNextToken() {
             bLastWasEndLine = true;
         } else
             bLastWasEndLine = false;
-        if ('*' == me || '}' == me || '{' == me) return true;
-        if ('\0' == me) return false;
+        if ('*' == me || '}' == me || '{' == me) {
+            return true;
+        }
+        if ('\0' == me) {
+            return false;
+        }
 
-        ++filePtr;
+        ++mFilePtr;
     }
 }
 
@@ -197,22 +208,22 @@ bool Parser::SkipSection() {
     // must handle subsections ...
     int iCnt = 0;
     while (true) {
-        if ('}' == *filePtr) {
+        if ('}' == *mFilePtr) {
             --iCnt;
             if (0 == iCnt) {
                 // go to the next valid token ...
-                ++filePtr;
+                ++mFilePtr;
                 SkipToNextToken();
                 return true;
             }
-        } else if ('{' == *filePtr) {
+        } else if ('{' == *mFilePtr) {
             ++iCnt;
-        } else if ('\0' == *filePtr) {
+        } else if ('\0' == *mFilePtr) {
             LogWarning("Unable to parse block: Unexpected EOF, closing bracket \'}\' was expected [#1]");
             return false;
-        } else if (IsLineEnd(*filePtr))
+        } else if (IsLineEnd(*mFilePtr))
             ++iLineNumber;
-        ++filePtr;
+        ++mFilePtr;
     }
 }
 
@@ -220,11 +231,11 @@ bool Parser::SkipSection() {
 void Parser::Parse() {
     AI_ASE_PARSER_INIT();
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
 
             // Version should be 200. Validate this ...
-            if (TokenMatch(filePtr, "3DSMAX_ASCIIEXPORT", 18)) {
+            if (TokenMatch(mFilePtr, "3DSMAX_ASCIIEXPORT", 18)) {
                 unsigned int fmt;
                 ParseLV4MeshLong(fmt);
 
@@ -245,23 +256,23 @@ void Parser::Parse() {
                 continue;
             }
             // main scene information
-            if (TokenMatch(filePtr, "SCENE", 5)) {
+            if (TokenMatch(mFilePtr, "SCENE", 5)) {
                 ParseLV1SceneBlock();
                 continue;
             }
             // "group" - no implementation yet, in facte
             // we're just ignoring them for the moment
-            if (TokenMatch(filePtr, "GROUP", 5)) {
+            if (TokenMatch(mFilePtr, "GROUP", 5)) {
                 Parse();
                 continue;
             }
             // material list
-            if (TokenMatch(filePtr, "MATERIAL_LIST", 13)) {
+            if (TokenMatch(mFilePtr, "MATERIAL_LIST", 13)) {
                 ParseLV1MaterialListBlock();
                 continue;
             }
             // geometric object (mesh)
-            if (TokenMatch(filePtr, "GEOMOBJECT", 10))
+            if (TokenMatch(mFilePtr, "GEOMOBJECT", 10))
 
             {
                 m_vMeshes.emplace_back("UNNAMED");
@@ -269,7 +280,7 @@ void Parser::Parse() {
                 continue;
             }
             // helper object = dummy in the hierarchy
-            if (TokenMatch(filePtr, "HELPEROBJECT", 12))
+            if (TokenMatch(mFilePtr, "HELPEROBJECT", 12))
 
             {
                 m_vDummies.emplace_back();
@@ -277,7 +288,7 @@ void Parser::Parse() {
                 continue;
             }
             // light object
-            if (TokenMatch(filePtr, "LIGHTOBJECT", 11))
+            if (TokenMatch(mFilePtr, "LIGHTOBJECT", 11))
 
             {
                 m_vLights.emplace_back("UNNAMED");
@@ -285,20 +296,20 @@ void Parser::Parse() {
                 continue;
             }
             // camera object
-            if (TokenMatch(filePtr, "CAMERAOBJECT", 12)) {
+            if (TokenMatch(mFilePtr, "CAMERAOBJECT", 12)) {
                 m_vCameras.emplace_back("UNNAMED");
                 ParseLV1ObjectBlock(m_vCameras.back());
                 continue;
             }
             // comment - print it on the console
-            if (TokenMatch(filePtr, "COMMENT", 7)) {
+            if (TokenMatch(mFilePtr, "COMMENT", 7)) {
                 std::string out = "<unknown>";
                 ParseString(out, "*COMMENT");
                 LogInfo(("Comment: " + out).c_str());
                 continue;
             }
             // ASC bone weights
-            if (AI_ASE_IS_OLD_FILE_FORMAT() && TokenMatch(filePtr, "MESH_SOFTSKINVERTS", 18)) {
+            if (AI_ASE_IS_OLD_FILE_FORMAT() && TokenMatch(mFilePtr, "MESH_SOFTSKINVERTS", 18)) {
                 ParseLV1SoftSkinBlock();
             }
         }
@@ -330,24 +341,25 @@ void Parser::ParseLV1SoftSkinBlock() {
     */
     // **************************************************************
     while (true) {
-        if (*filePtr == '}') {
-            ++filePtr;
+        if (*mFilePtr == '}') {
+            ++mFilePtr;
             return;
-        } else if (*filePtr == '\0')
+        } else if (*mFilePtr == '\0')
             return;
-        else if (*filePtr == '{')
-            ++filePtr;
+        else if (*mFilePtr == '{')
+            ++mFilePtr;
 
         else // if (!IsSpace(*filePtr) && !IsLineEnd(*filePtr))
         {
             ASE::Mesh *curMesh = nullptr;
             unsigned int numVerts = 0;
 
-            const char *sz = filePtr;
-            while (!IsSpaceOrNewLine(*filePtr))
-                ++filePtr;
+            const char *sz = mFilePtr;
+            while (!IsSpaceOrNewLine(*mFilePtr)) {
+                ++mFilePtr;
+            }
 
-            const unsigned int diff = (unsigned int)(filePtr - sz);
+            const unsigned int diff = (unsigned int)(mFilePtr - sz);
             if (diff) {
                 std::string name = std::string(sz, diff);
                 for (std::vector<ASE::Mesh>::iterator it = m_vMeshes.begin();
@@ -363,24 +375,24 @@ void Parser::ParseLV1SoftSkinBlock() {
                     // Skip the mesh data - until we find a new mesh
                     // or the end of the *MESH_SOFTSKINVERTS section
                     while (true) {
-                        SkipSpacesAndLineEnd(&filePtr);
-                        if (*filePtr == '}') {
-                            ++filePtr;
+                        SkipSpacesAndLineEnd(&mFilePtr, mEnd);
+                        if (*mFilePtr == '}') {
+                            ++mFilePtr;
                             return;
-                        } else if (!IsNumeric(*filePtr))
+                        } else if (!IsNumeric(*mFilePtr))
                             break;
 
-                        SkipLine(&filePtr);
+                        SkipLine(&mFilePtr, mEnd);
                     }
                 } else {
-                    SkipSpacesAndLineEnd(&filePtr);
+                    SkipSpacesAndLineEnd(&mFilePtr, mEnd);
                     ParseLV4MeshLong(numVerts);
 
                     // Reserve enough storage
                     curMesh->mBoneVertices.reserve(numVerts);
 
                     for (unsigned int i = 0; i < numVerts; ++i) {
-                        SkipSpacesAndLineEnd(&filePtr);
+                        SkipSpacesAndLineEnd(&mFilePtr, mEnd);
                         unsigned int numWeights;
                         ParseLV4MeshLong(numWeights);
 
@@ -410,7 +422,7 @@ void Parser::ParseLV1SoftSkinBlock() {
                                 me.first = static_cast<int>(curMesh->mBones.size());
                                 curMesh->mBones.emplace_back(bone);
                             }
-                            ParseLV4MeshFloat(me.second);
+                            ParseLV4MeshReal(me.second);
 
                             // Add the new bone weight to list
                             vert.mBoneWeights.push_back(me);
@@ -419,10 +431,10 @@ void Parser::ParseLV1SoftSkinBlock() {
                 }
             }
         }
-        if (*filePtr == '\0')
+        if (*mFilePtr == '\0')
             return;
-        ++filePtr;
-        SkipSpacesAndLineEnd(&filePtr);
+        ++mFilePtr;
+        SkipSpacesAndLineEnd(&mFilePtr, mEnd);
     }
 }
 
@@ -430,35 +442,35 @@ void Parser::ParseLV1SoftSkinBlock() {
 void Parser::ParseLV1SceneBlock() {
     AI_ASE_PARSER_INIT();
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
-            if (TokenMatch(filePtr, "SCENE_BACKGROUND_STATIC", 23))
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
+            if (TokenMatch(mFilePtr, "SCENE_BACKGROUND_STATIC", 23))
 
             {
                 // parse a color triple and assume it is really the bg color
                 ParseLV4MeshFloatTriple(&m_clrBackground.r);
                 continue;
             }
-            if (TokenMatch(filePtr, "SCENE_AMBIENT_STATIC", 20))
+            if (TokenMatch(mFilePtr, "SCENE_AMBIENT_STATIC", 20))
 
             {
                 // parse a color triple and assume it is really the bg color
                 ParseLV4MeshFloatTriple(&m_clrAmbient.r);
                 continue;
             }
-            if (TokenMatch(filePtr, "SCENE_FIRSTFRAME", 16)) {
+            if (TokenMatch(mFilePtr, "SCENE_FIRSTFRAME", 16)) {
                 ParseLV4MeshLong(iFirstFrame);
                 continue;
             }
-            if (TokenMatch(filePtr, "SCENE_LASTFRAME", 15)) {
+            if (TokenMatch(mFilePtr, "SCENE_LASTFRAME", 15)) {
                 ParseLV4MeshLong(iLastFrame);
                 continue;
             }
-            if (TokenMatch(filePtr, "SCENE_FRAMESPEED", 16)) {
+            if (TokenMatch(mFilePtr, "SCENE_FRAMESPEED", 16)) {
                 ParseLV4MeshLong(iFrameSpeed);
                 continue;
             }
-            if (TokenMatch(filePtr, "SCENE_TICKSPERFRAME", 19)) {
+            if (TokenMatch(mFilePtr, "SCENE_TICKSPERFRAME", 19)) {
                 ParseLV4MeshLong(iTicksPerFrame);
                 continue;
             }
@@ -474,9 +486,9 @@ void Parser::ParseLV1MaterialListBlock() {
     unsigned int iMaterialCount = 0;
     unsigned int iOldMaterialCount = (unsigned int)m_vMaterials.size();
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
-            if (TokenMatch(filePtr, "MATERIAL_COUNT", 14)) {
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
+            if (TokenMatch(mFilePtr, "MATERIAL_COUNT", 14)) {
                 ParseLV4MeshLong(iMaterialCount);
 
                 if (UINT_MAX - iOldMaterialCount < iMaterialCount) {
@@ -488,14 +500,20 @@ void Parser::ParseLV1MaterialListBlock() {
                 m_vMaterials.resize(iOldMaterialCount + iMaterialCount, Material("INVALID"));
                 continue;
             }
-            if (TokenMatch(filePtr, "MATERIAL", 8)) {
+            if (TokenMatch(mFilePtr, "MATERIAL", 8)) {
+                // ensure we have at least one material allocated
+                if (iMaterialCount == 0) {
+                    LogWarning("*MATERIAL_COUNT unspecified or 0");
+                    iMaterialCount = 1;
+                    m_vMaterials.resize(iOldMaterialCount + iMaterialCount, Material("INVALID"));
+                }
+
                 unsigned int iIndex = 0;
                 ParseLV4MeshLong(iIndex);
 
                 if (iIndex >= iMaterialCount) {
                     LogWarning("Out of range: material index is too large");
                     iIndex = iMaterialCount - 1;
-                    return;
                 }
 
                 // get a reference to the material
@@ -507,7 +525,7 @@ void Parser::ParseLV1MaterialListBlock() {
             if( iDepth == 1 ){
                 // CRUDE HACK: support missing brace after "Ascii Scene Exporter v2.51"
                 LogWarning("Missing closing brace in material list");
-                --filePtr;
+                --mFilePtr;
                 return;
             }
         }
@@ -521,37 +539,37 @@ void Parser::ParseLV2MaterialBlock(ASE::Material &mat) {
 
     unsigned int iNumSubMaterials = 0;
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
-            if (TokenMatch(filePtr, "MATERIAL_NAME", 13)) {
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
+            if (TokenMatch(mFilePtr, "MATERIAL_NAME", 13)) {
                 if (!ParseString(mat.mName, "*MATERIAL_NAME"))
                     SkipToNextToken();
                 continue;
             }
             // ambient material color
-            if (TokenMatch(filePtr, "MATERIAL_AMBIENT", 16)) {
+            if (TokenMatch(mFilePtr, "MATERIAL_AMBIENT", 16)) {
                 ParseLV4MeshFloatTriple(&mat.mAmbient.r);
                 continue;
             }
             // diffuse material color
-            if (TokenMatch(filePtr, "MATERIAL_DIFFUSE", 16)) {
+            if (TokenMatch(mFilePtr, "MATERIAL_DIFFUSE", 16)) {
                 ParseLV4MeshFloatTriple(&mat.mDiffuse.r);
                 continue;
             }
             // specular material color
-            if (TokenMatch(filePtr, "MATERIAL_SPECULAR", 17)) {
+            if (TokenMatch(mFilePtr, "MATERIAL_SPECULAR", 17)) {
                 ParseLV4MeshFloatTriple(&mat.mSpecular.r);
                 continue;
             }
             // material shading type
-            if (TokenMatch(filePtr, "MATERIAL_SHADING", 16)) {
-                if (TokenMatch(filePtr, "Blinn", 5)) {
+            if (TokenMatch(mFilePtr, "MATERIAL_SHADING", 16)) {
+                if (TokenMatch(mFilePtr, "Blinn", 5)) {
                     mat.mShading = Discreet3DS::Blinn;
-                } else if (TokenMatch(filePtr, "Phong", 5)) {
+                } else if (TokenMatch(mFilePtr, "Phong", 5)) {
                     mat.mShading = Discreet3DS::Phong;
-                } else if (TokenMatch(filePtr, "Flat", 4)) {
+                } else if (TokenMatch(mFilePtr, "Flat", 4)) {
                     mat.mShading = Discreet3DS::Flat;
-                } else if (TokenMatch(filePtr, "Wire", 4)) {
+                } else if (TokenMatch(mFilePtr, "Wire", 4)) {
                     mat.mShading = Discreet3DS::Wire;
                 } else {
                     // assume gouraud shading
@@ -561,15 +579,15 @@ void Parser::ParseLV2MaterialBlock(ASE::Material &mat) {
                 continue;
             }
             // material transparency
-            if (TokenMatch(filePtr, "MATERIAL_TRANSPARENCY", 21)) {
-                ParseLV4MeshFloat(mat.mTransparency);
+            if (TokenMatch(mFilePtr, "MATERIAL_TRANSPARENCY", 21)) {
+                ParseLV4MeshReal(mat.mTransparency);
                 mat.mTransparency = ai_real(1.0) - mat.mTransparency;
                 continue;
             }
             // material self illumination
-            if (TokenMatch(filePtr, "MATERIAL_SELFILLUM", 18)) {
+            if (TokenMatch(mFilePtr, "MATERIAL_SELFILLUM", 18)) {
                 ai_real f = 0.0;
-                ParseLV4MeshFloat(f);
+                ParseLV4MeshReal(f);
 
                 mat.mEmissive.r = f;
                 mat.mEmissive.g = f;
@@ -577,71 +595,77 @@ void Parser::ParseLV2MaterialBlock(ASE::Material &mat) {
                 continue;
             }
             // material shininess
-            if (TokenMatch(filePtr, "MATERIAL_SHINE", 14)) {
-                ParseLV4MeshFloat(mat.mSpecularExponent);
+            if (TokenMatch(mFilePtr, "MATERIAL_SHINE", 14)) {
+                ParseLV4MeshReal(mat.mSpecularExponent);
                 mat.mSpecularExponent *= 15;
                 continue;
             }
             // two-sided material
-            if (TokenMatch(filePtr, "MATERIAL_TWOSIDED", 17)) {
+            if (TokenMatch(mFilePtr, "MATERIAL_TWOSIDED", 17)) {
                 mat.mTwoSided = true;
                 continue;
             }
             // material shininess strength
-            if (TokenMatch(filePtr, "MATERIAL_SHINESTRENGTH", 22)) {
-                ParseLV4MeshFloat(mat.mShininessStrength);
+            if (TokenMatch(mFilePtr, "MATERIAL_SHINESTRENGTH", 22)) {
+                ParseLV4MeshReal(mat.mShininessStrength);
                 continue;
             }
             // diffuse color map
-            if (TokenMatch(filePtr, "MAP_DIFFUSE", 11)) {
+            if (TokenMatch(mFilePtr, "MAP_DIFFUSE", 11)) {
                 // parse the texture block
                 ParseLV3MapBlock(mat.sTexDiffuse);
                 continue;
             }
             // ambient color map
-            if (TokenMatch(filePtr, "MAP_AMBIENT", 11)) {
+            if (TokenMatch(mFilePtr, "MAP_AMBIENT", 11)) {
                 // parse the texture block
                 ParseLV3MapBlock(mat.sTexAmbient);
                 continue;
             }
             // specular color map
-            if (TokenMatch(filePtr, "MAP_SPECULAR", 12)) {
+            if (TokenMatch(mFilePtr, "MAP_SPECULAR", 12)) {
                 // parse the texture block
                 ParseLV3MapBlock(mat.sTexSpecular);
                 continue;
             }
             // opacity map
-            if (TokenMatch(filePtr, "MAP_OPACITY", 11)) {
+            if (TokenMatch(mFilePtr, "MAP_OPACITY", 11)) {
                 // parse the texture block
                 ParseLV3MapBlock(mat.sTexOpacity);
                 continue;
             }
             // emissive map
-            if (TokenMatch(filePtr, "MAP_SELFILLUM", 13)) {
+            if (TokenMatch(mFilePtr, "MAP_SELFILLUM", 13)) {
                 // parse the texture block
                 ParseLV3MapBlock(mat.sTexEmissive);
                 continue;
             }
             // bump map
-            if (TokenMatch(filePtr, "MAP_BUMP", 8)) {
+            if (TokenMatch(mFilePtr, "MAP_BUMP", 8)) {
                 // parse the texture block
                 ParseLV3MapBlock(mat.sTexBump);
             }
             // specular/shininess map
-            if (TokenMatch(filePtr, "MAP_SHINESTRENGTH", 17)) {
+            if (TokenMatch(mFilePtr, "MAP_SHINESTRENGTH", 17)) {
                 // parse the texture block
                 ParseLV3MapBlock(mat.sTexShininess);
                 continue;
             }
             // number of submaterials
-            if (TokenMatch(filePtr, "NUMSUBMTLS", 10)) {
+            if (TokenMatch(mFilePtr, "NUMSUBMTLS", 10)) {
                 ParseLV4MeshLong(iNumSubMaterials);
 
                 // allocate enough storage
                 mat.avSubMaterials.resize(iNumSubMaterials, Material("INVALID SUBMATERIAL"));
             }
             // submaterial chunks
-            if (TokenMatch(filePtr, "SUBMATERIAL", 11)) {
+            if (TokenMatch(mFilePtr, "SUBMATERIAL", 11)) {
+                // ensure we have at least one material allocated
+                if (iNumSubMaterials == 0) {
+                    LogWarning("*NUMSUBMTLS unspecified or 0");
+                    iNumSubMaterials = 1;
+                    mat.avSubMaterials.resize(iNumSubMaterials, Material("INVALID SUBMATERIAL"));
+                }
 
                 unsigned int iIndex = 0;
                 ParseLV4MeshLong(iIndex);
@@ -678,10 +702,10 @@ void Parser::ParseLV3MapBlock(Texture &map) {
     bool parsePath = true;
     std::string temp;
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
             // type of map
-            if (TokenMatch(filePtr, "MAP_CLASS", 9)) {
+            if (TokenMatch(mFilePtr, "MAP_CLASS", 9)) {
                 temp.clear();
                 if (!ParseString(temp, "*MAP_CLASS"))
                     SkipToNextToken();
@@ -692,7 +716,7 @@ void Parser::ParseLV3MapBlock(Texture &map) {
                 continue;
             }
             // path to the texture
-            if (parsePath && TokenMatch(filePtr, "BITMAP", 6)) {
+            if (parsePath && TokenMatch(mFilePtr, "BITMAP", 6)) {
                 if (!ParseString(map.mMapName, "*BITMAP"))
                     SkipToNextToken();
 
@@ -706,33 +730,33 @@ void Parser::ParseLV3MapBlock(Texture &map) {
                 continue;
             }
             // offset on the u axis
-            if (TokenMatch(filePtr, "UVW_U_OFFSET", 12)) {
-                ParseLV4MeshFloat(map.mOffsetU);
+            if (TokenMatch(mFilePtr, "UVW_U_OFFSET", 12)) {
+                ParseLV4MeshReal(map.mOffsetU);
                 continue;
             }
             // offset on the v axis
-            if (TokenMatch(filePtr, "UVW_V_OFFSET", 12)) {
-                ParseLV4MeshFloat(map.mOffsetV);
+            if (TokenMatch(mFilePtr, "UVW_V_OFFSET", 12)) {
+                ParseLV4MeshReal(map.mOffsetV);
                 continue;
             }
             // tiling on the u axis
-            if (TokenMatch(filePtr, "UVW_U_TILING", 12)) {
-                ParseLV4MeshFloat(map.mScaleU);
+            if (TokenMatch(mFilePtr, "UVW_U_TILING", 12)) {
+                ParseLV4MeshReal(map.mScaleU);
                 continue;
             }
             // tiling on the v axis
-            if (TokenMatch(filePtr, "UVW_V_TILING", 12)) {
-                ParseLV4MeshFloat(map.mScaleV);
+            if (TokenMatch(mFilePtr, "UVW_V_TILING", 12)) {
+                ParseLV4MeshReal(map.mScaleV);
                 continue;
             }
             // rotation around the z-axis
-            if (TokenMatch(filePtr, "UVW_ANGLE", 9)) {
-                ParseLV4MeshFloat(map.mRotation);
+            if (TokenMatch(mFilePtr, "UVW_ANGLE", 9)) {
+                ParseLV4MeshReal(map.mRotation);
                 continue;
             }
             // map blending factor
-            if (TokenMatch(filePtr, "MAP_AMOUNT", 10)) {
-                ParseLV4MeshFloat(map.mTextureBlend);
+            if (TokenMatch(mFilePtr, "MAP_AMOUNT", 10)) {
+                ParseLV4MeshReal(map.mTextureBlend);
                 continue;
             }
         }
@@ -743,14 +767,14 @@ void Parser::ParseLV3MapBlock(Texture &map) {
 // ------------------------------------------------------------------------------------------------
 bool Parser::ParseString(std::string &out, const char *szName) {
     char szBuffer[1024];
-    if (!SkipSpaces(&filePtr)) {
+    if (!SkipSpaces(&mFilePtr, mEnd)) {
 
         ai_snprintf(szBuffer, 1024, "Unable to parse %s block: Unexpected EOL", szName);
         LogWarning(szBuffer);
         return false;
     }
     // there must be '"'
-    if ('\"' != *filePtr) {
+    if ('\"' != *mFilePtr) {
 
         ai_snprintf(szBuffer, 1024, "Unable to parse %s block: Strings are expected "
                                     "to be enclosed in double quotation marks",
@@ -758,8 +782,8 @@ bool Parser::ParseString(std::string &out, const char *szName) {
         LogWarning(szBuffer);
         return false;
     }
-    ++filePtr;
-    const char *sz = filePtr;
+    ++mFilePtr;
+    const char *sz = mFilePtr;
     while (true) {
         if ('\"' == *sz)
             break;
@@ -773,8 +797,8 @@ bool Parser::ParseString(std::string &out, const char *szName) {
         }
         sz++;
     }
-    out = std::string(filePtr, (uintptr_t)sz - (uintptr_t)filePtr);
-    filePtr = sz + 1;
+    out = std::string(mFilePtr, (uintptr_t)sz - (uintptr_t)mFilePtr);
+    mFilePtr = sz + 1;
     return true;
 }
 
@@ -782,48 +806,48 @@ bool Parser::ParseString(std::string &out, const char *szName) {
 void Parser::ParseLV1ObjectBlock(ASE::BaseNode &node) {
     AI_ASE_PARSER_INIT();
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
 
             // first process common tokens such as node name and transform
             // name of the mesh/node
-            if (TokenMatch(filePtr, "NODE_NAME", 9)) {
+            if (TokenMatch(mFilePtr, "NODE_NAME", 9)) {
                 if (!ParseString(node.mName, "*NODE_NAME"))
                     SkipToNextToken();
                 continue;
             }
             // name of the parent of the node
-            if (TokenMatch(filePtr, "NODE_PARENT", 11)) {
+            if (TokenMatch(mFilePtr, "NODE_PARENT", 11)) {
                 if (!ParseString(node.mParent, "*NODE_PARENT"))
                     SkipToNextToken();
                 continue;
             }
             // transformation matrix of the node
-            if (TokenMatch(filePtr, "NODE_TM", 7)) {
+            if (TokenMatch(mFilePtr, "NODE_TM", 7)) {
                 ParseLV2NodeTransformBlock(node);
                 continue;
             }
             // animation data of the node
-            if (TokenMatch(filePtr, "TM_ANIMATION", 12)) {
+            if (TokenMatch(mFilePtr, "TM_ANIMATION", 12)) {
                 ParseLV2AnimationBlock(node);
                 continue;
             }
 
             if (node.mType == BaseNode::Light) {
                 // light settings
-                if (TokenMatch(filePtr, "LIGHT_SETTINGS", 14)) {
+                if (TokenMatch(mFilePtr, "LIGHT_SETTINGS", 14)) {
                     ParseLV2LightSettingsBlock((ASE::Light &)node);
                     continue;
                 }
                 // type of the light source
-                if (TokenMatch(filePtr, "LIGHT_TYPE", 10)) {
-                    if (!ASSIMP_strincmp("omni", filePtr, 4)) {
+                if (TokenMatch(mFilePtr, "LIGHT_TYPE", 10)) {
+                    if (!ASSIMP_strincmp("omni", mFilePtr, 4)) {
                         ((ASE::Light &)node).mLightType = ASE::Light::OMNI;
-                    } else if (!ASSIMP_strincmp("target", filePtr, 6)) {
+                    } else if (!ASSIMP_strincmp("target", mFilePtr, 6)) {
                         ((ASE::Light &)node).mLightType = ASE::Light::TARGET;
-                    } else if (!ASSIMP_strincmp("free", filePtr, 4)) {
+                    } else if (!ASSIMP_strincmp("free", mFilePtr, 4)) {
                         ((ASE::Light &)node).mLightType = ASE::Light::FREE;
-                    } else if (!ASSIMP_strincmp("directional", filePtr, 11)) {
+                    } else if (!ASSIMP_strincmp("directional", mFilePtr, 11)) {
                         ((ASE::Light &)node).mLightType = ASE::Light::DIRECTIONAL;
                     } else {
                         LogWarning("Unknown kind of light source");
@@ -832,13 +856,13 @@ void Parser::ParseLV1ObjectBlock(ASE::BaseNode &node) {
                 }
             } else if (node.mType == BaseNode::Camera) {
                 // Camera settings
-                if (TokenMatch(filePtr, "CAMERA_SETTINGS", 15)) {
+                if (TokenMatch(mFilePtr, "CAMERA_SETTINGS", 15)) {
                     ParseLV2CameraSettingsBlock((ASE::Camera &)node);
                     continue;
-                } else if (TokenMatch(filePtr, "CAMERA_TYPE", 11)) {
-                    if (!ASSIMP_strincmp("target", filePtr, 6)) {
+                } else if (TokenMatch(mFilePtr, "CAMERA_TYPE", 11)) {
+                    if (!ASSIMP_strincmp("target", mFilePtr, 6)) {
                         ((ASE::Camera &)node).mCameraType = ASE::Camera::TARGET;
-                    } else if (!ASSIMP_strincmp("free", filePtr, 4)) {
+                    } else if (!ASSIMP_strincmp("free", mFilePtr, 4)) {
                         ((ASE::Camera &)node).mCameraType = ASE::Camera::FREE;
                     } else {
                         LogWarning("Unknown kind of camera");
@@ -848,13 +872,13 @@ void Parser::ParseLV1ObjectBlock(ASE::BaseNode &node) {
             } else if (node.mType == BaseNode::Mesh) {
                 // mesh data
                 // FIX: Older files use MESH_SOFTSKIN
-                if (TokenMatch(filePtr, "MESH", 4) ||
-                        TokenMatch(filePtr, "MESH_SOFTSKIN", 13)) {
+                if (TokenMatch(mFilePtr, "MESH", 4) ||
+                        TokenMatch(mFilePtr, "MESH_SOFTSKIN", 13)) {
                     ParseLV2MeshBlock((ASE::Mesh &)node);
                     continue;
                 }
                 // mesh material index
-                if (TokenMatch(filePtr, "MATERIAL_REF", 12)) {
+                if (TokenMatch(mFilePtr, "MATERIAL_REF", 12)) {
                     ParseLV4MeshLong(((ASE::Mesh &)node).iMaterialIndex);
                     continue;
                 }
@@ -868,18 +892,18 @@ void Parser::ParseLV1ObjectBlock(ASE::BaseNode &node) {
 void Parser::ParseLV2CameraSettingsBlock(ASE::Camera &camera) {
     AI_ASE_PARSER_INIT();
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
-            if (TokenMatch(filePtr, "CAMERA_NEAR", 11)) {
-                ParseLV4MeshFloat(camera.mNear);
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
+            if (TokenMatch(mFilePtr, "CAMERA_NEAR", 11)) {
+                ParseLV4MeshReal(camera.mNear);
                 continue;
             }
-            if (TokenMatch(filePtr, "CAMERA_FAR", 10)) {
-                ParseLV4MeshFloat(camera.mFar);
+            if (TokenMatch(mFilePtr, "CAMERA_FAR", 10)) {
+                ParseLV4MeshReal(camera.mFar);
                 continue;
             }
-            if (TokenMatch(filePtr, "CAMERA_FOV", 10)) {
-                ParseLV4MeshFloat(camera.mFOV);
+            if (TokenMatch(mFilePtr, "CAMERA_FOV", 10)) {
+                ParseLV4MeshReal(camera.mFOV);
                 continue;
             }
         }
@@ -891,22 +915,22 @@ void Parser::ParseLV2CameraSettingsBlock(ASE::Camera &camera) {
 void Parser::ParseLV2LightSettingsBlock(ASE::Light &light) {
     AI_ASE_PARSER_INIT();
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
-            if (TokenMatch(filePtr, "LIGHT_COLOR", 11)) {
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
+            if (TokenMatch(mFilePtr, "LIGHT_COLOR", 11)) {
                 ParseLV4MeshFloatTriple(&light.mColor.r);
                 continue;
             }
-            if (TokenMatch(filePtr, "LIGHT_INTENS", 12)) {
-                ParseLV4MeshFloat(light.mIntensity);
+            if (TokenMatch(mFilePtr, "LIGHT_INTENS", 12)) {
+                ParseLV4MeshReal(light.mIntensity);
                 continue;
             }
-            if (TokenMatch(filePtr, "LIGHT_HOTSPOT", 13)) {
-                ParseLV4MeshFloat(light.mAngle);
+            if (TokenMatch(mFilePtr, "LIGHT_HOTSPOT", 13)) {
+                ParseLV4MeshReal(light.mAngle);
                 continue;
             }
-            if (TokenMatch(filePtr, "LIGHT_FALLOFF", 13)) {
-                ParseLV4MeshFloat(light.mFalloff);
+            if (TokenMatch(mFilePtr, "LIGHT_FALLOFF", 13)) {
+                ParseLV4MeshReal(light.mFalloff);
                 continue;
             }
         }
@@ -920,9 +944,9 @@ void Parser::ParseLV2AnimationBlock(ASE::BaseNode &mesh) {
 
     ASE::Animation *anim = &mesh.mAnim;
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
-            if (TokenMatch(filePtr, "NODE_NAME", 9)) {
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
+            if (TokenMatch(mFilePtr, "NODE_NAME", 9)) {
                 std::string temp;
                 if (!ParseString(temp, "*NODE_NAME"))
                     SkipToNextToken();
@@ -944,9 +968,9 @@ void Parser::ParseLV2AnimationBlock(ASE::BaseNode &mesh) {
             }
 
             // position keyframes
-            if (TokenMatch(filePtr, "CONTROL_POS_TRACK", 17) ||
-                    TokenMatch(filePtr, "CONTROL_POS_BEZIER", 18) ||
-                    TokenMatch(filePtr, "CONTROL_POS_TCB", 15)) {
+            if (TokenMatch(mFilePtr, "CONTROL_POS_TRACK", 17) ||
+                    TokenMatch(mFilePtr, "CONTROL_POS_BEZIER", 18) ||
+                    TokenMatch(mFilePtr, "CONTROL_POS_TCB", 15)) {
                 if (!anim)
                     SkipSection();
                 else
@@ -954,9 +978,9 @@ void Parser::ParseLV2AnimationBlock(ASE::BaseNode &mesh) {
                 continue;
             }
             // scaling keyframes
-            if (TokenMatch(filePtr, "CONTROL_SCALE_TRACK", 19) ||
-                    TokenMatch(filePtr, "CONTROL_SCALE_BEZIER", 20) ||
-                    TokenMatch(filePtr, "CONTROL_SCALE_TCB", 17)) {
+            if (TokenMatch(mFilePtr, "CONTROL_SCALE_TRACK", 19) ||
+                    TokenMatch(mFilePtr, "CONTROL_SCALE_BEZIER", 20) ||
+                    TokenMatch(mFilePtr, "CONTROL_SCALE_TCB", 17)) {
                 if (!anim || anim == &mesh.mTargetAnim) {
                     // Target animation channels may have no rotation channels
                     ASSIMP_LOG_ERROR("ASE: Ignoring scaling channel in target animation");
@@ -966,9 +990,9 @@ void Parser::ParseLV2AnimationBlock(ASE::BaseNode &mesh) {
                 continue;
             }
             // rotation keyframes
-            if (TokenMatch(filePtr, "CONTROL_ROT_TRACK", 17) ||
-                    TokenMatch(filePtr, "CONTROL_ROT_BEZIER", 18) ||
-                    TokenMatch(filePtr, "CONTROL_ROT_TCB", 15)) {
+            if (TokenMatch(mFilePtr, "CONTROL_ROT_TRACK", 17) ||
+                    TokenMatch(mFilePtr, "CONTROL_ROT_BEZIER", 18) ||
+                    TokenMatch(mFilePtr, "CONTROL_ROT_TCB", 15)) {
                 if (!anim || anim == &mesh.mTargetAnim) {
                     // Target animation channels may have no rotation channels
                     ASSIMP_LOG_ERROR("ASE: Ignoring rotation channel in target animation");
@@ -987,8 +1011,8 @@ void Parser::ParseLV3ScaleAnimationBlock(ASE::Animation &anim) {
     unsigned int iIndex;
 
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
 
             bool b = false;
 
@@ -996,25 +1020,25 @@ void Parser::ParseLV3ScaleAnimationBlock(ASE::Animation &anim) {
             // we ignore the additional information for bezier's and TCBs
 
             // simple scaling keyframe
-            if (TokenMatch(filePtr, "CONTROL_SCALE_SAMPLE", 20)) {
+            if (TokenMatch(mFilePtr, "CONTROL_SCALE_SAMPLE", 20)) {
                 b = true;
                 anim.mScalingType = ASE::Animation::TRACK;
             }
 
             // Bezier scaling keyframe
-            if (TokenMatch(filePtr, "CONTROL_BEZIER_SCALE_KEY", 24)) {
+            if (TokenMatch(mFilePtr, "CONTROL_BEZIER_SCALE_KEY", 24)) {
                 b = true;
                 anim.mScalingType = ASE::Animation::BEZIER;
             }
             // TCB scaling keyframe
-            if (TokenMatch(filePtr, "CONTROL_TCB_SCALE_KEY", 21)) {
+            if (TokenMatch(mFilePtr, "CONTROL_TCB_SCALE_KEY", 21)) {
                 b = true;
                 anim.mScalingType = ASE::Animation::TCB;
             }
             if (b) {
                 anim.akeyScaling.emplace_back();
                 aiVectorKey &key = anim.akeyScaling.back();
-                ParseLV4MeshFloatTriple(&key.mValue.x, iIndex);
+                ParseLV4MeshRealTriple(&key.mValue.x, iIndex);
                 key.mTime = (double)iIndex;
             }
         }
@@ -1026,8 +1050,8 @@ void Parser::ParseLV3PosAnimationBlock(ASE::Animation &anim) {
     AI_ASE_PARSER_INIT();
     unsigned int iIndex;
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
 
             bool b = false;
 
@@ -1035,25 +1059,25 @@ void Parser::ParseLV3PosAnimationBlock(ASE::Animation &anim) {
             // we ignore the additional information for bezier's and TCBs
 
             // simple scaling keyframe
-            if (TokenMatch(filePtr, "CONTROL_POS_SAMPLE", 18)) {
+            if (TokenMatch(mFilePtr, "CONTROL_POS_SAMPLE", 18)) {
                 b = true;
                 anim.mPositionType = ASE::Animation::TRACK;
             }
 
             // Bezier scaling keyframe
-            if (TokenMatch(filePtr, "CONTROL_BEZIER_POS_KEY", 22)) {
+            if (TokenMatch(mFilePtr, "CONTROL_BEZIER_POS_KEY", 22)) {
                 b = true;
                 anim.mPositionType = ASE::Animation::BEZIER;
             }
             // TCB scaling keyframe
-            if (TokenMatch(filePtr, "CONTROL_TCB_POS_KEY", 19)) {
+            if (TokenMatch(mFilePtr, "CONTROL_TCB_POS_KEY", 19)) {
                 b = true;
                 anim.mPositionType = ASE::Animation::TCB;
             }
             if (b) {
                 anim.akeyPositions.emplace_back();
                 aiVectorKey &key = anim.akeyPositions.back();
-                ParseLV4MeshFloatTriple(&key.mValue.x, iIndex);
+                ParseLV4MeshRealTriple(&key.mValue.x, iIndex);
                 key.mTime = (double)iIndex;
             }
         }
@@ -1065,8 +1089,8 @@ void Parser::ParseLV3RotAnimationBlock(ASE::Animation &anim) {
     AI_ASE_PARSER_INIT();
     unsigned int iIndex;
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
 
             bool b = false;
 
@@ -1074,18 +1098,18 @@ void Parser::ParseLV3RotAnimationBlock(ASE::Animation &anim) {
             // we ignore the additional information for bezier's and TCBs
 
             // simple scaling keyframe
-            if (TokenMatch(filePtr, "CONTROL_ROT_SAMPLE", 18)) {
+            if (TokenMatch(mFilePtr, "CONTROL_ROT_SAMPLE", 18)) {
                 b = true;
                 anim.mRotationType = ASE::Animation::TRACK;
             }
 
             // Bezier scaling keyframe
-            if (TokenMatch(filePtr, "CONTROL_BEZIER_ROT_KEY", 22)) {
+            if (TokenMatch(mFilePtr, "CONTROL_BEZIER_ROT_KEY", 22)) {
                 b = true;
                 anim.mRotationType = ASE::Animation::BEZIER;
             }
             // TCB scaling keyframe
-            if (TokenMatch(filePtr, "CONTROL_TCB_ROT_KEY", 19)) {
+            if (TokenMatch(mFilePtr, "CONTROL_TCB_ROT_KEY", 19)) {
                 b = true;
                 anim.mRotationType = ASE::Animation::TCB;
             }
@@ -1094,8 +1118,8 @@ void Parser::ParseLV3RotAnimationBlock(ASE::Animation &anim) {
                 aiQuatKey &key = anim.akeyRotations.back();
                 aiVector3D v;
                 ai_real f;
-                ParseLV4MeshFloatTriple(&v.x, iIndex);
-                ParseLV4MeshFloat(f);
+                ParseLV4MeshRealTriple(&v.x, iIndex);
+                ParseLV4MeshReal(f);
                 key.mTime = (double)iIndex;
                 key.mValue = aiQuaternion(v, f);
             }
@@ -1108,10 +1132,10 @@ void Parser::ParseLV2NodeTransformBlock(ASE::BaseNode &mesh) {
     AI_ASE_PARSER_INIT();
     int mode = 0;
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
             // name of the node
-            if (TokenMatch(filePtr, "NODE_NAME", 9)) {
+            if (TokenMatch(mFilePtr, "NODE_NAME", 9)) {
                 std::string temp;
                 if (!ParseString(temp, "*NODE_NAME"))
                     SkipToNextToken();
@@ -1138,28 +1162,28 @@ void Parser::ParseLV2NodeTransformBlock(ASE::BaseNode &mesh) {
             if (mode) {
                 // fourth row of the transformation matrix - and also the
                 // only information here that is interesting for targets
-                if (TokenMatch(filePtr, "TM_ROW3", 7)) {
-                    ParseLV4MeshFloatTriple((mode == 1 ? mesh.mTransform[3] : &mesh.mTargetPosition.x));
+                if (TokenMatch(mFilePtr, "TM_ROW3", 7)) {
+                    ParseLV4MeshRealTriple((mode == 1 ? mesh.mTransform[3] : &mesh.mTargetPosition.x));
                     continue;
                 }
                 if (mode == 1) {
                     // first row of the transformation matrix
-                    if (TokenMatch(filePtr, "TM_ROW0", 7)) {
-                        ParseLV4MeshFloatTriple(mesh.mTransform[0]);
+                    if (TokenMatch(mFilePtr, "TM_ROW0", 7)) {
+                        ParseLV4MeshRealTriple(mesh.mTransform[0]);
                         continue;
                     }
                     // second row of the transformation matrix
-                    if (TokenMatch(filePtr, "TM_ROW1", 7)) {
-                        ParseLV4MeshFloatTriple(mesh.mTransform[1]);
+                    if (TokenMatch(mFilePtr, "TM_ROW1", 7)) {
+                        ParseLV4MeshRealTriple(mesh.mTransform[1]);
                         continue;
                     }
                     // third row of the transformation matrix
-                    if (TokenMatch(filePtr, "TM_ROW2", 7)) {
-                        ParseLV4MeshFloatTriple(mesh.mTransform[2]);
+                    if (TokenMatch(mFilePtr, "TM_ROW2", 7)) {
+                        ParseLV4MeshRealTriple(mesh.mTransform[2]);
                         continue;
                     }
                     // inherited position axes
-                    if (TokenMatch(filePtr, "INHERIT_POS", 11)) {
+                    if (TokenMatch(mFilePtr, "INHERIT_POS", 11)) {
                         unsigned int aiVal[3];
                         ParseLV4MeshLongTriple(aiVal);
 
@@ -1168,7 +1192,7 @@ void Parser::ParseLV2NodeTransformBlock(ASE::BaseNode &mesh) {
                         continue;
                     }
                     // inherited rotation axes
-                    if (TokenMatch(filePtr, "INHERIT_ROT", 11)) {
+                    if (TokenMatch(mFilePtr, "INHERIT_ROT", 11)) {
                         unsigned int aiVal[3];
                         ParseLV4MeshLongTriple(aiVal);
 
@@ -1177,7 +1201,7 @@ void Parser::ParseLV2NodeTransformBlock(ASE::BaseNode &mesh) {
                         continue;
                     }
                     // inherited scaling axes
-                    if (TokenMatch(filePtr, "INHERIT_SCL", 11)) {
+                    if (TokenMatch(mFilePtr, "INHERIT_SCL", 11)) {
                         unsigned int aiVal[3];
                         ParseLV4MeshLongTriple(aiVal);
 
@@ -1202,75 +1226,75 @@ void Parser::ParseLV2MeshBlock(ASE::Mesh &mesh) {
     unsigned int iNumCVertices = 0;
     unsigned int iNumCFaces = 0;
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
             // Number of vertices in the mesh
-            if (TokenMatch(filePtr, "MESH_NUMVERTEX", 14)) {
+            if (TokenMatch(mFilePtr, "MESH_NUMVERTEX", 14)) {
                 ParseLV4MeshLong(iNumVertices);
                 continue;
             }
             // Number of texture coordinates in the mesh
-            if (TokenMatch(filePtr, "MESH_NUMTVERTEX", 15)) {
+            if (TokenMatch(mFilePtr, "MESH_NUMTVERTEX", 15)) {
                 ParseLV4MeshLong(iNumTVertices);
                 continue;
             }
             // Number of vertex colors in the mesh
-            if (TokenMatch(filePtr, "MESH_NUMCVERTEX", 15)) {
+            if (TokenMatch(mFilePtr, "MESH_NUMCVERTEX", 15)) {
                 ParseLV4MeshLong(iNumCVertices);
                 continue;
             }
             // Number of regular faces in the mesh
-            if (TokenMatch(filePtr, "MESH_NUMFACES", 13)) {
+            if (TokenMatch(mFilePtr, "MESH_NUMFACES", 13)) {
                 ParseLV4MeshLong(iNumFaces);
                 continue;
             }
             // Number of UVWed faces in the mesh
-            if (TokenMatch(filePtr, "MESH_NUMTVFACES", 15)) {
+            if (TokenMatch(mFilePtr, "MESH_NUMTVFACES", 15)) {
                 ParseLV4MeshLong(iNumTFaces);
                 continue;
             }
             // Number of colored faces in the mesh
-            if (TokenMatch(filePtr, "MESH_NUMCVFACES", 15)) {
+            if (TokenMatch(mFilePtr, "MESH_NUMCVFACES", 15)) {
                 ParseLV4MeshLong(iNumCFaces);
                 continue;
             }
             // mesh vertex list block
-            if (TokenMatch(filePtr, "MESH_VERTEX_LIST", 16)) {
+            if (TokenMatch(mFilePtr, "MESH_VERTEX_LIST", 16)) {
                 ParseLV3MeshVertexListBlock(iNumVertices, mesh);
                 continue;
             }
             // mesh face list block
-            if (TokenMatch(filePtr, "MESH_FACE_LIST", 14)) {
+            if (TokenMatch(mFilePtr, "MESH_FACE_LIST", 14)) {
                 ParseLV3MeshFaceListBlock(iNumFaces, mesh);
                 continue;
             }
             // mesh texture vertex list block
-            if (TokenMatch(filePtr, "MESH_TVERTLIST", 14)) {
+            if (TokenMatch(mFilePtr, "MESH_TVERTLIST", 14)) {
                 ParseLV3MeshTListBlock(iNumTVertices, mesh);
                 continue;
             }
             // mesh texture face block
-            if (TokenMatch(filePtr, "MESH_TFACELIST", 14)) {
+            if (TokenMatch(mFilePtr, "MESH_TFACELIST", 14)) {
                 ParseLV3MeshTFaceListBlock(iNumTFaces, mesh);
                 continue;
             }
             // mesh color vertex list block
-            if (TokenMatch(filePtr, "MESH_CVERTLIST", 14)) {
+            if (TokenMatch(mFilePtr, "MESH_CVERTLIST", 14)) {
                 ParseLV3MeshCListBlock(iNumCVertices, mesh);
                 continue;
             }
             // mesh color face block
-            if (TokenMatch(filePtr, "MESH_CFACELIST", 14)) {
+            if (TokenMatch(mFilePtr, "MESH_CFACELIST", 14)) {
                 ParseLV3MeshCFaceListBlock(iNumCFaces, mesh);
                 continue;
             }
             // mesh normals
-            if (TokenMatch(filePtr, "MESH_NORMALS", 12)) {
+            if (TokenMatch(mFilePtr, "MESH_NORMALS", 12)) {
                 ParseLV3MeshNormalListBlock(mesh);
                 continue;
             }
             // another mesh UV channel ...
-            if (TokenMatch(filePtr, "MESH_MAPPINGCHANNEL", 19)) {
+            if (TokenMatch(mFilePtr, "MESH_MAPPINGCHANNEL", 19)) {
                 unsigned int iIndex(0);
                 ParseLV4MeshLong(iIndex);
                 if (0 == iIndex) {
@@ -1295,7 +1319,7 @@ void Parser::ParseLV2MeshBlock(ASE::Mesh &mesh) {
                 }
             }
             // mesh animation keyframe. Not supported
-            if (TokenMatch(filePtr, "MESH_ANIMATION", 14)) {
+            if (TokenMatch(mFilePtr, "MESH_ANIMATION", 14)) {
 
                 LogWarning("Found *MESH_ANIMATION element in ASE/ASK file. "
                            "Keyframe animation is not supported by Assimp, this element "
@@ -1303,7 +1327,7 @@ void Parser::ParseLV2MeshBlock(ASE::Mesh &mesh) {
                 //SkipSection();
                 continue;
             }
-            if (TokenMatch(filePtr, "MESH_WEIGHTS", 12)) {
+            if (TokenMatch(mFilePtr, "MESH_WEIGHTS", 12)) {
                 ParseLV3MeshWeightsBlock(mesh);
                 continue;
             }
@@ -1317,26 +1341,26 @@ void Parser::ParseLV3MeshWeightsBlock(ASE::Mesh &mesh) {
 
     unsigned int iNumVertices = 0, iNumBones = 0;
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
 
             // Number of bone vertices ...
-            if (TokenMatch(filePtr, "MESH_NUMVERTEX", 14)) {
+            if (TokenMatch(mFilePtr, "MESH_NUMVERTEX", 14)) {
                 ParseLV4MeshLong(iNumVertices);
                 continue;
             }
             // Number of bones
-            if (TokenMatch(filePtr, "MESH_NUMBONE", 12)) {
+            if (TokenMatch(mFilePtr, "MESH_NUMBONE", 12)) {
                 ParseLV4MeshLong(iNumBones);
                 continue;
             }
             // parse the list of bones
-            if (TokenMatch(filePtr, "MESH_BONE_LIST", 14)) {
+            if (TokenMatch(mFilePtr, "MESH_BONE_LIST", 14)) {
                 ParseLV4MeshBones(iNumBones, mesh);
                 continue;
             }
             // parse the list of bones vertices
-            if (TokenMatch(filePtr, "MESH_BONE_VERTEX_LIST", 21)) {
+            if (TokenMatch(mFilePtr, "MESH_BONE_VERTEX_LIST", 21)) {
                 ParseLV4MeshBonesVertices(iNumVertices, mesh);
                 continue;
             }
@@ -1349,14 +1373,14 @@ void Parser::ParseLV4MeshBones(unsigned int iNumBones, ASE::Mesh &mesh) {
     AI_ASE_PARSER_INIT();
     mesh.mBones.resize(iNumBones, Bone("UNNAMED"));
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
 
             // Mesh bone with name ...
-            if (TokenMatch(filePtr, "MESH_BONE_NAME", 14)) {
+            if (TokenMatch(mFilePtr, "MESH_BONE_NAME", 14)) {
                 // parse an index ...
-                if (SkipSpaces(&filePtr)) {
-                    unsigned int iIndex = strtoul10(filePtr, &filePtr);
+                if (SkipSpaces(&mFilePtr, mEnd)) {
+                    unsigned int iIndex = strtoul10(mFilePtr, &mFilePtr);
                     if (iIndex >= iNumBones) {
                         LogWarning("Bone index is out of bounds");
                         continue;
@@ -1375,32 +1399,35 @@ void Parser::ParseLV4MeshBonesVertices(unsigned int iNumVertices, ASE::Mesh &mes
     AI_ASE_PARSER_INIT();
     mesh.mBoneVertices.resize(iNumVertices);
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
 
             // Mesh bone vertex
-            if (TokenMatch(filePtr, "MESH_BONE_VERTEX", 16)) {
+            if (TokenMatch(mFilePtr, "MESH_BONE_VERTEX", 16)) {
                 // read the vertex index
-                unsigned int iIndex = strtoul10(filePtr, &filePtr);
-                if (iIndex >= mesh.mPositions.size()) {
-                    iIndex = (unsigned int)mesh.mPositions.size() - 1;
+                unsigned int iIndex = strtoul10(mFilePtr, &mFilePtr);
+                if (mesh.mBoneVertices.empty()) {
+                    SkipSection();
+                }
+                if (iIndex >= mesh.mBoneVertices.size() ) {
                     LogWarning("Bone vertex index is out of bounds. Using the largest valid "
                                "bone vertex index instead");
+                    iIndex = (unsigned int)mesh.mBoneVertices.size() - 1;
                 }
 
                 // --- ignored
                 ai_real afVert[3];
-                ParseLV4MeshFloatTriple(afVert);
+                ParseLV4MeshRealTriple(afVert);
 
                 std::pair<int, float> pairOut;
                 while (true) {
                     // first parse the bone index ...
-                    if (!SkipSpaces(&filePtr)) break;
-                    pairOut.first = strtoul10(filePtr, &filePtr);
+                    if (!SkipSpaces(&mFilePtr, mEnd)) break;
+                    pairOut.first = strtoul10(mFilePtr, &mFilePtr);
 
                     // then parse the vertex weight
-                    if (!SkipSpaces(&filePtr)) break;
-                    filePtr = fast_atoreal_move<float>(filePtr, pairOut.second);
+                    if (!SkipSpaces(&mFilePtr, mEnd)) break;
+                    mFilePtr = fast_atoreal_move<float>(mFilePtr, pairOut.second);
 
                     // -1 marks unused entries
                     if (-1 != pairOut.first) {
@@ -1421,15 +1448,15 @@ void Parser::ParseLV3MeshVertexListBlock(
     // allocate enough storage in the array
     mesh.mPositions.resize(iNumVertices);
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
 
             // Vertex entry
-            if (TokenMatch(filePtr, "MESH_VERTEX", 11)) {
+            if (TokenMatch(mFilePtr, "MESH_VERTEX", 11)) {
 
                 aiVector3D vTemp;
                 unsigned int iIndex;
-                ParseLV4MeshFloatTriple(&vTemp.x, iIndex);
+                ParseLV4MeshRealTriple(&vTemp.x, iIndex);
 
                 if (iIndex >= iNumVertices) {
                     LogWarning("Invalid vertex index. It will be ignored");
@@ -1448,11 +1475,11 @@ void Parser::ParseLV3MeshFaceListBlock(unsigned int iNumFaces, ASE::Mesh &mesh)
     // allocate enough storage in the face array
     mesh.mFaces.resize(iNumFaces);
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
 
             // Face entry
-            if (TokenMatch(filePtr, "MESH_FACE", 9)) {
+            if (TokenMatch(mFilePtr, "MESH_FACE", 9)) {
 
                 ASE::Face mFace;
                 ParseLV4MeshFace(mFace);
@@ -1475,14 +1502,14 @@ void Parser::ParseLV3MeshTListBlock(unsigned int iNumVertices,
     // allocate enough storage in the array
     mesh.amTexCoords[iChannel].resize(iNumVertices);
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
 
             // Vertex entry
-            if (TokenMatch(filePtr, "MESH_TVERT", 10)) {
+            if (TokenMatch(mFilePtr, "MESH_TVERT", 10)) {
                 aiVector3D vTemp;
                 unsigned int iIndex;
-                ParseLV4MeshFloatTriple(&vTemp.x, iIndex);
+                ParseLV4MeshRealTriple(&vTemp.x, iIndex);
 
                 if (iIndex >= iNumVertices) {
                     LogWarning("Tvertex has an invalid index. It will be ignored");
@@ -1504,11 +1531,11 @@ void Parser::ParseLV3MeshTFaceListBlock(unsigned int iNumFaces,
         ASE::Mesh &mesh, unsigned int iChannel) {
     AI_ASE_PARSER_INIT();
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
 
             // Face entry
-            if (TokenMatch(filePtr, "MESH_TFACE", 10)) {
+            if (TokenMatch(mFilePtr, "MESH_TFACE", 10)) {
                 unsigned int aiValues[3];
                 unsigned int iIndex = 0;
 
@@ -1534,26 +1561,26 @@ void Parser::ParseLV3MappingChannel(unsigned int iChannel, ASE::Mesh &mesh) {
     unsigned int iNumTVertices = 0;
     unsigned int iNumTFaces = 0;
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
 
             // Number of texture coordinates in the mesh
-            if (TokenMatch(filePtr, "MESH_NUMTVERTEX", 15)) {
+            if (TokenMatch(mFilePtr, "MESH_NUMTVERTEX", 15)) {
                 ParseLV4MeshLong(iNumTVertices);
                 continue;
             }
             // Number of UVWed faces in the mesh
-            if (TokenMatch(filePtr, "MESH_NUMTVFACES", 15)) {
+            if (TokenMatch(mFilePtr, "MESH_NUMTVFACES", 15)) {
                 ParseLV4MeshLong(iNumTFaces);
                 continue;
             }
             // mesh texture vertex list block
-            if (TokenMatch(filePtr, "MESH_TVERTLIST", 14)) {
+            if (TokenMatch(mFilePtr, "MESH_TVERTLIST", 14)) {
                 ParseLV3MeshTListBlock(iNumTVertices, mesh, iChannel);
                 continue;
             }
             // mesh texture face block
-            if (TokenMatch(filePtr, "MESH_TFACELIST", 14)) {
+            if (TokenMatch(mFilePtr, "MESH_TFACELIST", 14)) {
                 ParseLV3MeshTFaceListBlock(iNumTFaces, mesh, iChannel);
                 continue;
             }
@@ -1568,11 +1595,11 @@ void Parser::ParseLV3MeshCListBlock(unsigned int iNumVertices, ASE::Mesh &mesh)
     // allocate enough storage in the array
     mesh.mVertexColors.resize(iNumVertices);
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
 
             // Vertex entry
-            if (TokenMatch(filePtr, "MESH_VERTCOL", 12)) {
+            if (TokenMatch(mFilePtr, "MESH_VERTCOL", 12)) {
                 aiColor4D vTemp;
                 vTemp.a = 1.0f;
                 unsigned int iIndex;
@@ -1592,11 +1619,11 @@ void Parser::ParseLV3MeshCListBlock(unsigned int iNumVertices, ASE::Mesh &mesh)
 void Parser::ParseLV3MeshCFaceListBlock(unsigned int iNumFaces, ASE::Mesh &mesh) {
     AI_ASE_PARSER_INIT();
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
 
             // Face entry
-            if (TokenMatch(filePtr, "MESH_CFACE", 10)) {
+            if (TokenMatch(mFilePtr, "MESH_CFACE", 10)) {
                 unsigned int aiValues[3];
                 unsigned int iIndex = 0;
 
@@ -1629,11 +1656,11 @@ void Parser::ParseLV3MeshNormalListBlock(ASE::Mesh &sMesh) {
     // Smooth the vertex and face normals together. The result
     // will be edgy then, but otherwise everything would be soft ...
     while (true) {
-        if ('*' == *filePtr) {
-            ++filePtr;
-            if (faceIdx != UINT_MAX && TokenMatch(filePtr, "MESH_VERTEXNORMAL", 17)) {
+        if ('*' == *mFilePtr) {
+            ++mFilePtr;
+            if (faceIdx != UINT_MAX && TokenMatch(mFilePtr, "MESH_VERTEXNORMAL", 17)) {
                 aiVector3D vNormal;
-                ParseLV4MeshFloatTriple(&vNormal.x, index);
+                ParseLV4MeshRealTriple(&vNormal.x, index);
                 if (faceIdx >= sMesh.mFaces.size())
                     continue;
 
@@ -1653,9 +1680,9 @@ void Parser::ParseLV3MeshNormalListBlock(ASE::Mesh &sMesh) {
                 sMesh.mNormals[faceIdx * 3 + index] += vNormal;
                 continue;
             }
-            if (TokenMatch(filePtr, "MESH_FACENORMAL", 15)) {
+            if (TokenMatch(mFilePtr, "MESH_FACENORMAL", 15)) {
                 aiVector3D vNormal;
-                ParseLV4MeshFloatTriple(&vNormal.x, faceIdx);
+                ParseLV4MeshRealTriple(&vNormal.x, faceIdx);
 
                 if (faceIdx >= sMesh.mFaces.size()) {
                     ASSIMP_LOG_ERROR("ASE: Invalid vertex index in MESH_FACENORMAL section");
@@ -1675,34 +1702,34 @@ void Parser::ParseLV3MeshNormalListBlock(ASE::Mesh &sMesh) {
 // ------------------------------------------------------------------------------------------------
 void Parser::ParseLV4MeshFace(ASE::Face &out) {
     // skip spaces and tabs
-    if (!SkipSpaces(&filePtr)) {
+    if (!SkipSpaces(&mFilePtr, mEnd)) {
         LogWarning("Unable to parse *MESH_FACE Element: Unexpected EOL [#1]");
         SkipToNextToken();
         return;
     }
 
     // parse the face index
-    out.iFace = strtoul10(filePtr, &filePtr);
+    out.iFace = strtoul10(mFilePtr, &mFilePtr);
 
     // next character should be ':'
-    if (!SkipSpaces(&filePtr)) {
+    if (!SkipSpaces(&mFilePtr, mEnd)) {
         // FIX: there are some ASE files which haven't got : here ....
         LogWarning("Unable to parse *MESH_FACE Element: Unexpected EOL. \':\' expected [#2]");
         SkipToNextToken();
         return;
     }
     // FIX: There are some ASE files which haven't got ':' here
-    if (':' == *filePtr) ++filePtr;
+    if (':' == *mFilePtr) ++mFilePtr;
 
     // Parse all mesh indices
     for (unsigned int i = 0; i < 3; ++i) {
         unsigned int iIndex = 0;
-        if (!SkipSpaces(&filePtr)) {
+        if (!SkipSpaces(&mFilePtr, mEnd)) {
             LogWarning("Unable to parse *MESH_FACE Element: Unexpected EOL");
             SkipToNextToken();
             return;
         }
-        switch (*filePtr) {
+        switch (*mFilePtr) {
         case 'A':
         case 'a':
             break;
@@ -1720,39 +1747,39 @@ void Parser::ParseLV4MeshFace(ASE::Face &out) {
             SkipToNextToken();
             return;
         };
-        ++filePtr;
+        ++mFilePtr;
 
         // next character should be ':'
-        if (!SkipSpaces(&filePtr) || ':' != *filePtr) {
+        if (!SkipSpaces(&mFilePtr, mEnd) || ':' != *mFilePtr) {
             LogWarning("Unable to parse *MESH_FACE Element: "
                        "Unexpected EOL. \':\' expected [#2]");
             SkipToNextToken();
             return;
         }
 
-        ++filePtr;
-        if (!SkipSpaces(&filePtr)) {
+        ++mFilePtr;
+        if (!SkipSpaces(&mFilePtr, mEnd)) {
             LogWarning("Unable to parse *MESH_FACE Element: Unexpected EOL. "
-                       "Vertex index ecpected [#4]");
+                       "Vertex index expected [#4]");
             SkipToNextToken();
             return;
         }
-        out.mIndices[iIndex] = strtoul10(filePtr, &filePtr);
+        out.mIndices[iIndex] = strtoul10(mFilePtr, &mFilePtr);
     }
 
     // now we need to skip the AB, BC, CA blocks.
     while (true) {
-        if ('*' == *filePtr) break;
-        if (IsLineEnd(*filePtr)) {
+        if ('*' == *mFilePtr) break;
+        if (IsLineEnd(*mFilePtr)) {
             //iLineNumber++;
             return;
         }
-        filePtr++;
+        mFilePtr++;
     }
 
     // parse the smoothing group of the face
-    if (TokenMatch(filePtr, "*MESH_SMOOTHING", 15)) {
-        if (!SkipSpaces(&filePtr)) {
+    if (TokenMatch(mFilePtr, "*MESH_SMOOTHING", 15)) {
+        if (!SkipSpaces(&mFilePtr, mEnd)) {
             LogWarning("Unable to parse *MESH_SMOOTHING Element: "
                        "Unexpected EOL. Smoothing group(s) expected [#5]");
             SkipToNextToken();
@@ -1762,43 +1789,43 @@ void Parser::ParseLV4MeshFace(ASE::Face &out) {
         // Parse smoothing groups until we don't anymore see commas
         // FIX: There needn't always be a value, sad but true
         while (true) {
-            if (*filePtr < '9' && *filePtr >= '0') {
-                uint32_t value = strtoul10(filePtr, &filePtr);
+            if (*mFilePtr < '9' && *mFilePtr >= '0') {
+                uint32_t value = strtoul10(mFilePtr, &mFilePtr);
                 if (value < 32) {
-                    out.iSmoothGroup |= (1 << strtoul10(filePtr, &filePtr));
+                    out.iSmoothGroup |= (1 << strtoul10(mFilePtr, &mFilePtr));
                 } else {
                     const std::string message = std::string("Unable to set smooth group, value with ") + ai_to_string(value) + std::string(" out of range");
                     LogWarning(message.c_str());
                 }
             }
-            SkipSpaces(&filePtr);
-            if (',' != *filePtr) {
+            SkipSpaces(&mFilePtr, mEnd);
+            if (',' != *mFilePtr) {
                 break;
             }
-            ++filePtr;
-            SkipSpaces(&filePtr);
+            ++mFilePtr;
+            SkipSpaces(&mFilePtr, mEnd);
         }
     }
 
     // *MESH_MTLID  is optional, too
     while (true) {
-        if ('*' == *filePtr) {
+        if ('*' == *mFilePtr) {
             break;
         }
-        if (IsLineEnd(*filePtr)) {
+        if (IsLineEnd(*mFilePtr)) {
             return;
         }
-        filePtr++;
+        mFilePtr++;
     }
 
-    if (TokenMatch(filePtr, "*MESH_MTLID", 11)) {
-        if (!SkipSpaces(&filePtr)) {
+    if (TokenMatch(mFilePtr, "*MESH_MTLID", 11)) {
+        if (!SkipSpaces(&mFilePtr, mEnd)) {
             LogWarning("Unable to parse *MESH_MTLID Element: Unexpected EOL. "
                        "Material index expected [#6]");
             SkipToNextToken();
             return;
         }
-        out.iMaterial = strtoul10(filePtr, &filePtr);
+        out.iMaterial = strtoul10(mFilePtr, &mFilePtr);
     }
     return;
 }
@@ -1820,7 +1847,17 @@ void Parser::ParseLV4MeshLongTriple(unsigned int *apOut, unsigned int &rIndexOut
     ParseLV4MeshLongTriple(apOut);
 }
 // ------------------------------------------------------------------------------------------------
-void Parser::ParseLV4MeshFloatTriple(ai_real *apOut, unsigned int &rIndexOut) {
+void Parser::ParseLV4MeshRealTriple(ai_real *apOut, unsigned int &rIndexOut) {
+    ai_assert(nullptr != apOut);
+
+    // parse the index
+    ParseLV4MeshLong(rIndexOut);
+
+    // parse the three others
+    ParseLV4MeshRealTriple(apOut);
+}
+// ------------------------------------------------------------------------------------------------
+void Parser::ParseLV4MeshFloatTriple(float* apOut, unsigned int& rIndexOut) {
     ai_assert(nullptr != apOut);
 
     // parse the index
@@ -1830,7 +1867,15 @@ void Parser::ParseLV4MeshFloatTriple(ai_real *apOut, unsigned int &rIndexOut) {
     ParseLV4MeshFloatTriple(apOut);
 }
 // ------------------------------------------------------------------------------------------------
-void Parser::ParseLV4MeshFloatTriple(ai_real *apOut) {
+void Parser::ParseLV4MeshRealTriple(ai_real *apOut) {
+    ai_assert(nullptr != apOut);
+
+    for (unsigned int i = 0; i < 3; ++i) {
+        ParseLV4MeshReal(apOut[i]);
+    }
+}
+// ------------------------------------------------------------------------------------------------
+void Parser::ParseLV4MeshFloatTriple(float* apOut) {
     ai_assert(nullptr != apOut);
 
     for (unsigned int i = 0; i < 3; ++i) {
@@ -1838,9 +1883,9 @@ void Parser::ParseLV4MeshFloatTriple(ai_real *apOut) {
     }
 }
 // ------------------------------------------------------------------------------------------------
-void Parser::ParseLV4MeshFloat(ai_real &fOut) {
+void Parser::ParseLV4MeshReal(ai_real &fOut) {
     // skip spaces and tabs
-    if (!SkipSpaces(&filePtr)) {
+    if (!SkipSpaces(&mFilePtr, mEnd)) {
         // LOG
         LogWarning("Unable to parse float: unexpected EOL [#1]");
         fOut = 0.0;
@@ -1848,12 +1893,25 @@ void Parser::ParseLV4MeshFloat(ai_real &fOut) {
         return;
     }
     // parse the first float
-    filePtr = fast_atoreal_move<ai_real>(filePtr, fOut);
+    mFilePtr = fast_atoreal_move<ai_real>(mFilePtr, fOut);
+}
+// ------------------------------------------------------------------------------------------------
+void Parser::ParseLV4MeshFloat(float &fOut) {
+    // skip spaces and tabs
+    if (!SkipSpaces(&mFilePtr, mEnd)) {
+        // LOG
+        LogWarning("Unable to parse float: unexpected EOL [#1]");
+        fOut = 0.0;
+        ++iLineNumber;
+        return;
+    }
+    // parse the first float
+    mFilePtr = fast_atoreal_move<float>(mFilePtr, fOut);
 }
 // ------------------------------------------------------------------------------------------------
 void Parser::ParseLV4MeshLong(unsigned int &iOut) {
     // Skip spaces and tabs
-    if (!SkipSpaces(&filePtr)) {
+    if (!SkipSpaces(&mFilePtr, mEnd)) {
         // LOG
         LogWarning("Unable to parse long: unexpected EOL [#1]");
         iOut = 0;
@@ -1861,7 +1919,7 @@ void Parser::ParseLV4MeshLong(unsigned int &iOut) {
         return;
     }
     // parse the value
-    iOut = strtoul10(filePtr, &filePtr);
+    iOut = strtoul10(mFilePtr, &mFilePtr);
 }
 
 }
diff --git a/code/AssetLib/ASE/ASEParser.h b/code/AssetLib/ASE/ASEParser.h
index c41cd59d3..408c1ee08 100644
--- a/code/AssetLib/ASE/ASEParser.h
+++ b/code/AssetLib/ASE/ASEParser.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -391,11 +391,11 @@ public:
     // -------------------------------------------------------------------
     //! Construct a parser from a given input file which is
     //! guaranteed to be terminated with zero.
-    //! @param szFile Input file
+    //! @param file              The name of the input file.
     //! @param fileFormatDefault Assumed file format version. If the
     //!   file format is specified in the file the new value replaces
     //!   the default value.
-    Parser(const char *szFile, unsigned int fileFormatDefault);
+    Parser(const char *file, size_t fileLen, unsigned int fileFormatDefault);
 
     // -------------------------------------------------------------------
     //! Parses the file into the parsers internal representation
@@ -553,13 +553,15 @@ private:
     //! (also works for MESH_TVERT, MESH_CFACE, MESH_VERTCOL  ...)
     //! \param apOut Output buffer (3 floats)
     //! \param rIndexOut Output index
-    void ParseLV4MeshFloatTriple(ai_real *apOut, unsigned int &rIndexOut);
+    void ParseLV4MeshRealTriple(ai_real *apOut, unsigned int &rIndexOut);
+    void ParseLV4MeshFloatTriple(float *apOut, unsigned int &rIndexOut);
 
     // -------------------------------------------------------------------
     //! Parse a *MESH_VERT block in a file
     //! (also works for MESH_TVERT, MESH_CFACE, MESH_VERTCOL  ...)
     //! \param apOut Output buffer (3 floats)
-    void ParseLV4MeshFloatTriple(ai_real *apOut);
+    void ParseLV4MeshRealTriple(ai_real *apOut);
+    void ParseLV4MeshFloatTriple(float *apOut);
 
     // -------------------------------------------------------------------
     //! Parse a *MESH_TFACE block in a file
@@ -577,7 +579,8 @@ private:
     // -------------------------------------------------------------------
     //! Parse a single float element
     //! \param fOut Output float
-    void ParseLV4MeshFloat(ai_real &fOut);
+    void ParseLV4MeshReal(ai_real &fOut);
+    void ParseLV4MeshFloat(float &fOut);
 
     // -------------------------------------------------------------------
     //! Parse a single int element
@@ -617,8 +620,8 @@ private:
     bool ParseString(std::string &out, const char *szName);
 
 public:
-    //! Pointer to current data
-    const char *filePtr;
+    const char *mFilePtr; ////< Pointer to current data
+    const char *mEnd;     ///< The end pointer of the file data
 
     //! background color to be passed to the viewer
     //! QNAN if none was found
diff --git a/code/AssetLib/Assbin/AssbinExporter.cpp b/code/AssetLib/Assbin/AssbinExporter.cpp
index 149b3c5f3..f9a510a66 100644
--- a/code/AssetLib/Assbin/AssbinExporter.cpp
+++ b/code/AssetLib/Assbin/AssbinExporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Assbin/AssbinExporter.h b/code/AssetLib/Assbin/AssbinExporter.h
index 8b721994d..a3fa99492 100644
--- a/code/AssetLib/Assbin/AssbinExporter.h
+++ b/code/AssetLib/Assbin/AssbinExporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Assbin/AssbinFileWriter.cpp b/code/AssetLib/Assbin/AssbinFileWriter.cpp
index 782595bc1..d4e25e16b 100644
--- a/code/AssetLib/Assbin/AssbinFileWriter.cpp
+++ b/code/AssetLib/Assbin/AssbinFileWriter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Assbin/AssbinFileWriter.h b/code/AssetLib/Assbin/AssbinFileWriter.h
index cfed3b400..066470a46 100644
--- a/code/AssetLib/Assbin/AssbinFileWriter.h
+++ b/code/AssetLib/Assbin/AssbinFileWriter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Assbin/AssbinLoader.cpp b/code/AssetLib/Assbin/AssbinLoader.cpp
index 6995ea976..b0905298a 100644
--- a/code/AssetLib/Assbin/AssbinLoader.cpp
+++ b/code/AssetLib/Assbin/AssbinLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_ASSBIN_IMPORTER
 
 // internal headers
-#include "AssetLib/Assbin/AssbinLoader.h"
+#include "AssbinLoader.h"
 #include "Common/assbin_chunks.h"
 #include <assimp/MemoryIOWrapper.h>
 #include <assimp/anim.h>
@@ -91,10 +91,14 @@ bool AssbinImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, boo
     }
 
     char s[32];
-    in->Read(s, sizeof(char), 32);
+    const size_t read = in->Read(s, sizeof(char), 32);
 
     pIOHandler->Close(in);
 
+    if (read < 19) {
+      return false;
+    }
+
     return strncmp(s, "ASSIMP.binary-dump.", 19) == 0;
 }
 
@@ -684,6 +688,7 @@ void AssbinImporter::InternReadFile(const std::string &pFile, aiScene *pScene, I
     unsigned int versionMajor = Read<unsigned int>(stream);
     unsigned int versionMinor = Read<unsigned int>(stream);
     if (versionMinor != ASSBIN_VERSION_MINOR || versionMajor != ASSBIN_VERSION_MAJOR) {
+        pIOHandler->Close(stream);
         throw DeadlyImportError("Invalid version, data format not compatible!");
     }
 
@@ -693,8 +698,10 @@ void AssbinImporter::InternReadFile(const std::string &pFile, aiScene *pScene, I
     shortened = Read<uint16_t>(stream) > 0;
     compressed = Read<uint16_t>(stream) > 0;
 
-    if (shortened)
+    if (shortened) {
+        pIOHandler->Close(stream);
         throw DeadlyImportError("Shortened binaries are not supported!");
+    }
 
     stream->Seek(256, aiOrigin_CUR); // original filename
     stream->Seek(128, aiOrigin_CUR); // options
diff --git a/code/AssetLib/Assbin/AssbinLoader.h b/code/AssetLib/Assbin/AssbinLoader.h
index f922b91fd..573e10799 100644
--- a/code/AssetLib/Assbin/AssbinLoader.h
+++ b/code/AssetLib/Assbin/AssbinLoader.h
@@ -1,9 +1,8 @@
-
 /*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -61,7 +60,7 @@ struct aiCamera;
 
 #ifndef ASSIMP_BUILD_NO_ASSBIN_IMPORTER
 
-namespace Assimp    {
+namespace Assimp {
 
 // ---------------------------------------------------------------------------------
 /** Importer class for 3D Studio r3 and r4 3DS files
diff --git a/code/AssetLib/Assxml/AssxmlExporter.cpp b/code/AssetLib/Assxml/AssxmlExporter.cpp
index 731916a25..873a89427 100644
--- a/code/AssetLib/Assxml/AssxmlExporter.cpp
+++ b/code/AssetLib/Assxml/AssxmlExporter.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -50,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/IOSystem.hpp>
 #include <assimp/Exporter.hpp>
 
-namespace Assimp   {
+namespace Assimp {
 
 void ExportSceneAssxml(const char* pFile, IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* /*pProperties*/)
 {
diff --git a/code/AssetLib/Assxml/AssxmlExporter.h b/code/AssetLib/Assxml/AssxmlExporter.h
index 6fcdebfab..6b71c104d 100644
--- a/code/AssetLib/Assxml/AssxmlExporter.h
+++ b/code/AssetLib/Assxml/AssxmlExporter.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Assxml/AssxmlFileWriter.cpp b/code/AssetLib/Assxml/AssxmlFileWriter.cpp
index 8f8e76bd2..c6842f5c6 100644
--- a/code/AssetLib/Assxml/AssxmlFileWriter.cpp
+++ b/code/AssetLib/Assxml/AssxmlFileWriter.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -36,7 +35,6 @@ 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.
-
 ----------------------------------------------------------------------
 */
 
@@ -223,7 +221,7 @@ static void WriteDump(const char *pFile, const char *cmd, const aiScene *scene,
     const unsigned int majorVersion(aiGetVersionMajor());
     const unsigned int minorVersion(aiGetVersionMinor());
     const unsigned int rev(aiGetVersionRevision());
-    const char *curtime(asctime(p));
+    const char *curtime = asctime(p);
     ioprintf(io, header.c_str(), majorVersion, minorVersion, rev, pFile, c.c_str(), curtime, scene->mFlags, 0u);
 
     // write the node graph
diff --git a/code/AssetLib/Assxml/AssxmlFileWriter.h b/code/AssetLib/Assxml/AssxmlFileWriter.h
index 0620c9db7..505cdb1e9 100644
--- a/code/AssetLib/Assxml/AssxmlFileWriter.h
+++ b/code/AssetLib/Assxml/AssxmlFileWriter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/B3D/B3DImporter.cpp b/code/AssetLib/B3D/B3DImporter.cpp
index 670f3de53..5ba041e5a 100644
--- a/code/AssetLib/B3D/B3DImporter.cpp
+++ b/code/AssetLib/B3D/B3DImporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_B3D_IMPORTER
 
 // internal headers
-#include "AssetLib/B3D/B3DImporter.h"
+#include "B3DImporter.h"
 #include "PostProcessing/ConvertToLHProcess.h"
 #include "PostProcessing/TextureTransform.h"
 
diff --git a/code/AssetLib/B3D/B3DImporter.h b/code/AssetLib/B3D/B3DImporter.h
index e47d9078b..05f63d75b 100644
--- a/code/AssetLib/B3D/B3DImporter.h
+++ b/code/AssetLib/B3D/B3DImporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/BVH/BVHLoader.cpp b/code/AssetLib/BVH/BVHLoader.cpp
index 4d2cfde15..df5c0746d 100644
--- a/code/AssetLib/BVH/BVHLoader.cpp
+++ b/code/AssetLib/BVH/BVHLoader.cpp
@@ -4,9 +4,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -85,11 +83,9 @@ BVHLoader::BVHLoader() :
         mLine(),
         mAnimTickDuration(),
         mAnimNumFrames(),
-        noSkeletonMesh() {}
-
-// ------------------------------------------------------------------------------------------------
-// Destructor, private as well
-BVHLoader::~BVHLoader() = default;
+        noSkeletonMesh() {
+    // empty
+}
 
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
diff --git a/code/AssetLib/BVH/BVHLoader.h b/code/AssetLib/BVH/BVHLoader.h
index 56c32bd99..9c7361a8c 100644
--- a/code/AssetLib/BVH/BVHLoader.h
+++ b/code/AssetLib/BVH/BVHLoader.h
@@ -4,8 +4,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -80,32 +79,27 @@ class BVHLoader : public BaseImporter {
         std::vector<ChannelType> mChannels;
         std::vector<float> mChannelValues; // motion data values for that node. Of size NumChannels * NumFrames
 
-        Node() :
-                mNode(nullptr) {}
-
-        explicit Node(const aiNode *pNode) :
-                mNode(pNode) {}
+        Node() : mNode(nullptr) {}
+        explicit Node(const aiNode *pNode) :mNode(pNode) {}
     };
 
 public:
     BVHLoader();
-    ~BVHLoader();
+    ~BVHLoader() override = default;
 
-public:
     /** Returns whether the class can handle the format of the given file.
      * See BaseImporter::CanRead() for details. */
-    bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool cs) const;
+    bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool cs) const override;
 
-    void SetupProperties(const Importer *pImp);
-    const aiImporterDesc *GetInfo() const;
+    void SetupProperties(const Importer *pImp) override;
+    const aiImporterDesc *GetInfo() const override;
 
 protected:
     /** Imports the given file into the given scene structure.
      * See BaseImporter::InternReadFile() for details
      */
-    void InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler);
+    void InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) override;
 
-protected:
     /** Reads the file */
     void ReadStructure(aiScene *pScene);
 
diff --git a/code/AssetLib/Blender/BlenderBMesh.cpp b/code/AssetLib/Blender/BlenderBMesh.cpp
index a82e7c678..c201edcbc 100644
--- a/code/AssetLib/Blender/BlenderBMesh.cpp
+++ b/code/AssetLib/Blender/BlenderBMesh.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/code/AssetLib/Blender/BlenderBMesh.h b/code/AssetLib/Blender/BlenderBMesh.h
index 7d2f71717..aade906d7 100644
--- a/code/AssetLib/Blender/BlenderBMesh.h
+++ b/code/AssetLib/Blender/BlenderBMesh.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/code/AssetLib/Blender/BlenderDNA.cpp b/code/AssetLib/Blender/BlenderDNA.cpp
index d22c4bfd7..8f5def96e 100644
--- a/code/AssetLib/Blender/BlenderDNA.cpp
+++ b/code/AssetLib/Blender/BlenderDNA.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Blender/BlenderDNA.h b/code/AssetLib/Blender/BlenderDNA.h
index 494dc4b34..580b6d401 100644
--- a/code/AssetLib/Blender/BlenderDNA.h
+++ b/code/AssetLib/Blender/BlenderDNA.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Blender/BlenderDNA.inl b/code/AssetLib/Blender/BlenderDNA.inl
index 4f64987a5..83e07ccdf 100644
--- a/code/AssetLib/Blender/BlenderDNA.inl
+++ b/code/AssetLib/Blender/BlenderDNA.inl
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -841,5 +841,7 @@ template <template <typename> class TOUT> template <typename T> void ObjectCache
 #endif
 }
 
-}}
+}
+}
+
 #endif
diff --git a/code/AssetLib/Blender/BlenderIntermediate.h b/code/AssetLib/Blender/BlenderIntermediate.h
index 546b79f09..d9460e792 100644
--- a/code/AssetLib/Blender/BlenderIntermediate.h
+++ b/code/AssetLib/Blender/BlenderIntermediate.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -117,7 +116,7 @@ namespace Blender {
         mywrap arr;
     };
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #   pragma warning(disable:4351)
 #endif
 
@@ -172,7 +171,7 @@ namespace Blender {
         // original file data
         const FileDatabase& db;
     };
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #   pragma warning(default:4351)
 #endif
 
diff --git a/code/AssetLib/Blender/BlenderLoader.cpp b/code/AssetLib/Blender/BlenderLoader.cpp
index 35b35f08d..6b7a8e27a 100644
--- a/code/AssetLib/Blender/BlenderLoader.cpp
+++ b/code/AssetLib/Blender/BlenderLoader.cpp
@@ -1,10 +1,8 @@
-
 /*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -110,7 +108,7 @@ BlenderImporter::~BlenderImporter() {
     delete modifier_cache;
 }
 
-static const char Token[] = "BLENDER";
+static constexpr char Token[] = "BLENDER";
 
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
@@ -359,7 +357,7 @@ void BlenderImporter::ResolveImage(aiMaterial *out, const Material *mat, const M
     // check if the file contents are bundled with the BLEND file
     if (img->packedfile) {
         name.data[0] = '*';
-        name.length = 1 + ASSIMP_itoa10(name.data + 1, static_cast<unsigned int>(MAXLEN - 1), static_cast<int32_t>(conv_data.textures->size()));
+        name.length = 1 + ASSIMP_itoa10(name.data + 1, static_cast<unsigned int>(AI_MAXLEN - 1), static_cast<int32_t>(conv_data.textures->size()));
 
         conv_data.textures->push_back(new aiTexture());
         aiTexture *curTex = conv_data.textures->back();
@@ -433,7 +431,7 @@ void BlenderImporter::AddSentinelTexture(aiMaterial *out, const Material *mat, c
     (void)conv_data;
 
     aiString name;
-    name.length = ai_snprintf(name.data, MAXLEN, "Procedural,num=%i,type=%s", conv_data.sentinel_cnt++,
+    name.length = ai_snprintf(name.data, AI_MAXLEN, "Procedural,num=%i,type=%s", conv_data.sentinel_cnt++,
             GetTextureTypeDisplayString(tex->tex->type));
     out->AddProperty(&name, AI_MATKEY_TEXTURE_DIFFUSE(
                                     conv_data.next_texture[aiTextureType_DIFFUSE]++));
@@ -495,8 +493,9 @@ void BlenderImporter::BuildDefaultMaterial(Blender::ConversionData &conv_data) {
             if (index == static_cast<unsigned int>(-1)) {
                 // Setup a default material.
                 std::shared_ptr<Material> p(new Material());
-                ai_assert(::strlen(AI_DEFAULT_MATERIAL_NAME) < sizeof(p->id.name) - 2);
-                strcpy(p->id.name + 2, AI_DEFAULT_MATERIAL_NAME);
+                const size_t len = ::strlen(AI_DEFAULT_MATERIAL_NAME);
+                ai_assert(len < sizeof(p->id.name) - 2);
+                memcpy(p->id.name + 2, AI_DEFAULT_MATERIAL_NAME, len);
 
                 // Note: MSVC11 does not zero-initialize Material here, although it should.
                 // Thus all relevant fields should be explicitly initialized. We cannot add
diff --git a/code/AssetLib/Blender/BlenderLoader.h b/code/AssetLib/Blender/BlenderLoader.h
index 2bdc24ae2..e844ba378 100644
--- a/code/AssetLib/Blender/BlenderLoader.h
+++ b/code/AssetLib/Blender/BlenderLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Blender/BlenderModifier.cpp b/code/AssetLib/Blender/BlenderModifier.cpp
index f925de608..dd840c0f3 100644
--- a/code/AssetLib/Blender/BlenderModifier.cpp
+++ b/code/AssetLib/Blender/BlenderModifier.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Blender/BlenderModifier.h b/code/AssetLib/Blender/BlenderModifier.h
index 180a456a1..f2f34eaa9 100644
--- a/code/AssetLib/Blender/BlenderModifier.h
+++ b/code/AssetLib/Blender/BlenderModifier.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Blender/BlenderScene.h b/code/AssetLib/Blender/BlenderScene.h
index ba7ded909..5e0c1ca36 100644
--- a/code/AssetLib/Blender/BlenderScene.h
+++ b/code/AssetLib/Blender/BlenderScene.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Blender/BlenderSceneGen.h b/code/AssetLib/Blender/BlenderSceneGen.h
index 762fdd33b..7004a159f 100644
--- a/code/AssetLib/Blender/BlenderSceneGen.h
+++ b/code/AssetLib/Blender/BlenderSceneGen.h
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BlenderDNA.h"
 #include "BlenderScene.h"
 
-namespace Assimp    {
+namespace Assimp {
 namespace Blender {
 
 template <> void Structure :: Convert<Object> (
diff --git a/code/AssetLib/Blender/BlenderTessellator.cpp b/code/AssetLib/Blender/BlenderTessellator.cpp
index 84bc2ea1a..3d186847a 100644
--- a/code/AssetLib/Blender/BlenderTessellator.cpp
+++ b/code/AssetLib/Blender/BlenderTessellator.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Blender/BlenderTessellator.h b/code/AssetLib/Blender/BlenderTessellator.h
index 21a4f4701..d6487cb0a 100644
--- a/code/AssetLib/Blender/BlenderTessellator.h
+++ b/code/AssetLib/Blender/BlenderTessellator.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/C4D/C4DImporter.cpp b/code/AssetLib/C4D/C4DImporter.cpp
index c11ec0280..d8fd3ee85 100644
--- a/code/AssetLib/C4D/C4DImporter.cpp
+++ b/code/AssetLib/C4D/C4DImporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2021, assimp team
+Copyright (c) 2006-2025, assimp team
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -46,10 +46,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // no #ifdefing here, Cinema4D support is carried out in a branch of assimp
 // where it is turned on in the CMake settings.
 
-#ifndef _MSC_VER
-#   error C4D support is currently MSVC only
-#endif
-
 #include "C4DImporter.h"
 #include <memory>
 #include <assimp/IOSystem.hpp>
@@ -68,7 +64,7 @@ namespace {
 
 aiString aiStringFrom(cineware::String const & cinestring) {
     aiString result;
-    cinestring.GetCString(result.data, MAXLEN-1);
+    cinestring.GetCString(result.data, AI_MAXLEN - 1);
     result.length = static_cast<ai_uint32>(cinestring.GetLength());
     return result;
 }
@@ -90,7 +86,7 @@ namespace Assimp {
     }
 }
 
-static const aiImporterDesc desc = {
+static constexpr aiImporterDesc desc = {
     "Cinema4D Importer",
     "",
     "",
@@ -103,15 +99,8 @@ static const aiImporterDesc desc = {
     "c4d"
 };
 
-
 // ------------------------------------------------------------------------------------------------
-C4DImporter::C4DImporter() = default;
-
-// ------------------------------------------------------------------------------------------------
-C4DImporter::~C4DImporter() = default;
-
-// ------------------------------------------------------------------------------------------------
-bool C4DImporter::CanRead( const std::string& pFile, IOSystem* /*pIOHandler*/, bool /*checkSig*/) const {
+bool C4DImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool checkSig) const {
     const std::string& extension = GetExtension(pFile);
     if (extension == "c4d") {
         return true;
@@ -200,7 +189,6 @@ void C4DImporter::InternReadFile( const std::string& pFile, aiScene* pScene, IOS
     std::copy(materials.begin(), materials.end(), pScene->mMaterials);
 }
 
-
 // ------------------------------------------------------------------------------------------------
 bool C4DImporter::ReadShader(aiMaterial* out, BaseShader* shader) {
     // based on Cineware sample code (C4DImportExport.cpp)
@@ -305,7 +293,7 @@ void C4DImporter::RecurseHierarchy(BaseObject* object, aiNode* parent) {
 
     // based on Cineware sample code
     while (object) {
-        const LONG type = object->GetType();
+        const Int32 type = object->GetType();
         const Matrix& ml = object->GetMl();
 
         aiNode* const nd = new aiNode();
@@ -368,8 +356,8 @@ aiMesh* C4DImporter::ReadMesh(BaseObject* object) {
     PolygonObject* const polyObject = dynamic_cast<PolygonObject*>(object);
     ai_assert(polyObject != nullptr);
 
-    const LONG pointCount = polyObject->GetPointCount();
-    const LONG polyCount = polyObject->GetPolygonCount();
+    const Int32 pointCount = polyObject->GetPointCount();
+    const Int32 polyCount = polyObject->GetPolygonCount();
     if(!polyObject || !pointCount) {
         LogWarn("ignoring mesh with zero vertices or faces");
         return nullptr;
@@ -391,7 +379,7 @@ aiMesh* C4DImporter::ReadMesh(BaseObject* object) {
     unsigned int vcount = 0;
 
     // first count vertices
-    for (LONG i = 0; i < polyCount; i++)
+    for (Int32 i = 0; i < polyCount; i++)
     {
         vcount += 3;
 
@@ -434,7 +422,7 @@ aiMesh* C4DImporter::ReadMesh(BaseObject* object) {
     }
 
     // copy vertices and extra channels over and populate faces
-    for (LONG i = 0; i < polyCount; ++i, ++face) {
+    for (Int32 i = 0; i < polyCount; ++i, ++face) {
         ai_assert(polys[i].a < pointCount && polys[i].a >= 0);
         const Vector& pointA = points[polys[i].a];
         verts->x = pointA.x;
@@ -511,7 +499,7 @@ aiMesh* C4DImporter::ReadMesh(BaseObject* object) {
         if (tangents_src) {
 
             for(unsigned int k = 0; k < face->mNumIndices; ++k) {
-                LONG l;
+                Int32 l;
                 switch(k) {
                 case 0:
                     l = polys[i].a;
diff --git a/code/AssetLib/C4D/C4DImporter.h b/code/AssetLib/C4D/C4DImporter.h
index c44cf5e37..216c4b0c8 100644
--- a/code/AssetLib/C4D/C4DImporter.h
+++ b/code/AssetLib/C4D/C4DImporter.h
@@ -63,7 +63,7 @@ namespace cineware {
     class BaseShader;
 }
 
-namespace Assimp  {
+namespace Assimp {
     // TinyFormatter.h
     namespace Formatter {
         template <typename T,typename TR, typename A> class basic_formatter;
@@ -78,6 +78,8 @@ namespace Assimp  {
 // -------------------------------------------------------------------------------------------
 class C4DImporter : public BaseImporter, public LogFunctions<C4DImporter> {
 public:
+    C4DImporter() = default;
+    ~C4DImporter() override = default;
     bool CanRead( const std::string& pFile, IOSystem*, bool checkSig) const override;
 
 protected:
diff --git a/code/AssetLib/COB/COBLoader.cpp b/code/AssetLib/COB/COBLoader.cpp
index 9a6e32f6d..bce7a2a7f 100644
--- a/code/AssetLib/COB/COBLoader.cpp
+++ b/code/AssetLib/COB/COBLoader.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_COB_IMPORTER
 
-#include "AssetLib/COB/COBLoader.h"
-#include "AssetLib/COB/COBScene.h"
+#include "COBLoader.h"
+#include "COBScene.h"
 #include "PostProcessing/ConvertToLHProcess.h"
 
 #include <assimp/LineSplitter.h>
@@ -228,7 +228,7 @@ aiNode *COBImporter::BuildNodes(const Node &root, const Scene &scin, aiScene *fi
         const Mesh &ndmesh = (const Mesh &)(root);
         if (ndmesh.vertex_positions.size() && ndmesh.texture_coords.size()) {
 
-            typedef std::pair<const unsigned int, Mesh::FaceRefList> Entry;
+            using Entry = std::pair<const unsigned int, Mesh::FaceRefList>;
             for (const Entry &reflist : ndmesh.temp_map) {
                 { // create mesh
                     size_t n = 0;
@@ -372,9 +372,11 @@ aiNode *COBImporter::BuildNodes(const Node &root, const Scene &scin, aiScene *fi
     }
 
     // add children recursively
-    nd->mChildren = new aiNode *[root.temp_children.size()]();
-    for (const Node *n : root.temp_children) {
-        (nd->mChildren[nd->mNumChildren++] = BuildNodes(*n, scin, fill))->mParent = nd;
+    if (!root.temp_children.empty()) {
+        nd->mChildren = new aiNode *[root.temp_children.size()]();
+        for (const Node *n : root.temp_children) {
+            (nd->mChildren[nd->mNumChildren++] = BuildNodes(*n, scin, fill))->mParent = nd;
+        }
     }
 
     return nd;
@@ -473,8 +475,9 @@ void COBImporter::ReadBasicNodeInfo_Ascii(Node &msh, LineSplitter &splitter, con
         } else if (splitter.match_start("Transform")) {
             for (unsigned int y = 0; y < 4 && ++splitter; ++y) {
                 const char *s = splitter->c_str();
+                const char *end = s + splitter->size();
                 for (unsigned int x = 0; x < 4; ++x) {
-                    SkipSpaces(&s);
+                    SkipSpaces(&s, end);
                     msh.transform[y][x] = fast_atof(&s);
                 }
             }
@@ -486,12 +489,12 @@ void COBImporter::ReadBasicNodeInfo_Ascii(Node &msh, LineSplitter &splitter, con
 
 // ------------------------------------------------------------------------------------------------
 template <typename T>
-void COBImporter::ReadFloat3Tuple_Ascii(T &fill, const char **in) {
+void COBImporter::ReadFloat3Tuple_Ascii(T &fill, const char **in, const char *end) {
     const char *rgb = *in;
     for (unsigned int i = 0; i < 3; ++i) {
-        SkipSpaces(&rgb);
+        SkipSpaces(&rgb, end);
         if (*rgb == ',') ++rgb;
-        SkipSpaces(&rgb);
+        SkipSpaces(&rgb, end);
 
         fill[i] = fast_atof(&rgb);
     }
@@ -538,7 +541,7 @@ void COBImporter::ReadMat1_Ascii(Scene &out, LineSplitter &splitter, const Chunk
     }
 
     const char *rgb = splitter[1];
-    ReadFloat3Tuple_Ascii(mat.rgb, &rgb);
+    ReadFloat3Tuple_Ascii(mat.rgb, &rgb, splitter.getEnd());
 
     ++splitter;
     if (!splitter.match_start("alpha ")) {
@@ -617,20 +620,21 @@ void COBImporter::ReadLght_Ascii(Scene &out, LineSplitter &splitter, const Chunk
     }
 
     const char *rgb = splitter[1];
-    ReadFloat3Tuple_Ascii(msh.color, &rgb);
+    const char *end = splitter.getEnd();
+    ReadFloat3Tuple_Ascii(msh.color, &rgb, end);
 
-    SkipSpaces(&rgb);
+    SkipSpaces(&rgb, end);
     if (strncmp(rgb, "cone angle", 10) != 0) {
         ASSIMP_LOG_WARN("Expected `cone angle` entity in `color` line in `Lght` chunk ", nfo.id);
     }
-    SkipSpaces(rgb + 10, &rgb);
+    SkipSpaces(rgb + 10, &rgb, end);
     msh.angle = fast_atof(&rgb);
 
-    SkipSpaces(&rgb);
+    SkipSpaces(&rgb, end);
     if (strncmp(rgb, "inner angle", 11) != 0) {
         ASSIMP_LOG_WARN("Expected `inner angle` entity in `color` line in `Lght` chunk ", nfo.id);
     }
-    SkipSpaces(rgb + 11, &rgb);
+    SkipSpaces(rgb + 11, &rgb, end);
     msh.inner_angle = fast_atof(&rgb);
 
     // skip the rest for we can't handle this kind of physically-based lighting information.
@@ -703,14 +707,14 @@ void COBImporter::ReadPolH_Ascii(Scene &out, LineSplitter &splitter, const Chunk
 
             for (unsigned int cur = 0; cur < cnt && ++splitter; ++cur) {
                 const char *s = splitter->c_str();
-
+                const char *end = splitter.getEnd();
                 aiVector3D &v = msh.vertex_positions[cur];
 
-                SkipSpaces(&s);
+                SkipSpaces(&s, end);
                 v.x = fast_atof(&s);
-                SkipSpaces(&s);
+                SkipSpaces(&s, end);
                 v.y = fast_atof(&s);
-                SkipSpaces(&s);
+                SkipSpaces(&s, end);
                 v.z = fast_atof(&s);
             }
         } else if (splitter.match_start("Texture Vertices")) {
@@ -719,12 +723,13 @@ void COBImporter::ReadPolH_Ascii(Scene &out, LineSplitter &splitter, const Chunk
 
             for (unsigned int cur = 0; cur < cnt && ++splitter; ++cur) {
                 const char *s = splitter->c_str();
+                const char *end = splitter.getEnd();
 
                 aiVector2D &v = msh.texture_coords[cur];
 
-                SkipSpaces(&s);
+                SkipSpaces(&s, end);
                 v.x = fast_atof(&s);
-                SkipSpaces(&s);
+                SkipSpaces(&s, end);
                 v.y = fast_atof(&s);
             }
         } else if (splitter.match_start("Faces")) {
@@ -749,8 +754,9 @@ void COBImporter::ReadPolH_Ascii(Scene &out, LineSplitter &splitter, const Chunk
                 face.material = strtoul10(splitter[6]);
 
                 const char *s = (++splitter)->c_str();
+                const char *end = splitter.getEnd();
                 for (size_t i = 0; i < face.indices.size(); ++i) {
-                    if (!SkipSpaces(&s)) {
+                    if (!SkipSpaces(&s, end)) {
                         ThrowException("Expected EOL token in Face entry");
                     }
                     if ('<' != *s++) {
diff --git a/code/AssetLib/COB/COBLoader.h b/code/AssetLib/COB/COBLoader.h
index a9755f5d7..737f64591 100644
--- a/code/AssetLib/COB/COBLoader.h
+++ b/code/AssetLib/COB/COBLoader.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -120,7 +119,7 @@ private:
     void ReadChunkInfo_Ascii(COB::ChunkInfo &out, const LineSplitter &splitter);
     void ReadBasicNodeInfo_Ascii(COB::Node &msh, LineSplitter &splitter, const COB::ChunkInfo &nfo);
     template <typename T>
-    void ReadFloat3Tuple_Ascii(T &fill, const char **in);
+    void ReadFloat3Tuple_Ascii(T &fill, const char **in, const char *end);
 
     void ReadPolH_Ascii(COB::Scene &out, LineSplitter &splitter, const COB::ChunkInfo &nfo);
     void ReadBitM_Ascii(COB::Scene &out, LineSplitter &splitter, const COB::ChunkInfo &nfo);
diff --git a/code/AssetLib/COB/COBScene.h b/code/AssetLib/COB/COBScene.h
index cc49de276..d73a4306b 100644
--- a/code/AssetLib/COB/COBScene.h
+++ b/code/AssetLib/COB/COBScene.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/CSM/CSMLoader.cpp b/code/AssetLib/CSM/CSMLoader.cpp
index 20f2343f5..b11861dcb 100644
--- a/code/AssetLib/CSM/CSMLoader.cpp
+++ b/code/AssetLib/CSM/CSMLoader.cpp
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -73,40 +71,35 @@ static constexpr aiImporterDesc desc = {
     "csm"
 };
 
-
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
-CSMImporter::CSMImporter() : noSkeletonMesh(){
+CSMImporter::CSMImporter() : noSkeletonMesh() {
     // empty
 }
 
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
-bool CSMImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool /*checkSig*/) const
-{
+bool CSMImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool /*checkSig*/) const {
     static const char* tokens[] = {"$Filename"};
     return SearchFileHeaderForToken(pIOHandler,pFile,tokens,AI_COUNT_OF(tokens));
 }
 
 // ------------------------------------------------------------------------------------------------
 // Build a string of all file extensions supported
-const aiImporterDesc* CSMImporter::GetInfo () const
-{
+const aiImporterDesc* CSMImporter::GetInfo () const {
     return &desc;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Setup configuration properties for the loader
-void CSMImporter::SetupProperties(const Importer* pImp)
-{
+void CSMImporter::SetupProperties(const Importer* pImp) {
     noSkeletonMesh = pImp->GetPropertyInteger(AI_CONFIG_IMPORT_NO_SKELETON_MESHES,0) != 0;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Imports the given file into the given scene structure.
 void CSMImporter::InternReadFile( const std::string& pFile,
-    aiScene* pScene, IOSystem* pIOHandler)
-{
+        aiScene* pScene, IOSystem* pIOHandler) {
     std::unique_ptr<IOStream> file( pIOHandler->Open( pFile, "rb"));
 
     // Check whether we can read from the file
@@ -118,29 +111,30 @@ void CSMImporter::InternReadFile( const std::string& pFile,
     std::vector<char> mBuffer2;
     TextFileToBuffer(file.get(),mBuffer2);
     const char* buffer = &mBuffer2[0];
-
+    const char *end = &mBuffer2[mBuffer2.size() - 1] + 1;
     std::unique_ptr<aiAnimation> anim(new aiAnimation());
     int first = 0, last = 0x00ffffff;
 
     // now process the file and look out for '$' sections
     while (true) {
-        SkipSpaces(&buffer);
-        if ('\0' == *buffer)
+        SkipSpaces(&buffer, end);
+        if ('\0' == *buffer) {
             break;
+        }
 
-        if ('$'  == *buffer)    {
+        if ('$'  == *buffer) {
             ++buffer;
-            if (TokenMatchI(buffer,"firstframe",10))    {
-                SkipSpaces(&buffer);
+            if (TokenMatchI(buffer,"firstframe",10)) {
+                SkipSpaces(&buffer, end);
                 first = strtol10(buffer,&buffer);
             }
-            else if (TokenMatchI(buffer,"lastframe",9))     {
-                SkipSpaces(&buffer);
+            else if (TokenMatchI(buffer,"lastframe",9)) {
+                SkipSpaces(&buffer, end);
                 last = strtol10(buffer,&buffer);
             }
             else if (TokenMatchI(buffer,"rate",4))  {
-                SkipSpaces(&buffer);
-                float d;
+                SkipSpaces(&buffer, end);
+                float d = { 0.0f };
                 buffer = fast_atoreal_move<float>(buffer,d);
                 anim->mTicksPerSecond = d;
             }
@@ -148,50 +142,61 @@ void CSMImporter::InternReadFile( const std::string& pFile,
                 std::vector< aiNodeAnim* > anims_temp;
                 anims_temp.reserve(30);
                 while (true) {
-                    SkipSpaces(&buffer);
-                    if (IsLineEnd(*buffer) && SkipSpacesAndLineEnd(&buffer) && *buffer == '$')
+                    SkipSpaces(&buffer, end);
+                    if (IsLineEnd(*buffer) && SkipSpacesAndLineEnd(&buffer, end) && *buffer == '$')
                         break; // next section
 
                     // Construct a new node animation channel and setup its name
                     anims_temp.push_back(new aiNodeAnim());
                     aiNodeAnim* nda = anims_temp.back();
 
-                    char* ot = nda->mNodeName.data;
-                    while (!IsSpaceOrNewLine(*buffer))
+                    char *ot = nda->mNodeName.data;
+                    const char *ot_end = nda->mNodeName.data + AI_MAXLEN;
+                    while (!IsSpaceOrNewLine(*buffer) && buffer != end && ot != ot_end) {
                         *ot++ = *buffer++;
+                    }
 
                     *ot = '\0';
                     nda->mNodeName.length = static_cast<ai_uint32>(ot-nda->mNodeName.data);
                 }
 
                 anim->mNumChannels = static_cast<unsigned int>(anims_temp.size());
-                if (!anim->mNumChannels)
+                if (!anim->mNumChannels) {
                     throw DeadlyImportError("CSM: Empty $order section");
+                }
 
                 // copy over to the output animation
                 anim->mChannels = new aiNodeAnim*[anim->mNumChannels];
                 ::memcpy(anim->mChannels,&anims_temp[0],sizeof(aiNodeAnim*)*anim->mNumChannels);
-            }
-            else if (TokenMatchI(buffer,"points",6))    {
-                if (!anim->mNumChannels)
+            } else if (TokenMatchI(buffer,"points",6)) {
+                if (!anim->mNumChannels) {
                     throw DeadlyImportError("CSM: \'$order\' section is required to appear prior to \'$points\'");
+                }
 
                 // If we know how many frames we'll read, we can preallocate some storage
                 unsigned int alloc = 100;
-                if (last != 0x00ffffff)
-                {
+                if (last != 0x00ffffff) {
+                    // re-init if the file has last frame data
                     alloc = last-first;
                     alloc += alloc>>2u; // + 25%
-                    for (unsigned int i = 0; i < anim->mNumChannels;++i)
+                    for (unsigned int i = 0; i < anim->mNumChannels; ++i) {
+                        if (anim->mChannels[i]->mPositionKeys != nullptr) delete[] anim->mChannels[i]->mPositionKeys;
                         anim->mChannels[i]->mPositionKeys = new aiVectorKey[alloc];
+                    }
+                } else {
+                    // default init
+                    for (unsigned int i = 0; i < anim->mNumChannels; ++i) {
+                        if (anim->mChannels[i]->mPositionKeys != nullptr) continue;
+                        anim->mChannels[i]->mPositionKeys = new aiVectorKey[alloc];
+                    }
                 }
 
                 unsigned int filled = 0;
 
                 // Now read all point data.
                 while (true) {
-                    SkipSpaces(&buffer);
-                    if (IsLineEnd(*buffer) && (!SkipSpacesAndLineEnd(&buffer) || *buffer == '$'))   {
+                    SkipSpaces(&buffer, end);
+                    if (IsLineEnd(*buffer) && (!SkipSpacesAndLineEnd(&buffer, end) || *buffer == '$'))   {
                         break; // next section
                     }
 
@@ -202,33 +207,35 @@ void CSMImporter::InternReadFile( const std::string& pFile,
                     for (unsigned int i = 0; i < anim->mNumChannels;++i)    {
 
                         aiNodeAnim* s = anim->mChannels[i];
-                        if (s->mNumPositionKeys == alloc)   { /* need to reallocate? */
-
+                        if (s->mNumPositionKeys == alloc)   {
+                            // need to reallocate?
                             aiVectorKey* old = s->mPositionKeys;
-                            s->mPositionKeys = new aiVectorKey[s->mNumPositionKeys = alloc*2];
+                            s->mPositionKeys = new aiVectorKey[alloc*2];
                             ::memcpy(s->mPositionKeys,old,sizeof(aiVectorKey)*alloc);
                             delete[] old;
                         }
 
                         // read x,y,z
-                        if(!SkipSpacesAndLineEnd(&buffer))
+                        if (!SkipSpacesAndLineEnd(&buffer, end)) {
                             throw DeadlyImportError("CSM: Unexpected EOF occurred reading sample x coord");
+                        }
 
                         if (TokenMatchI(buffer, "DROPOUT", 7))  {
                             // seems this is invalid marker data; at least the doc says it's possible
                             ASSIMP_LOG_WARN("CSM: Encountered invalid marker data (DROPOUT)");
-                        }
-                        else    {
+                        } else {
                             aiVectorKey* sub = s->mPositionKeys + s->mNumPositionKeys;
                             sub->mTime = (double)frame;
                             buffer = fast_atoreal_move<float>(buffer, (float&)sub->mValue.x);
 
-                            if(!SkipSpacesAndLineEnd(&buffer))
+                            if (!SkipSpacesAndLineEnd(&buffer, end)) {
                                 throw DeadlyImportError("CSM: Unexpected EOF occurred reading sample y coord");
+                            }
                             buffer = fast_atoreal_move<float>(buffer, (float&)sub->mValue.y);
 
-                            if(!SkipSpacesAndLineEnd(&buffer))
+                            if (!SkipSpacesAndLineEnd(&buffer, end)) {
                                 throw DeadlyImportError("CSM: Unexpected EOF occurred reading sample z coord");
+                            }
                             buffer = fast_atoreal_move<float>(buffer, (float&)sub->mValue.z);
 
                             ++s->mNumPositionKeys;
@@ -236,22 +243,22 @@ void CSMImporter::InternReadFile( const std::string& pFile,
                     }
 
                     // update allocation granularity
-                    if (filled == alloc)
+                    if (filled == alloc) {
                         alloc *= 2;
+                    }
 
                     ++filled;
                 }
                 // all channels must be complete in order to continue safely.
                 for (unsigned int i = 0; i < anim->mNumChannels;++i)    {
-
-                    if (!anim->mChannels[i]->mNumPositionKeys)
+                    if (!anim->mChannels[i]->mNumPositionKeys) {
                         throw DeadlyImportError("CSM: Invalid marker track");
+                    }
                 }
             }
-        }
-        else    {
+        } else {
             // advance to the next line
-            SkipLine(&buffer);
+            SkipLine(&buffer, end);
         }
     }
 
@@ -265,14 +272,20 @@ void CSMImporter::InternReadFile( const std::string& pFile,
     pScene->mRootNode->mNumChildren = anim->mNumChannels;
     pScene->mRootNode->mChildren = new aiNode* [anim->mNumChannels];
 
-    for (unsigned int i = 0; i < anim->mNumChannels;++i)    {
+    for (unsigned int i = 0; i < anim->mNumChannels;++i) {
         aiNodeAnim* na = anim->mChannels[i];
 
         aiNode* nd  = pScene->mRootNode->mChildren[i] = new aiNode();
         nd->mName   = anim->mChannels[i]->mNodeName;
         nd->mParent = pScene->mRootNode;
 
-        aiMatrix4x4::Translation(na->mPositionKeys[0].mValue, nd->mTransformation);
+        if (na->mPositionKeys != nullptr && na->mNumPositionKeys > 0) {
+            aiMatrix4x4::Translation(na->mPositionKeys[0].mValue, nd->mTransformation);
+        } else {
+            // Use identity matrix if no valid position data is available
+            nd->mTransformation = aiMatrix4x4();
+            DefaultLogger::get()->warn("CSM: No position keys available for node - using identity transformation");
+        }
     }
 
     // Store the one and only animation in the scene
diff --git a/code/AssetLib/CSM/CSMLoader.h b/code/AssetLib/CSM/CSMLoader.h
index fc9017d17..881b568ac 100644
--- a/code/AssetLib/CSM/CSMLoader.h
+++ b/code/AssetLib/CSM/CSMLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Collada/ColladaExporter.cpp b/code/AssetLib/Collada/ColladaExporter.cpp
index 29b714bd7..a69e3a8c5 100644
--- a/code/AssetLib/Collada/ColladaExporter.cpp
+++ b/code/AssetLib/Collada/ColladaExporter.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -36,7 +35,6 @@ 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.
-
 ----------------------------------------------------------------------
 */
 
@@ -64,6 +62,37 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace Assimp {
 
+static const aiNode *findSkeletonRootNode(const aiScene *scene, const aiMesh *mesh) {
+    std::set<const aiNode *> topParentBoneNodes;
+    if (mesh && mesh->mNumBones > 0) {
+        for (unsigned int i = 0; i < mesh->mNumBones; ++i) {
+            aiBone *bone = mesh->mBones[i];
+
+            const aiNode *node = scene->mRootNode->findBoneNode(bone);
+            if (node) {
+                while (node->mParent && scene->findBone(node->mParent->mName) != nullptr) {
+                    node = node->mParent;
+                }
+                topParentBoneNodes.insert(node);
+            }
+        }
+    }
+
+    if (!topParentBoneNodes.empty()) {
+        const aiNode *parentBoneNode = *topParentBoneNodes.begin();
+        if (topParentBoneNodes.size() == 1) {
+            return parentBoneNode;
+        } else {
+            for (auto it : topParentBoneNodes) {
+                if (it->mParent) return it->mParent;
+            }
+            return parentBoneNode;
+        }
+    }
+
+    return nullptr;
+}
+
 // ------------------------------------------------------------------------------------------------
 // Worker function for exporting a scene to Collada. Prototyped and registered in Exporter.cpp
 void ExportSceneCollada(const char *pFile, IOSystem *pIOSystem, const aiScene *pScene, const ExportProperties * /*pProperties*/) {
@@ -152,10 +181,6 @@ ColladaExporter::ColladaExporter(const aiScene *pScene, IOSystem *pIOSystem, con
     WriteFile();
 }
 
-// ------------------------------------------------------------------------------------------------
-// Destructor
-ColladaExporter::~ColladaExporter() = default;
-
 // ------------------------------------------------------------------------------------------------
 // Starts writing the contents
 void ColladaExporter::WriteFile() {
@@ -331,60 +356,68 @@ void ColladaExporter::WriteHeader() {
 // ------------------------------------------------------------------------------------------------
 // Write the embedded textures
 void ColladaExporter::WriteTextures() {
-    static const unsigned int buffer_size = 1024;
-    char str[buffer_size];
+    static constexpr unsigned int buffer_size = 1024;
+    char str[buffer_size] = {'\0'};
 
-    if (mScene->HasTextures()) {
-        for (unsigned int i = 0; i < mScene->mNumTextures; i++) {
-            // It would be great to be able to create a directory in portable standard C++, but it's not the case,
-            // so we just write the textures in the current directory.
+    if (!mScene->HasTextures()) {
+        return;
+    }
 
-            aiTexture *texture = mScene->mTextures[i];
-            if (nullptr == texture) {
-                continue;
-            }
+    for (unsigned int i = 0; i < mScene->mNumTextures; i++) {
+        // It would be great to be able to create a directory in portable standard C++, but it's not the case,
+        // so we just write the textures in the current directory.
 
-            ASSIMP_itoa10(str, buffer_size, i + 1);
-
-            std::string name = mFile + "_texture_" + (i < 1000 ? "0" : "") + (i < 100 ? "0" : "") + (i < 10 ? "0" : "") + str + "." + ((const char *)texture->achFormatHint);
-
-            std::unique_ptr<IOStream> outfile(mIOSystem->Open(mPath + mIOSystem->getOsSeparator() + name, "wb"));
-            if (outfile == nullptr) {
-                throw DeadlyExportError("could not open output texture file: " + mPath + name);
-            }
-
-            if (texture->mHeight == 0) {
-                outfile->Write((void *)texture->pcData, texture->mWidth, 1);
-            } else {
-                Bitmap::Save(texture, outfile.get());
-            }
-
-            outfile->Flush();
-
-            textures.insert(std::make_pair(i, name));
+        aiTexture *texture = mScene->mTextures[i];
+        if (nullptr == texture) {
+            continue;
         }
+
+        ASSIMP_itoa10(str, buffer_size, i + 1);
+
+        std::string name = mFile + "_texture_" + (i < 1000 ? "0" : "") + (i < 100 ? "0" : "") + (i < 10 ? "0" : "") + str + "." + ((const char *)texture->achFormatHint);
+
+        std::unique_ptr<IOStream> outfile(mIOSystem->Open(mPath + mIOSystem->getOsSeparator() + name, "wb"));
+        if (outfile == nullptr) {
+            throw DeadlyExportError("could not open output texture file: " + mPath + name);
+        }
+
+        if (texture->mHeight == 0) {
+            outfile->Write((void *)texture->pcData, texture->mWidth, 1);
+        } else {
+            Bitmap::Save(texture, outfile.get());
+        }
+
+        outfile->Flush();
+
+        textures.insert(std::make_pair(i, name));
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Write the embedded textures
 void ColladaExporter::WriteCamerasLibrary() {
-    if (mScene->HasCameras()) {
-
-        mOutput << startstr << "<library_cameras>" << endstr;
-        PushTag();
-
-        for (size_t a = 0; a < mScene->mNumCameras; ++a)
-            WriteCamera(a);
-
-        PopTag();
-        mOutput << startstr << "</library_cameras>" << endstr;
+    if (!mScene->HasCameras()) {
+        return;
     }
+
+    mOutput << startstr << "<library_cameras>" << endstr;
+    PushTag();
+
+    for (size_t a = 0; a < mScene->mNumCameras; ++a) {
+        WriteCamera(a);
+    }
+
+    PopTag();
+    mOutput << startstr << "</library_cameras>" << endstr;
 }
 
 void ColladaExporter::WriteCamera(size_t pIndex) {
 
     const aiCamera *cam = mScene->mCameras[pIndex];
+    if (cam == nullptr) {
+        return;
+    }
+
     const std::string cameraId = GetObjectUniqueId(AiObjectType::Camera, pIndex);
     const std::string cameraName = GetObjectName(AiObjectType::Camera, pIndex);
 
@@ -422,22 +455,27 @@ void ColladaExporter::WriteCamera(size_t pIndex) {
 // ------------------------------------------------------------------------------------------------
 // Write the embedded textures
 void ColladaExporter::WriteLightsLibrary() {
-    if (mScene->HasLights()) {
-
-        mOutput << startstr << "<library_lights>" << endstr;
-        PushTag();
-
-        for (size_t a = 0; a < mScene->mNumLights; ++a)
-            WriteLight(a);
-
-        PopTag();
-        mOutput << startstr << "</library_lights>" << endstr;
+    if (!mScene->HasLights()) {
+        return;
     }
+
+    mOutput << startstr << "<library_lights>" << endstr;
+    PushTag();
+
+    for (size_t a = 0; a < mScene->mNumLights; ++a) {
+        WriteLight(a);
+    }
+
+    PopTag();
+    mOutput << startstr << "</library_lights>" << endstr;
 }
 
 void ColladaExporter::WriteLight(size_t pIndex) {
 
     const aiLight *light = mScene->mLights[pIndex];
+    if (light == nullptr) {
+        return;
+    }
     const std::string lightId = GetObjectUniqueId(AiObjectType::Light, pIndex);
     const std::string lightName = GetObjectName(AiObjectType::Light, pIndex);
 
@@ -462,6 +500,7 @@ void ColladaExporter::WriteLight(size_t pIndex) {
     case aiLightSource_AREA:
     case aiLightSource_UNDEFINED:
     case _aiLightSource_Force32Bit:
+    default:
         break;
     }
     PopTag();
@@ -521,10 +560,6 @@ void ColladaExporter::WriteSpotLight(const aiLight *const light) {
     mOutput << startstr << "<quadratic_attenuation>"
             << light->mAttenuationQuadratic
             << "</quadratic_attenuation>" << endstr;
-    /*
-    out->mAngleOuterCone = AI_DEG_TO_RAD (std::acos(std::pow(0.1f,1.f/srcLight->mFalloffExponent))+
-                            srcLight->mFalloffAngle);
-    */
 
     const ai_real fallOffAngle = AI_RAD_TO_DEG(light->mAngleInnerCone);
     mOutput << startstr << "<falloff_angle sid=\"fall_off_angle\">"
@@ -559,41 +594,43 @@ void ColladaExporter::WriteAmbientLight(const aiLight *const light) {
 // ------------------------------------------------------------------------------------------------
 // Reads a single surface entry from the given material keys
 bool ColladaExporter::ReadMaterialSurface(Surface &poSurface, const aiMaterial &pSrcMat, aiTextureType pTexture, const char *pKey, size_t pType, size_t pIndex) {
-    if (pSrcMat.GetTextureCount(pTexture) > 0) {
-        aiString texfile;
-        unsigned int uvChannel = 0;
-        pSrcMat.GetTexture(pTexture, 0, &texfile, nullptr, &uvChannel);
-
-        std::string index_str(texfile.C_Str());
-
-        if (index_str.size() != 0 && index_str[0] == '*') {
-            unsigned int index;
-
-            index_str = index_str.substr(1, std::string::npos);
-
-            try {
-                index = (unsigned int)strtoul10_64<DeadlyExportError>(index_str.c_str());
-            } catch (std::exception &error) {
-                throw DeadlyExportError(error.what());
-            }
-
-            std::map<unsigned int, std::string>::const_iterator name = textures.find(index);
-
-            if (name != textures.end()) {
-                poSurface.texture = name->second;
-            } else {
-                throw DeadlyExportError("could not find embedded texture at index " + index_str);
-            }
-        } else {
-            poSurface.texture = texfile.C_Str();
-        }
-
-        poSurface.channel = uvChannel;
-        poSurface.exist = true;
-    } else {
+    if (pSrcMat.GetTextureCount(pTexture) == 0) {
         if (pKey)
             poSurface.exist = pSrcMat.Get(pKey, static_cast<unsigned int>(pType), static_cast<unsigned int>(pIndex), poSurface.color) == aiReturn_SUCCESS;
+        return poSurface.exist;
     }
+
+    aiString texfile;
+    unsigned int uvChannel = 0;
+    pSrcMat.GetTexture(pTexture, 0, &texfile, nullptr, &uvChannel);
+
+    std::string index_str(texfile.C_Str());
+
+    if (index_str.size() != 0 && index_str[0] == '*') {
+        unsigned int index;
+
+        index_str = index_str.substr(1, std::string::npos);
+
+        try {
+            index = (unsigned int)strtoul10_64<DeadlyExportError>(index_str.c_str());
+        } catch (std::exception &error) {
+            throw DeadlyExportError(error.what());
+        }
+
+        std::map<unsigned int, std::string>::const_iterator name = textures.find(index);
+
+        if (name != textures.end()) {
+            poSurface.texture = name->second;
+        } else {
+            throw DeadlyExportError("could not find embedded texture at index " + index_str);
+        }
+    } else {
+        poSurface.texture = texfile.C_Str();
+    }
+
+    poSurface.channel = uvChannel;
+    poSurface.exist = true;
+
     return poSurface.exist;
 }
 
@@ -606,79 +643,87 @@ static bool isalnum_C(char c) {
 // ------------------------------------------------------------------------------------------------
 // Writes an image entry for the given surface
 void ColladaExporter::WriteImageEntry(const Surface &pSurface, const std::string &imageId) {
-    if (!pSurface.texture.empty()) {
-        mOutput << startstr << "<image id=\"" << imageId << "\">" << endstr;
-        PushTag();
-        mOutput << startstr << "<init_from>";
-
-        // URL encode image file name first, then XML encode on top
-        std::stringstream imageUrlEncoded;
-        for (std::string::const_iterator it = pSurface.texture.begin(); it != pSurface.texture.end(); ++it) {
-            if (isalnum_C((unsigned char)*it) || *it == ':' || *it == '_' || *it == '-' || *it == '.' || *it == '/' || *it == '\\')
-                imageUrlEncoded << *it;
-            else
-                imageUrlEncoded << '%' << std::hex << size_t((unsigned char)*it) << std::dec;
-        }
-        mOutput << XMLEscape(imageUrlEncoded.str());
-        mOutput << "</init_from>" << endstr;
-        PopTag();
-        mOutput << startstr << "</image>" << endstr;
+    if (pSurface.texture.empty()) {
+        return;
     }
+
+    mOutput << startstr << "<image id=\"" << imageId << "\">" << endstr;
+    PushTag();
+    mOutput << startstr << "<init_from>";
+
+    // URL encode image file name first, then XML encode on top
+    std::stringstream imageUrlEncoded;
+    for (std::string::const_iterator it = pSurface.texture.begin(); it != pSurface.texture.end(); ++it) {
+        if (isalnum_C((unsigned char)*it) || *it == ':' || *it == '_' || *it == '-' || *it == '.' || *it == '/' || *it == '\\')
+            imageUrlEncoded << *it;
+        else
+            imageUrlEncoded << '%' << std::hex << size_t((unsigned char)*it) << std::dec;
+    }
+    mOutput << XMLEscape(imageUrlEncoded.str());
+    mOutput << "</init_from>" << endstr;
+    PopTag();
+    mOutput << startstr << "</image>" << endstr;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Writes a color-or-texture entry into an effect definition
 void ColladaExporter::WriteTextureColorEntry(const Surface &pSurface, const std::string &pTypeName, const std::string &imageId) {
-    if (pSurface.exist) {
-        mOutput << startstr << "<" << pTypeName << ">" << endstr;
-        PushTag();
-        if (pSurface.texture.empty()) {
-            mOutput << startstr << "<color sid=\"" << pTypeName << "\">" << pSurface.color.r << "   " << pSurface.color.g << "   " << pSurface.color.b << "   " << pSurface.color.a << "</color>" << endstr;
-        } else {
-            mOutput << startstr << "<texture texture=\"" << imageId << "\" texcoord=\"CHANNEL" << pSurface.channel << "\" />" << endstr;
-        }
-        PopTag();
-        mOutput << startstr << "</" << pTypeName << ">" << endstr;
+    if (!pSurface.exist) {
+        return;
     }
+
+    mOutput << startstr << "<" << pTypeName << ">" << endstr;
+    PushTag();
+    if (pSurface.texture.empty()) {
+        mOutput << startstr << "<color sid=\"" << pTypeName << "\">" << pSurface.color.r << "   " << pSurface.color.g << "   " << pSurface.color.b << "   " << pSurface.color.a << "</color>" << endstr;
+    } else {
+        mOutput << startstr << "<texture texture=\"" << imageId << "\" texcoord=\"CHANNEL" << pSurface.channel << "\" />" << endstr;
+    }
+    PopTag();
+    mOutput << startstr << "</" << pTypeName << ">" << endstr;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Writes the two parameters necessary for referencing a texture in an effect entry
 void ColladaExporter::WriteTextureParamEntry(const Surface &pSurface, const std::string &pTypeName, const std::string &materialId) {
     // if surface is a texture, write out the sampler and the surface parameters necessary to reference the texture
-    if (!pSurface.texture.empty()) {
-        mOutput << startstr << "<newparam sid=\"" << materialId << "-" << pTypeName << "-surface\">" << endstr;
-        PushTag();
-        mOutput << startstr << "<surface type=\"2D\">" << endstr;
-        PushTag();
-        mOutput << startstr << "<init_from>" << materialId << "-" << pTypeName << "-image</init_from>" << endstr;
-        PopTag();
-        mOutput << startstr << "</surface>" << endstr;
-        PopTag();
-        mOutput << startstr << "</newparam>" << endstr;
-
-        mOutput << startstr << "<newparam sid=\"" << materialId << "-" << pTypeName << "-sampler\">" << endstr;
-        PushTag();
-        mOutput << startstr << "<sampler2D>" << endstr;
-        PushTag();
-        mOutput << startstr << "<source>" << materialId << "-" << pTypeName << "-surface</source>" << endstr;
-        PopTag();
-        mOutput << startstr << "</sampler2D>" << endstr;
-        PopTag();
-        mOutput << startstr << "</newparam>" << endstr;
+    if (pSurface.texture.empty()) {
+        return;
     }
+
+    mOutput << startstr << "<newparam sid=\"" << materialId << "-" << pTypeName << "-surface\">" << endstr;
+    PushTag();
+    mOutput << startstr << "<surface type=\"2D\">" << endstr;
+    PushTag();
+    mOutput << startstr << "<init_from>" << materialId << "-" << pTypeName << "-image</init_from>" << endstr;
+    PopTag();
+    mOutput << startstr << "</surface>" << endstr;
+    PopTag();
+    mOutput << startstr << "</newparam>" << endstr;
+
+    mOutput << startstr << "<newparam sid=\"" << materialId << "-" << pTypeName << "-sampler\">" << endstr;
+    PushTag();
+    mOutput << startstr << "<sampler2D>" << endstr;
+    PushTag();
+    mOutput << startstr << "<source>" << materialId << "-" << pTypeName << "-surface</source>" << endstr;
+    PopTag();
+    mOutput << startstr << "</sampler2D>" << endstr;
+    PopTag();
+    mOutput << startstr << "</newparam>" << endstr;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Writes a scalar property
 void ColladaExporter::WriteFloatEntry(const Property &pProperty, const std::string &pTypeName) {
-    if (pProperty.exist) {
-        mOutput << startstr << "<" << pTypeName << ">" << endstr;
-        PushTag();
-        mOutput << startstr << "<float sid=\"" << pTypeName << "\">" << pProperty.value << "</float>" << endstr;
-        PopTag();
-        mOutput << startstr << "</" << pTypeName << ">" << endstr;
+    if (!pProperty.exist) {
+        return;
     }
+
+    mOutput << startstr << "<" << pTypeName << ">" << endstr;
+    PushTag();
+    mOutput << startstr << "<float sid=\"" << pTypeName << "\">" << pProperty.value << "</float>" << endstr;
+    PopTag();
+    mOutput << startstr << "</" << pTypeName << ">" << endstr;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -832,8 +877,9 @@ void ColladaExporter::WriteControllerLibrary() {
 void ColladaExporter::WriteController(size_t pIndex) {
     const aiMesh *mesh = mScene->mMeshes[pIndex];
     // Is there a skin controller?
-    if (mesh->mNumBones == 0 || mesh->mNumFaces == 0 || mesh->mNumVertices == 0)
+    if (mesh->mNumBones == 0 || mesh->mNumFaces == 0 || mesh->mNumVertices == 0) {
         return;
+    }
 
     const std::string idstr = GetObjectUniqueId(AiObjectType::Mesh, pIndex);
     const std::string namestr = GetObjectName(AiObjectType::Mesh, pIndex);
@@ -864,8 +910,9 @@ void ColladaExporter::WriteController(size_t pIndex) {
 
     mOutput << startstr << "<Name_array id=\"" << idstr << "-skin-joints-array\" count=\"" << mesh->mNumBones << "\">";
 
-    for (size_t i = 0; i < mesh->mNumBones; ++i)
+    for (size_t i = 0; i < mesh->mNumBones; ++i) {
         mOutput << GetBoneUniqueId(mesh->mBones[i]) << ' ';
+    }
 
     mOutput << "</Name_array>" << endstr;
 
@@ -888,9 +935,11 @@ void ColladaExporter::WriteController(size_t pIndex) {
 
     std::vector<ai_real> bind_poses;
     bind_poses.reserve(mesh->mNumBones * 16);
-    for (unsigned int i = 0; i < mesh->mNumBones; ++i)
-        for (unsigned int j = 0; j < 4; ++j)
+    for (unsigned int i = 0; i < mesh->mNumBones; ++i) {
+        for (unsigned int j = 0; j < 4; ++j) {
             bind_poses.insert(bind_poses.end(), mesh->mBones[i]->mOffsetMatrix[j], mesh->mBones[i]->mOffsetMatrix[j] + 4);
+        }
+    }
 
     WriteFloatArray(idstr + "-skin-bind_poses", FloatType_Mat4x4, (const ai_real *)bind_poses.data(), bind_poses.size() / 16);
 
@@ -898,9 +947,11 @@ void ColladaExporter::WriteController(size_t pIndex) {
 
     std::vector<ai_real> skin_weights;
     skin_weights.reserve(mesh->mNumVertices * mesh->mNumBones);
-    for (size_t i = 0; i < mesh->mNumBones; ++i)
-        for (size_t j = 0; j < mesh->mBones[i]->mNumWeights; ++j)
+    for (size_t i = 0; i < mesh->mNumBones; ++i) {
+        for (size_t j = 0; j < mesh->mBones[i]->mNumWeights; ++j) {
             skin_weights.push_back(mesh->mBones[i]->mWeights[j].mWeight);
+        }
+    }
 
     WriteFloatArray(idstr + "-skin-weights", FloatType_Weight, (const ai_real *)skin_weights.data(), skin_weights.size());
 
@@ -924,12 +975,15 @@ void ColladaExporter::WriteController(size_t pIndex) {
     mOutput << startstr << "<vcount>";
 
     std::vector<ai_uint> num_influences(mesh->mNumVertices, (ai_uint)0);
-    for (size_t i = 0; i < mesh->mNumBones; ++i)
-        for (size_t j = 0; j < mesh->mBones[i]->mNumWeights; ++j)
+    for (size_t i = 0; i < mesh->mNumBones; ++i) {
+        for (size_t j = 0; j < mesh->mBones[i]->mNumWeights; ++j) {
             ++num_influences[mesh->mBones[i]->mWeights[j].mVertexId];
+        }
+    }
 
-    for (size_t i = 0; i < mesh->mNumVertices; ++i)
+    for (size_t i = 0; i < mesh->mNumVertices; ++i) {
         mOutput << num_influences[i] << " ";
+    }
 
     mOutput << "</vcount>" << endstr;
 
@@ -945,7 +999,7 @@ void ColladaExporter::WriteController(size_t pIndex) {
 
     ai_uint weight_index = 0;
     std::vector<ai_int> joint_weight_indices(2 * joint_weight_indices_length, (ai_int)-1);
-    for (unsigned int i = 0; i < mesh->mNumBones; ++i)
+    for (unsigned int i = 0; i < mesh->mNumBones; ++i) {
         for (unsigned j = 0; j < mesh->mBones[i]->mNumWeights; ++j) {
             unsigned int vId = mesh->mBones[i]->mWeights[j].mVertexId;
             for (ai_uint k = 0; k < num_influences[vId]; ++k) {
@@ -957,9 +1011,11 @@ void ColladaExporter::WriteController(size_t pIndex) {
             }
             ++weight_index;
         }
+    }
 
-    for (size_t i = 0; i < joint_weight_indices.size(); ++i)
+    for (size_t i = 0; i < joint_weight_indices.size(); ++i) {
         mOutput << joint_weight_indices[i] << " ";
+    }
 
     num_influences.clear();
     accum_influences.clear();
@@ -983,8 +1039,9 @@ void ColladaExporter::WriteGeometryLibrary() {
     mOutput << startstr << "<library_geometries>" << endstr;
     PushTag();
 
-    for (size_t a = 0; a < mScene->mNumMeshes; ++a)
+    for (size_t a = 0; a < mScene->mNumMeshes; ++a) {
         WriteGeometry(a);
+    }
 
     PopTag();
     mOutput << startstr << "</library_geometries>" << endstr;
@@ -997,8 +1054,9 @@ void ColladaExporter::WriteGeometry(size_t pIndex) {
     const std::string geometryId = GetObjectUniqueId(AiObjectType::Mesh, pIndex);
     const std::string geometryName = GetObjectName(AiObjectType::Mesh, pIndex);
 
-    if (mesh->mNumFaces == 0 || mesh->mNumVertices == 0)
+    if (mesh->mNumFaces == 0 || mesh->mNumVertices == 0) {
         return;
+    }
 
     // opening tag
     mOutput << startstr << "<geometry id=\"" << geometryId << "\" name=\"" << geometryName << "\" >" << endstr;
@@ -1010,8 +1068,9 @@ void ColladaExporter::WriteGeometry(size_t pIndex) {
     // Positions
     WriteFloatArray(geometryId + "-positions", FloatType_Vector, (ai_real *)mesh->mVertices, mesh->mNumVertices);
     // Normals, if any
-    if (mesh->HasNormals())
+    if (mesh->HasNormals()) {
         WriteFloatArray(geometryId + "-normals", FloatType_Vector, (ai_real *)mesh->mNormals, mesh->mNumVertices);
+    }
 
     // texture coords
     for (size_t a = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++a) {
@@ -1040,10 +1099,11 @@ void ColladaExporter::WriteGeometry(size_t pIndex) {
     int countLines = 0;
     int countPoly = 0;
     for (size_t a = 0; a < mesh->mNumFaces; ++a) {
-        if (mesh->mFaces[a].mNumIndices == 2)
+        if (mesh->mFaces[a].mNumIndices == 2) {
             countLines++;
-        else if (mesh->mFaces[a].mNumIndices >= 3)
+        } else if (mesh->mFaces[a].mNumIndices >= 3) {
             countPoly++;
+        }
     }
 
     // lines
@@ -1051,13 +1111,18 @@ void ColladaExporter::WriteGeometry(size_t pIndex) {
         mOutput << startstr << "<lines count=\"" << countLines << "\" material=\"defaultMaterial\">" << endstr;
         PushTag();
         mOutput << startstr << "<input offset=\"0\" semantic=\"VERTEX\" source=\"#" << geometryId << "-vertices\" />" << endstr;
-        if (mesh->HasNormals())
+        if (mesh->HasNormals()) {
             mOutput << startstr << "<input semantic=\"NORMAL\" source=\"#" << geometryId << "-normals\" />" << endstr;
+        }
         for (size_t a = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++a) {
-            if (mesh->HasTextureCoords(static_cast<unsigned int>(a)))
-                mOutput << startstr << "<input semantic=\"TEXCOORD\" source=\"#" << geometryId << "-tex" << a << "\" "
+            if (mesh->HasTextureCoords(static_cast<unsigned int>(a))) {
+                mOutput << startstr
+                        << "<input semantic=\"TEXCOORD\" source=\"#"
+                        << geometryId
+                        << "-tex" << a << "\" "
                         << "set=\"" << a << "\""
                         << " />" << endstr;
+            }
         }
         for (size_t a = 0; a < AI_MAX_NUMBER_OF_COLOR_SETS; ++a) {
             if (mesh->HasVertexColors(static_cast<unsigned int>(a)))
@@ -1070,8 +1135,9 @@ void ColladaExporter::WriteGeometry(size_t pIndex) {
         for (size_t a = 0; a < mesh->mNumFaces; ++a) {
             const aiFace &face = mesh->mFaces[a];
             if (face.mNumIndices != 2) continue;
-            for (size_t b = 0; b < face.mNumIndices; ++b)
+            for (size_t b = 0; b < face.mNumIndices; ++b) {
                 mOutput << face.mIndices[b] << " ";
+            }
         }
         mOutput << "</p>" << endstr;
         PopTag();
@@ -1085,8 +1151,9 @@ void ColladaExporter::WriteGeometry(size_t pIndex) {
         mOutput << startstr << "<polylist count=\"" << countPoly << "\" material=\"defaultMaterial\">" << endstr;
         PushTag();
         mOutput << startstr << "<input offset=\"0\" semantic=\"VERTEX\" source=\"#" << geometryId << "-vertices\" />" << endstr;
-        if (mesh->HasNormals())
+        if (mesh->HasNormals()) {
             mOutput << startstr << "<input offset=\"0\" semantic=\"NORMAL\" source=\"#" << geometryId << "-normals\" />" << endstr;
+        }
         for (size_t a = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++a) {
             if (mesh->HasTextureCoords(static_cast<unsigned int>(a)))
                 mOutput << startstr << "<input offset=\"0\" semantic=\"TEXCOORD\" source=\"#" << geometryId << "-tex" << a << "\" "
@@ -1111,8 +1178,9 @@ void ColladaExporter::WriteGeometry(size_t pIndex) {
         for (size_t a = 0; a < mesh->mNumFaces; ++a) {
             const aiFace &face = mesh->mFaces[a];
             if (face.mNumIndices < 3) continue;
-            for (size_t b = 0; b < face.mNumIndices; ++b)
+            for (size_t b = 0; b < face.mNumIndices; ++b) {
                 mOutput << face.mIndices[b] << " ";
+            }
         }
         mOutput << "</p>" << endstr;
         PopTag();
@@ -1131,13 +1199,27 @@ void ColladaExporter::WriteGeometry(size_t pIndex) {
 void ColladaExporter::WriteFloatArray(const std::string &pIdString, FloatDataType pType, const ai_real *pData, size_t pElementCount) {
     size_t floatsPerElement = 0;
     switch (pType) {
-    case FloatType_Vector: floatsPerElement = 3; break;
-    case FloatType_TexCoord2: floatsPerElement = 2; break;
-    case FloatType_TexCoord3: floatsPerElement = 3; break;
-    case FloatType_Color: floatsPerElement = 3; break;
-    case FloatType_Mat4x4: floatsPerElement = 16; break;
-    case FloatType_Weight: floatsPerElement = 1; break;
-    case FloatType_Time: floatsPerElement = 1; break;
+    case FloatType_Vector:
+        floatsPerElement = 3;
+        break;
+    case FloatType_TexCoord2:
+        floatsPerElement = 2;
+        break;
+    case FloatType_TexCoord3:
+        floatsPerElement = 3;
+        break;
+    case FloatType_Color:
+        floatsPerElement = 3;
+        break;
+    case FloatType_Mat4x4:
+        floatsPerElement = 16;
+        break;
+    case FloatType_Weight:
+        floatsPerElement = 1;
+        break;
+    case FloatType_Time:
+        floatsPerElement = 1;
+        break;
     default:
         return;
     }
@@ -1163,8 +1245,9 @@ void ColladaExporter::WriteFloatArray(const std::string &pIdString, FloatDataTyp
             mOutput << pData[a * 4 + 2] << " ";
         }
     } else {
-        for (size_t a = 0; a < pElementCount * floatsPerElement; ++a)
+        for (size_t a = 0; a < pElementCount * floatsPerElement; ++a) {
             mOutput << pData[a] << " ";
+        }
     }
     mOutput << "</float_array>" << endstr;
     PopTag();
@@ -1256,9 +1339,13 @@ void ColladaExporter::WriteSceneLibrary() {
 // ------------------------------------------------------------------------------------------------
 void ColladaExporter::WriteAnimationLibrary(size_t pIndex) {
     const aiAnimation *anim = mScene->mAnimations[pIndex];
-
-    if (anim->mNumChannels == 0 && anim->mNumMeshChannels == 0 && anim->mNumMorphMeshChannels == 0)
+    if (anim == nullptr) {
         return;
+    }
+
+    if (anim->mNumChannels == 0 && anim->mNumMeshChannels == 0 && anim->mNumMorphMeshChannels == 0) {
+        return;
+    }
 
     const std::string animationNameEscaped = GetObjectName(AiObjectType::Animation, pIndex);
     const std::string idstrEscaped = GetObjectUniqueId(AiObjectType::Animation, pIndex);
@@ -1269,8 +1356,11 @@ void ColladaExporter::WriteAnimationLibrary(size_t pIndex) {
     std::string cur_node_idstr;
     for (size_t a = 0; a < anim->mNumChannels; ++a) {
         const aiNodeAnim *nodeAnim = anim->mChannels[a];
+        if (nodeAnim == nullptr) {
+            continue;
+        }
 
-        // sanity check
+        // sanity checks
         if (nodeAnim->mNumPositionKeys != nodeAnim->mNumScalingKeys || nodeAnim->mNumPositionKeys != nodeAnim->mNumRotationKeys) {
             continue;
         }
@@ -1369,6 +1459,9 @@ void ColladaExporter::WriteAnimationLibrary(size_t pIndex) {
 
     for (size_t a = 0; a < anim->mNumChannels; ++a) {
         const aiNodeAnim *nodeAnim = anim->mChannels[a];
+        if (nodeAnim == nullptr) {
+            continue;
+        }
 
         {
             // samplers
@@ -1387,97 +1480,42 @@ void ColladaExporter::WriteAnimationLibrary(size_t pIndex) {
 
     for (size_t a = 0; a < anim->mNumChannels; ++a) {
         const aiNodeAnim *nodeAnim = anim->mChannels[a];
+        if (nodeAnim == nullptr) {
+            continue;
+        }
 
         {
             // channels
-            mOutput << startstr << "<channel source=\"#" << XMLIDEncode(nodeAnim->mNodeName.data + std::string("_matrix-sampler")) << "\" target=\"" << XMLIDEncode(nodeAnim->mNodeName.data) << "/matrix\"/>" << endstr;
+            mOutput << startstr
+                    << "<channel source=\"#"
+                    << XMLIDEncode(nodeAnim->mNodeName.data + std::string("_matrix-sampler"))
+                    << "\" target=\""
+                    << XMLIDEncode(nodeAnim->mNodeName.data)
+                    << "/matrix\"/>"
+                    << endstr;
         }
     }
 
     PopTag();
     mOutput << startstr << "</animation>" << endstr;
 }
+
 // ------------------------------------------------------------------------------------------------
 void ColladaExporter::WriteAnimationsLibrary() {
-    if (mScene->mNumAnimations > 0) {
-        mOutput << startstr << "<library_animations>" << endstr;
-        PushTag();
-
-        // start recursive write at the root node
-        for (size_t a = 0; a < mScene->mNumAnimations; ++a)
-            WriteAnimationLibrary(a);
-
-        PopTag();
-        mOutput << startstr << "</library_animations>" << endstr;
-    }
-}
-// ------------------------------------------------------------------------------------------------
-// Helper to find a bone by name in the scene
-aiBone *findBone(const aiScene *scene, const aiString &name) {
-    for (size_t m = 0; m < scene->mNumMeshes; m++) {
-        aiMesh *mesh = scene->mMeshes[m];
-        for (size_t b = 0; b < mesh->mNumBones; b++) {
-            aiBone *bone = mesh->mBones[b];
-            if (name == bone->mName) {
-                return bone;
-            }
-        }
-    }
-    return nullptr;
-}
-
-// ------------------------------------------------------------------------------------------------
-// Helper to find the node associated with a bone in the scene
-const aiNode *findBoneNode(const aiNode *aNode, const aiBone *bone) {
-    if (aNode && bone && aNode->mName == bone->mName) {
-        return aNode;
+    if (mScene->mNumAnimations == 0) {
+        return;
     }
 
-    if (aNode && bone) {
-        for (unsigned int i = 0; i < aNode->mNumChildren; ++i) {
-            aiNode *aChild = aNode->mChildren[i];
-            const aiNode *foundFromChild = nullptr;
-            if (aChild) {
-                foundFromChild = findBoneNode(aChild, bone);
-                if (foundFromChild) {
-                    return foundFromChild;
-                }
-            }
-        }
+    mOutput << startstr << "<library_animations>" << endstr;
+    PushTag();
+
+    // start recursive write at the root node
+    for (size_t a = 0; a < mScene->mNumAnimations; ++a) {
+        WriteAnimationLibrary(a);
     }
 
-    return nullptr;
-}
-
-const aiNode *findSkeletonRootNode(const aiScene *scene, const aiMesh *mesh) {
-    std::set<const aiNode *> topParentBoneNodes;
-    if (mesh && mesh->mNumBones > 0) {
-        for (unsigned int i = 0; i < mesh->mNumBones; ++i) {
-            aiBone *bone = mesh->mBones[i];
-
-            const aiNode *node = findBoneNode(scene->mRootNode, bone);
-            if (node) {
-                while (node->mParent && findBone(scene, node->mParent->mName) != nullptr) {
-                    node = node->mParent;
-                }
-                topParentBoneNodes.insert(node);
-            }
-        }
-    }
-
-    if (!topParentBoneNodes.empty()) {
-        const aiNode *parentBoneNode = *topParentBoneNodes.begin();
-        if (topParentBoneNodes.size() == 1) {
-            return parentBoneNode;
-        } else {
-            for (auto it : topParentBoneNodes) {
-                if (it->mParent) return it->mParent;
-            }
-            return parentBoneNode;
-        }
-    }
-
-    return nullptr;
+    PopTag();
+    mOutput << startstr << "</library_animations>" << endstr;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -1488,13 +1526,13 @@ void ColladaExporter::WriteNode(const aiNode *pNode) {
     // Assimp-specific: nodes with no name cannot be associated with bones
     const char *node_type;
     bool is_joint, is_skeleton_root = false;
-    if (pNode->mName.length == 0 || nullptr == findBone(mScene, pNode->mName)) {
+    if (pNode->mName.length == 0 || nullptr == mScene->findBone(pNode->mName)) {
         node_type = "NODE";
         is_joint = false;
     } else {
         node_type = "JOINT";
         is_joint = true;
-        if (!pNode->mParent || nullptr == findBone(mScene, pNode->mParent->mName)) {
+        if (!pNode->mParent || nullptr == mScene->findBone(pNode->mParent->mName)) {
             is_skeleton_root = true;
         }
     }
@@ -1532,7 +1570,6 @@ void ColladaExporter::WriteNode(const aiNode *pNode) {
     }
 
     // customized, sid should be 'matrix' to match with loader code.
-    //mOutput << startstr << "<matrix sid=\"transform\">";
     mOutput << startstr << "<matrix sid=\"matrix\">";
 
     mOutput << mat.a1 << " " << mat.a2 << " " << mat.a3 << " " << mat.a4 << " ";
@@ -1556,7 +1593,6 @@ void ColladaExporter::WriteNode(const aiNode *pNode) {
                 break;
             }
         }
-
     } else
         // instance every geometry
         for (size_t a = 0; a < pNode->mNumMeshes; ++a) {
@@ -1612,8 +1648,9 @@ void ColladaExporter::WriteNode(const aiNode *pNode) {
         }
 
     // recurse into subnodes
-    for (size_t a = 0; a < pNode->mNumChildren; ++a)
+    for (size_t a = 0; a < pNode->mNumChildren; ++a) {
         WriteNode(pNode->mChildren[a]);
+    }
 
     PopTag();
     mOutput << startstr << "</node>" << endstr;
@@ -1628,8 +1665,9 @@ void ColladaExporter::CreateNodeIds(const aiNode *node) {
 std::string ColladaExporter::GetNodeUniqueId(const aiNode *node) {
     // Use the pointer as the key. This is safe because the scene is immutable.
     auto idIt = mNodeIdMap.find(node);
-    if (idIt != mNodeIdMap.cend())
+    if (idIt != mNodeIdMap.cend()) {
         return idIt->second;
+    }
 
     // Prefer the requested Collada Id if extant
     std::string idStr;
@@ -1640,36 +1678,42 @@ std::string ColladaExporter::GetNodeUniqueId(const aiNode *node) {
         idStr = node->mName.C_Str();
     }
     // Make sure the requested id is valid
-    if (idStr.empty())
+    if (idStr.empty()) {
         idStr = "node";
-    else
+    } else {
         idStr = XMLIDEncode(idStr);
+    }
 
     // Ensure it's unique
     idStr = MakeUniqueId(mUniqueIds, idStr, std::string());
     mUniqueIds.insert(idStr);
     mNodeIdMap.insert(std::make_pair(node, idStr));
+
     return idStr;
 }
 
 std::string ColladaExporter::GetNodeName(const aiNode *node) {
-
+    if (node == nullptr) {
+        return std::string();
+    }
     return XMLEscape(node->mName.C_Str());
 }
 
 std::string ColladaExporter::GetBoneUniqueId(const aiBone *bone) {
     // Find the Node that is this Bone
-    const aiNode *boneNode = findBoneNode(mScene->mRootNode, bone);
-    if (boneNode == nullptr)
+    const aiNode *boneNode = mScene->mRootNode->findBoneNode(bone);
+    if (boneNode == nullptr) {
         return std::string();
+    }
 
     return GetNodeUniqueId(boneNode);
 }
 
 std::string ColladaExporter::GetObjectUniqueId(AiObjectType type, size_t pIndex) {
     auto idIt = GetObjectIdMap(type).find(pIndex);
-    if (idIt != GetObjectIdMap(type).cend())
+    if (idIt != GetObjectIdMap(type).cend()) {
         return idIt->second;
+    }
 
     // Not seen this object before, create and add
     NameIdPair result = AddObjectIndexToMaps(type, pIndex);
@@ -1678,8 +1722,9 @@ std::string ColladaExporter::GetObjectUniqueId(AiObjectType type, size_t pIndex)
 
 std::string ColladaExporter::GetObjectName(AiObjectType type, size_t pIndex) {
     auto objectName = GetObjectNameMap(type).find(pIndex);
-    if (objectName != GetObjectNameMap(type).cend())
+    if (objectName != GetObjectNameMap(type).cend()) {
         return objectName->second;
+    }
 
     // Not seen this object before, create and add
     NameIdPair result = AddObjectIndexToMaps(type, pIndex);
@@ -1699,9 +1744,15 @@ ColladaExporter::NameIdPair ColladaExporter::AddObjectIndexToMaps(AiObjectType t
 
     // Get the name and id postfix
     switch (type) {
-    case AiObjectType::Mesh: name = mScene->mMeshes[index]->mName.C_Str(); break;
-    case AiObjectType::Material: name = mScene->mMaterials[index]->GetName().C_Str(); break;
-    case AiObjectType::Animation: name = mScene->mAnimations[index]->mName.C_Str(); break;
+    case AiObjectType::Mesh:
+        name = mScene->mMeshes[index]->mName.C_Str();
+        break;
+    case AiObjectType::Material:
+        name = mScene->mMaterials[index]->GetName().C_Str();
+        break;
+    case AiObjectType::Animation:
+        name = mScene->mAnimations[index]->mName.C_Str();
+        break;
     case AiObjectType::Light:
         name = mScene->mLights[index]->mName.C_Str();
         idPostfix = "-light";
@@ -1710,7 +1761,8 @@ ColladaExporter::NameIdPair ColladaExporter::AddObjectIndexToMaps(AiObjectType t
         name = mScene->mCameras[index]->mName.C_Str();
         idPostfix = "-camera";
         break;
-    case AiObjectType::Count: throw std::logic_error("ColladaExporter::AiObjectType::Count is not an object type");
+    case AiObjectType::Count:
+        throw std::logic_error("ColladaExporter::AiObjectType::Count is not an object type");
     }
 
     if (name.empty()) {
@@ -1728,8 +1780,9 @@ ColladaExporter::NameIdPair ColladaExporter::AddObjectIndexToMaps(AiObjectType t
         idStr = XMLIDEncode(name);
     }
 
-    if (!name.empty())
+    if (!name.empty()) {
         name = XMLEscape(name);
+    }
 
     idStr = MakeUniqueId(mUniqueIds, idStr, idPostfix);
 
@@ -1743,5 +1796,5 @@ ColladaExporter::NameIdPair ColladaExporter::AddObjectIndexToMaps(AiObjectType t
 
 } // end of namespace Assimp
 
-#endif
-#endif
+#endif // ASSIMP_BUILD_NO_COLLADA_EXPORTER
+#endif // ASSIMP_BUILD_NO_EXPORT
diff --git a/code/AssetLib/Collada/ColladaExporter.h b/code/AssetLib/Collada/ColladaExporter.h
index e372a5c5c..26fd22f6d 100644
--- a/code/AssetLib/Collada/ColladaExporter.h
+++ b/code/AssetLib/Collada/ColladaExporter.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -72,7 +71,7 @@ public:
     ColladaExporter(const aiScene *pScene, IOSystem *pIOSystem, const std::string &path, const std::string &file);
 
     /// Destructor
-    virtual ~ColladaExporter();
+    virtual ~ColladaExporter() = default;
 
 protected:
     /// Starts writing the contents
diff --git a/code/AssetLib/Collada/ColladaHelper.cpp b/code/AssetLib/Collada/ColladaHelper.cpp
index 0fb172fbb..562477796 100644
--- a/code/AssetLib/Collada/ColladaHelper.cpp
+++ b/code/AssetLib/Collada/ColladaHelper.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Collada/ColladaHelper.h b/code/AssetLib/Collada/ColladaHelper.h
index c5b6a2d13..869703432 100644
--- a/code/AssetLib/Collada/ColladaHelper.h
+++ b/code/AssetLib/Collada/ColladaHelper.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Collada/ColladaLoader.cpp b/code/AssetLib/Collada/ColladaLoader.cpp
index 41e529de0..e0c0648ad 100644
--- a/code/AssetLib/Collada/ColladaLoader.cpp
+++ b/code/AssetLib/Collada/ColladaLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -89,6 +89,14 @@ inline void AddNodeMetaData(aiNode *node, const std::string &key, const T &value
     node->mMetaData->Add(key, value);
 }
 
+// ------------------------------------------------------------------------------------------------
+// Reads a float value from an accessor and its data array.
+static ai_real ReadFloat(const Accessor &pAccessor, const Data &pData, size_t pIndex, size_t pOffset) {
+    size_t pos = pAccessor.mStride * pIndex + pAccessor.mOffset + pOffset;
+    ai_assert(pos < pData.mValues.size());
+    return pData.mValues[pos];
+}
+
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
 ColladaLoader::ColladaLoader() :
@@ -152,7 +160,7 @@ void ColladaLoader::InternReadFile(const std::string &pFile, aiScene *pScene, IO
         throw DeadlyImportError("Collada: File came out empty. Something is wrong here.");
     }
 
-    // reserve some storage to avoid unnecessary reallocs
+    // reserve some storage to avoid unnecessary reallocates
     newMats.reserve(parser.mMaterialLibrary.size() * 2u);
     mMeshes.reserve(parser.mMeshLibrary.size() * 2u);
 
@@ -176,7 +184,7 @@ void ColladaLoader::InternReadFile(const std::string &pFile, aiScene *pScene, IO
                 0, 0, parser.mUnitSize, 0,
                 0, 0, 0, 1);
     }
-    
+
     if (!ignoreUpDirection) {
         // Convert to Y_UP, if different orientation
         if (parser.mUpDirection == ColladaParser::UP_X) {
@@ -224,7 +232,7 @@ void ColladaLoader::InternReadFile(const std::string &pFile, aiScene *pScene, IO
 // Recursively constructs a scene node for the given parser node and returns it.
 aiNode *ColladaLoader::BuildHierarchy(const ColladaParser &pParser, const Collada::Node *pNode) {
     // create a node for it
-    aiNode *node = new aiNode();
+    auto *node = new aiNode();
 
     // find a name for the new node. It's more complicated than you might think
     node->mName.Set(FindNameForNode(pNode));
@@ -247,7 +255,9 @@ aiNode *ColladaLoader::BuildHierarchy(const ColladaParser &pParser, const Collad
 
     // add children. first the *real* ones
     node->mNumChildren = static_cast<unsigned int>(pNode->mChildren.size() + instances.size());
-    node->mChildren = new aiNode *[node->mNumChildren];
+    if (node->mNumChildren != 0) {
+        node->mChildren = new aiNode * [node->mNumChildren];
+    }
 
     for (size_t a = 0; a < pNode->mChildren.size(); ++a) {
         node->mChildren[a] = BuildHierarchy(pParser, pNode->mChildren[a]);
@@ -270,24 +280,24 @@ aiNode *ColladaLoader::BuildHierarchy(const ColladaParser &pParser, const Collad
 // ------------------------------------------------------------------------------------------------
 // Resolve node instances
 void ColladaLoader::ResolveNodeInstances(const ColladaParser &pParser, const Node *pNode,
-        std::vector<const Node*> &resolved) {
+        std::vector<const Node*> &resolved) const {
     // reserve enough storage
     resolved.reserve(pNode->mNodeInstances.size());
 
     // ... and iterate through all nodes to be instanced as children of pNode
-    for (const auto &nodeInst : pNode->mNodeInstances) {
+    for (const auto &[mNode] : pNode->mNodeInstances) {
         // find the corresponding node in the library
-        const ColladaParser::NodeLibrary::const_iterator itt = pParser.mNodeLibrary.find(nodeInst.mNode);
+        const auto itt = pParser.mNodeLibrary.find(mNode);
         const Node *nd = itt == pParser.mNodeLibrary.end() ? nullptr : (*itt).second;
 
         // FIX for http://sourceforge.net/tracker/?func=detail&aid=3054873&group_id=226462&atid=1067632
         // need to check for both name and ID to catch all. To avoid breaking valid files,
         // the workaround is only enabled when the first attempt to resolve the node has failed.
         if (nullptr == nd) {
-            nd = FindNode(pParser.mRootNode, nodeInst.mNode);
+            nd = FindNode(pParser.mRootNode, mNode);
         }
         if (nullptr == nd) {
-            ASSIMP_LOG_ERROR("Collada: Unable to resolve reference to instanced node ", nodeInst.mNode);
+            ASSIMP_LOG_ERROR("Collada: Unable to resolve reference to instanced node ", mNode);
         } else {
             //  attach this node to the list of children
             resolved.push_back(nd);
@@ -297,8 +307,8 @@ void ColladaLoader::ResolveNodeInstances(const ColladaParser &pParser, const Nod
 
 // ------------------------------------------------------------------------------------------------
 // Resolve UV channels
-void ColladaLoader::ApplyVertexToEffectSemanticMapping(Sampler &sampler, const SemanticMappingTable &table) {
-    SemanticMappingTable::InputSemanticMap::const_iterator it = table.mMap.find(sampler.mUVChannel);
+static void ApplyVertexToEffectSemanticMapping(Sampler &sampler, const SemanticMappingTable &table) {
+    const auto it = table.mMap.find(sampler.mUVChannel);
     if (it == table.mMap.end()) {
         return;
     }
@@ -315,7 +325,7 @@ void ColladaLoader::ApplyVertexToEffectSemanticMapping(Sampler &sampler, const S
 void ColladaLoader::BuildLightsForNode(const ColladaParser &pParser, const Node *pNode, aiNode *pTarget) {
     for (const LightInstance &lid : pNode->mLights) {
         // find the referred light
-        ColladaParser::LightLibrary::const_iterator srcLightIt = pParser.mLightLibrary.find(lid.mLight);
+        auto srcLightIt = pParser.mLightLibrary.find(lid.mLight);
         if (srcLightIt == pParser.mLightLibrary.end()) {
             ASSIMP_LOG_WARN("Collada: Unable to find light for ID \"", lid.mLight, "\". Skipping.");
             continue;
@@ -323,7 +333,7 @@ void ColladaLoader::BuildLightsForNode(const ColladaParser &pParser, const Node
         const Collada::Light *srcLight = &srcLightIt->second;
 
         // now fill our ai data structure
-        aiLight *out = new aiLight();
+        auto out = new aiLight();
         out->mName = pTarget->mName;
         out->mType = (aiLightSourceType)srcLight->mType;
 
@@ -380,7 +390,7 @@ void ColladaLoader::BuildLightsForNode(const ColladaParser &pParser, const Node
 void ColladaLoader::BuildCamerasForNode(const ColladaParser &pParser, const Node *pNode, aiNode *pTarget) {
     for (const CameraInstance &cid : pNode->mCameras) {
         // find the referred light
-        ColladaParser::CameraLibrary::const_iterator srcCameraIt = pParser.mCameraLibrary.find(cid.mCamera);
+        auto srcCameraIt = pParser.mCameraLibrary.find(cid.mCamera);
         if (srcCameraIt == pParser.mCameraLibrary.end()) {
             ASSIMP_LOG_WARN("Collada: Unable to find camera for ID \"", cid.mCamera, "\". Skipping.");
             continue;
@@ -393,7 +403,7 @@ void ColladaLoader::BuildCamerasForNode(const ColladaParser &pParser, const Node
         }
 
         // now fill our ai data structure
-        aiCamera *out = new aiCamera();
+        auto *out = new aiCamera();
         out->mName = pTarget->mName;
 
         // collada cameras point in -Z by default, rest is specified in node transform
@@ -443,10 +453,10 @@ void ColladaLoader::BuildMeshesForNode(const ColladaParser &pParser, const Node
         const Controller *srcController = nullptr;
 
         // find the referred mesh
-        ColladaParser::MeshLibrary::const_iterator srcMeshIt = pParser.mMeshLibrary.find(mid.mMeshOrController);
+        auto srcMeshIt = pParser.mMeshLibrary.find(mid.mMeshOrController);
         if (srcMeshIt == pParser.mMeshLibrary.end()) {
             // if not found in the mesh-library, it might also be a controller referring to a mesh
-            ColladaParser::ControllerLibrary::const_iterator srcContrIt = pParser.mControllerLibrary.find(mid.mMeshOrController);
+            auto srcContrIt = pParser.mControllerLibrary.find(mid.mMeshOrController);
             if (srcContrIt != pParser.mControllerLibrary.end()) {
                 srcController = &srcContrIt->second;
                 srcMeshIt = pParser.mMeshLibrary.find(srcController->mMeshId);
@@ -460,7 +470,7 @@ void ColladaLoader::BuildMeshesForNode(const ColladaParser &pParser, const Node
                 continue;
             }
         } else {
-            // ID found in the mesh library -> direct reference to an unskinned mesh
+            // ID found in the mesh library -> direct reference to a not skinned mesh
             srcMesh = srcMeshIt->second;
         }
 
@@ -474,7 +484,7 @@ void ColladaLoader::BuildMeshesForNode(const ColladaParser &pParser, const Node
 
             // find material assigned to this submesh
             std::string meshMaterial;
-            std::map<std::string, SemanticMappingTable>::const_iterator meshMatIt = mid.mMaterials.find(submesh.mMaterial);
+            auto meshMatIt = mid.mMaterials.find(submesh.mMaterial);
 
             const Collada::SemanticMappingTable *table = nullptr;
             if (meshMatIt != mid.mMaterials.end()) {
@@ -490,7 +500,7 @@ void ColladaLoader::BuildMeshesForNode(const ColladaParser &pParser, const Node
 
             // OK ... here the *real* fun starts ... we have the vertex-input-to-effect-semantic-table
             // given. The only mapping stuff which we do actually support is the UV channel.
-            std::map<std::string, size_t>::const_iterator matIt = mMaterialIndexByName.find(meshMaterial);
+            auto matIt = mMaterialIndexByName.find(meshMaterial);
             unsigned int matIdx = 0;
             if (matIt != mMaterialIndexByName.end()) {
                 matIdx = static_cast<unsigned int>(matIt->second);
@@ -513,7 +523,7 @@ void ColladaLoader::BuildMeshesForNode(const ColladaParser &pParser, const Node
             ColladaMeshIndex index(mid.mMeshOrController, sm, meshMaterial);
 
             // if we already have the mesh at the library, just add its index to the node's array
-            std::map<ColladaMeshIndex, size_t>::const_iterator dstMeshIt = mMeshIndexByID.find(index);
+            auto dstMeshIt = mMeshIndexByID.find(index);
             if (dstMeshIt != mMeshIndexByID.end()) {
                 newMeshRefs.push_back(dstMeshIt->second);
             } else {
@@ -528,7 +538,7 @@ void ColladaLoader::BuildMeshesForNode(const ColladaParser &pParser, const Node
                 faceStart += submesh.mNumFaces;
 
                 // assign the material index
-                std::map<std::string, size_t>::const_iterator subMatIt = mMaterialIndexByName.find(submesh.mMaterial);
+                auto subMatIt = mMaterialIndexByName.find(submesh.mMaterial);
                 if (subMatIt != mMaterialIndexByName.end()) {
                     dstMesh->mMaterialIndex = static_cast<unsigned int>(subMatIt->second);
                 } else {
@@ -616,23 +626,21 @@ aiMesh *ColladaLoader::CreateMesh(const ColladaParser &pParser, const Mesh *pSrc
         std::copy(pSrcMesh->mTangents.begin() + pStartVertex, pSrcMesh->mTangents.begin() + pStartVertex + numVertices, dstMesh->mTangents);
     }
 
-    // bitangents, if given.
+    // bi-tangents, if given.
     if (pSrcMesh->mBitangents.size() >= pStartVertex + numVertices) {
         dstMesh->mBitangents = new aiVector3D[numVertices];
         std::copy(pSrcMesh->mBitangents.begin() + pStartVertex, pSrcMesh->mBitangents.begin() + pStartVertex + numVertices, dstMesh->mBitangents);
     }
 
     // same for texture coords, as many as we have
-    // empty slots are not allowed, need to pack and adjust UV indexes accordingly
-    for (size_t a = 0, real = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++a) {
+    for (size_t a = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++a) {
         if (pSrcMesh->mTexCoords[a].size() >= pStartVertex + numVertices) {
-            dstMesh->mTextureCoords[real] = new aiVector3D[numVertices];
+            dstMesh->mTextureCoords[a] = new aiVector3D[numVertices];
             for (size_t b = 0; b < numVertices; ++b) {
-                dstMesh->mTextureCoords[real][b] = pSrcMesh->mTexCoords[a][pStartVertex + b];
+                dstMesh->mTextureCoords[a][b] = pSrcMesh->mTexCoords[a][pStartVertex + b];
             }
 
-            dstMesh->mNumUVComponents[real] = pSrcMesh->mNumUVComponents[a];
-            ++real;
+            dstMesh->mNumUVComponents[a] = pSrcMesh->mNumUVComponents[a];
         }
     }
 
@@ -664,7 +672,7 @@ aiMesh *ColladaLoader::CreateMesh(const ColladaParser &pParser, const Mesh *pSrc
     std::vector<float> targetWeights;
     Collada::MorphMethod method = Normalized;
 
-    for (std::map<std::string, Controller>::const_iterator it = pParser.mControllerLibrary.begin();
+    for (auto it = pParser.mControllerLibrary.begin();
             it != pParser.mControllerLibrary.end(); ++it) {
         const Controller &c = it->second;
         const Collada::Mesh *baseMesh = pParser.ResolveLibraryReference(pParser.mMeshLibrary, c.mMeshId);
@@ -754,7 +762,7 @@ aiMesh *ColladaLoader::CreateMesh(const ColladaParser &pParser, const Mesh *pSrc
         std::vector<IndexPairVector::const_iterator> weightStartPerVertex;
         weightStartPerVertex.resize(pSrcController->mWeightCounts.size(), pSrcController->mWeights.end());
 
-        IndexPairVector::const_iterator pit = pSrcController->mWeights.begin();
+        auto pit = pSrcController->mWeights.begin();
         for (size_t a = 0; a < pSrcController->mWeightCounts.size(); ++a) {
             weightStartPerVertex[a] = pit;
             pit += pSrcController->mWeightCounts[a];
@@ -766,7 +774,7 @@ aiMesh *ColladaLoader::CreateMesh(const ColladaParser &pParser, const Mesh *pSrc
             // the controller assigns the vertex weights
             size_t orgIndex = pSrcMesh->mFacePosIndices[a];
             // find the vertex weights for this vertex
-            IndexPairVector::const_iterator iit = weightStartPerVertex[orgIndex];
+            auto iit = weightStartPerVertex[orgIndex];
             size_t pairCount = pSrcController->mWeightCounts[orgIndex];
 
             for (size_t b = 0; b < pairCount; ++b, ++iit) {
@@ -807,7 +815,7 @@ aiMesh *ColladaLoader::CreateMesh(const ColladaParser &pParser, const Mesh *pSrc
             }
 
             // create bone with its weights
-            aiBone *bone = new aiBone;
+            auto bone = new aiBone;
             bone->mName = ReadString(jointNamesAcc, jointNames, a);
             bone->mOffsetMatrix.a1 = ReadFloat(jointMatrixAcc, jointMatrices, a, 0);
             bone->mOffsetMatrix.a2 = ReadFloat(jointMatrixAcc, jointMatrices, a, 1);
@@ -973,7 +981,7 @@ void ColladaLoader::StoreAnimations(aiScene *pScene, const ColladaParser &pParse
 
             // if there are other animations which fit the template anim, combine all channels into a single anim
             if (!collectedAnimIndices.empty()) {
-                aiAnimation *combinedAnim = new aiAnimation();
+                auto *combinedAnim = new aiAnimation();
                 combinedAnim->mName = aiString(std::string("combinedAnim_") + char('0' + a));
                 combinedAnim->mDuration = templateAnim->mDuration;
                 combinedAnim->mTicksPerSecond = templateAnim->mTicksPerSecond;
@@ -1040,7 +1048,7 @@ struct MorphTimeValues {
 };
 
 void insertMorphTimeValue(std::vector<MorphTimeValues> &values, float time, float weight, unsigned int value) {
-    MorphTimeValues::key k;
+    MorphTimeValues::key k{};
     k.mValue = value;
     k.mWeight = weight;
     if (values.empty() || time < values[0].mTime) {
@@ -1077,6 +1085,7 @@ static float getWeightAtKey(const std::vector<MorphTimeValues> &values, int key,
             return mKey.mWeight;
         }
     }
+
     // no value at key found, try to interpolate if present at other keys. if not, return zero
     // TODO: interpolation
     return 0.0f;
@@ -1105,7 +1114,7 @@ void ColladaLoader::CreateAnimation(aiScene *pScene, const ColladaParser &pParse
 
         // now check all channels if they affect the current node
         std::string targetID, subElement;
-        for (std::vector<AnimationChannel>::const_iterator cit = pSrcAnim->mChannels.begin();
+        for (auto cit = pSrcAnim->mChannels.begin();
                 cit != pSrcAnim->mChannels.end(); ++cit) {
             const AnimationChannel &srcChannel = *cit;
             ChannelEntry entry;
@@ -1348,7 +1357,7 @@ void ColladaLoader::CreateAnimation(aiScene *pScene, const ColladaParser &pParse
 
         // build an animation channel for the given node out of these trafo keys
         if (!resultTrafos.empty()) {
-            aiNodeAnim *dstAnim = new aiNodeAnim;
+            auto *dstAnim = new aiNodeAnim;
             dstAnim->mNodeName = nodeName;
             dstAnim->mNumPositionKeys = static_cast<unsigned int>(resultTrafos.size());
             dstAnim->mNumRotationKeys = static_cast<unsigned int>(resultTrafos.size());
@@ -1390,7 +1399,7 @@ void ColladaLoader::CreateAnimation(aiScene *pScene, const ColladaParser &pParse
                 // or     2) one channel with morph target count arrays
                 // assume first
 
-                aiMeshMorphAnim *morphAnim = new aiMeshMorphAnim;
+                auto *morphAnim = new aiMeshMorphAnim;
                 morphAnim->mName.Set(nodeName);
 
                 std::vector<MorphTimeValues> morphTimeValues;
@@ -1433,7 +1442,7 @@ void ColladaLoader::CreateAnimation(aiScene *pScene, const ColladaParser &pParse
     }
 
     if (!anims.empty() || !morphAnims.empty()) {
-        aiAnimation *anim = new aiAnimation;
+        auto anim = new aiAnimation;
         anim->mName.Set(pName);
         anim->mNumChannels = static_cast<unsigned int>(anims.size());
         if (anim->mNumChannels > 0) {
@@ -1513,7 +1522,7 @@ void ColladaLoader::AddTexture(aiMaterial &mat,
         map = sampler.mUVId;
     } else {
         map = -1;
-        for (std::string::const_iterator it = sampler.mUVChannel.begin(); it != sampler.mUVChannel.end(); ++it) {
+        for (auto it = sampler.mUVChannel.begin(); it != sampler.mUVChannel.end(); ++it) {
             if (IsNumeric(*it)) {
                 map = strtoul10(&(*it));
                 break;
@@ -1531,7 +1540,7 @@ void ColladaLoader::AddTexture(aiMaterial &mat,
 // Fills materials from the collada material definitions
 void ColladaLoader::FillMaterials(const ColladaParser &pParser, aiScene * /*pScene*/) {
     for (auto &elem : newMats) {
-        aiMaterial &mat = (aiMaterial &)*elem.second;
+        auto &mat = (aiMaterial &)*elem.second;
         Collada::Effect &effect = *elem.first;
 
         // resolve shading mode
@@ -1641,17 +1650,17 @@ void ColladaLoader::FillMaterials(const ColladaParser &pParser, aiScene * /*pSce
 void ColladaLoader::BuildMaterials(ColladaParser &pParser, aiScene * /*pScene*/) {
     newMats.reserve(pParser.mMaterialLibrary.size());
 
-    for (ColladaParser::MaterialLibrary::const_iterator matIt = pParser.mMaterialLibrary.begin();
+    for (auto matIt = pParser.mMaterialLibrary.begin();
             matIt != pParser.mMaterialLibrary.end(); ++matIt) {
         const Material &material = matIt->second;
         // a material is only a reference to an effect
-        ColladaParser::EffectLibrary::iterator effIt = pParser.mEffectLibrary.find(material.mEffect);
+        auto effIt = pParser.mEffectLibrary.find(material.mEffect);
         if (effIt == pParser.mEffectLibrary.end())
             continue;
         Effect &effect = effIt->second;
 
         // create material
-        aiMaterial *mat = new aiMaterial;
+        auto *mat = new aiMaterial;
         aiString name(material.mName.empty() ? matIt->first : material.mName);
         mat->AddProperty(&name, AI_MATKEY_NAME);
 
@@ -1674,7 +1683,7 @@ aiString ColladaLoader::FindFilenameForEffectTexture(const ColladaParser &pParse
     std::string name = pName;
     while (true) {
         // the given string is a param entry. Find it
-        Effect::ParamLibrary::const_iterator it = pEffect.mParams.find(name);
+        auto it = pEffect.mParams.find(name);
         // if not found, we're at the end of the recursion. The resulting string should be the image ID
         if (it == pEffect.mParams.end())
             break;
@@ -1684,7 +1693,7 @@ aiString ColladaLoader::FindFilenameForEffectTexture(const ColladaParser &pParse
     }
 
     // find the image referred by this name in the image library of the scene
-    ColladaParser::ImageLibrary::const_iterator imIt = pParser.mImageLibrary.find(name);
+    auto imIt = pParser.mImageLibrary.find(name);
     if (imIt == pParser.mImageLibrary.end()) {
         ASSIMP_LOG_WARN("Collada: Unable to resolve effect texture entry \"", pName, "\", ended up at ID \"", name, "\".");
 
@@ -1696,7 +1705,7 @@ aiString ColladaLoader::FindFilenameForEffectTexture(const ColladaParser &pParse
 
     // if this is an embedded texture image setup an aiTexture for it
     if (!imIt->second.mImageData.empty()) {
-        aiTexture *tex = new aiTexture();
+        auto *tex = new aiTexture();
 
         // Store embedded texture name reference
         tex->mFilename.Set(imIt->second.mFileName.c_str());
@@ -1728,14 +1737,6 @@ aiString ColladaLoader::FindFilenameForEffectTexture(const ColladaParser &pParse
     return result;
 }
 
-// ------------------------------------------------------------------------------------------------
-// Reads a float value from an accessor and its data array.
-ai_real ColladaLoader::ReadFloat(const Accessor &pAccessor, const Data &pData, size_t pIndex, size_t pOffset) const {
-    size_t pos = pAccessor.mStride * pIndex + pAccessor.mOffset + pOffset;
-    ai_assert(pos < pData.mValues.size());
-    return pData.mValues[pos];
-}
-
 // ------------------------------------------------------------------------------------------------
 // Reads a string value from an accessor and its data array.
 const std::string &ColladaLoader::ReadString(const Accessor &pAccessor, const Data &pData, size_t pIndex) const {
diff --git a/code/AssetLib/Collada/ColladaLoader.h b/code/AssetLib/Collada/ColladaLoader.h
index 3cea7f531..efeb4f1fa 100644
--- a/code/AssetLib/Collada/ColladaLoader.h
+++ b/code/AssetLib/Collada/ColladaLoader.h
@@ -4,8 +4,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -77,8 +76,11 @@ struct ColladaMeshIndex {
     }
 };
 
-/** Loader class to read Collada scenes. Collada is over-engineered to death, with every new iteration bringing
- * more useless stuff, so I limited the data to what I think is useful for games.
+/**
+ * @brief Loader class to read Collada scenes.
+ *
+ * Collada is over-engineered to death, with every new iteration bringing  more useless stuff,
+ * so I limited the data to what I think is useful for games.
 */
 class ColladaLoader : public BaseImporter {
 public:
@@ -102,50 +104,51 @@ protected:
     /// See #BaseImporter::InternReadFile for the details
     void InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) override;
 
-    /** Recursively constructs a scene node for the given parser node and returns it. */
+    /// Recursively constructs a scene node for the given parser node and returns it.
     aiNode *BuildHierarchy(const ColladaParser &pParser, const Collada::Node *pNode);
 
-    /** Resolve node instances */
+    /// Resolve node instances
     void ResolveNodeInstances(const ColladaParser &pParser, const Collada::Node *pNode,
-            std::vector<const Collada::Node *> &resolved);
+            std::vector<const Collada::Node *> &resolved) const;
 
-    /** Builds meshes for the given node and references them */
+    /// Builds meshes for the given node and references them
     void BuildMeshesForNode(const ColladaParser &pParser, const Collada::Node *pNode,
             aiNode *pTarget);
 
+    /// Lookup for meshes by their name
     aiMesh *findMesh(const std::string &meshid);
 
-    /** Creates a mesh for the given ColladaMesh face subset and returns the newly created mesh */
+    /// Creates a mesh for the given ColladaMesh face subset and returns the newly created mesh
     aiMesh *CreateMesh(const ColladaParser &pParser, const Collada::Mesh *pSrcMesh, const Collada::SubMesh &pSubMesh,
             const Collada::Controller *pSrcController, size_t pStartVertex, size_t pStartFace);
 
-    /** Builds cameras for the given node and references them */
+    /// Builds cameras for the given node and references them
     void BuildCamerasForNode(const ColladaParser &pParser, const Collada::Node *pNode,
             aiNode *pTarget);
 
-    /** Builds lights for the given node and references them */
+    /// Builds lights for the given node and references them
     void BuildLightsForNode(const ColladaParser &pParser, const Collada::Node *pNode,
             aiNode *pTarget);
 
-    /** Stores all meshes in the given scene */
+    /// Stores all meshes in the given scene
     void StoreSceneMeshes(aiScene *pScene);
 
-    /** Stores all materials in the given scene */
+    /// Stores all materials in the given scene
     void StoreSceneMaterials(aiScene *pScene);
 
-    /** Stores all lights in the given scene */
+    /// Stores all lights in the given scene
     void StoreSceneLights(aiScene *pScene);
 
-    /** Stores all cameras in the given scene */
+    /// Stores all cameras in the given scene
     void StoreSceneCameras(aiScene *pScene);
 
-    /** Stores all textures in the given scene */
+    /// Stores all textures in the given scene
     void StoreSceneTextures(aiScene *pScene);
 
-    /** Stores all animations
-     * @param pScene target scene to store the anims
-     */
-    void StoreAnimations(aiScene *pScene, const ColladaParser &pParser);
+    /// Stores all animations
+    /// @param pScene   Target scene to store the anims
+    /// @param parser   The collada parser
+    void StoreAnimations(aiScene *pScene, const ColladaParser &parser);
 
     /** Stores all animations for the given source anim and its nested child animations
      * @param pScene target scene to store the anims
@@ -163,10 +166,6 @@ protected:
     /** Fill materials from the collada material definitions */
     void FillMaterials(const ColladaParser &pParser, aiScene *pScene);
 
-    /** Resolve UV channel mappings*/
-    void ApplyVertexToEffectSemanticMapping(Collada::Sampler &sampler,
-            const Collada::SemanticMappingTable &table);
-
     /** Add a texture and all of its sampling properties to a material*/
     void AddTexture(aiMaterial &mat, const ColladaParser &pParser,
             const Collada::Effect &effect,
@@ -177,22 +176,13 @@ protected:
     aiString FindFilenameForEffectTexture(const ColladaParser &pParser,
             const Collada::Effect &pEffect, const std::string &pName);
 
-    /** Reads a float value from an accessor and its data array.
-     * @param pAccessor The accessor to use for reading
-     * @param pData The data array to read from
-     * @param pIndex The index of the element to retrieve
-     * @param pOffset Offset into the element, for multipart elements such as vectors or matrices
-     * @return the specified value
-     */
-    ai_real ReadFloat(const Collada::Accessor &pAccessor, const Collada::Data &pData, size_t pIndex, size_t pOffset) const;
-
     /** Reads a string value from an accessor and its data array.
      * @param pAccessor The accessor to use for reading
      * @param pData The data array to read from
      * @param pIndex The index of the element to retrieve
      * @return the specified value
      */
-    const std::string &ReadString(const Collada::Accessor &pAccessor, const Collada::Data &pData, size_t pIndex) const;
+    [[nodiscard]] const std::string &ReadString(const Collada::Accessor &pAccessor, const Collada::Data &pData, size_t pIndex) const;
 
     /** Recursively collects all nodes into the given array */
     void CollectNodes(const aiNode *pNode, std::vector<const aiNode *> &poNodes) const;
@@ -205,7 +195,7 @@ protected:
     /** Finds a proper name for a node derived from the collada-node's properties */
     std::string FindNameForNode(const Collada::Node *pNode);
 
-protected:
+private:
     /** Filename, for a verbose error message */
     std::string mFileName;
 
diff --git a/code/AssetLib/Collada/ColladaParser.cpp b/code/AssetLib/Collada/ColladaParser.cpp
index 42a8d6052..a9d965313 100644
--- a/code/AssetLib/Collada/ColladaParser.cpp
+++ b/code/AssetLib/Collada/ColladaParser.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -61,6 +61,7 @@ using namespace Assimp;
 using namespace Assimp::Collada;
 using namespace Assimp::Formatter;
 
+// ------------------------------------------------------------------------------------------------
 static void ReportWarning(const char *msg, ...) {
     ai_assert(nullptr != msg);
 
@@ -75,6 +76,7 @@ static void ReportWarning(const char *msg, ...) {
     ASSIMP_LOG_WARN("Validation warning: ", std::string(szBuffer, iLen));
 }
 
+// ------------------------------------------------------------------------------------------------
 static bool FindCommonKey(const std::string &collada_key, const MetaKeyPairVector &key_renaming, size_t &found_index) {
     for (size_t i = 0; i < key_renaming.size(); ++i) {
         if (key_renaming[i].first == collada_key) {
@@ -87,6 +89,7 @@ static bool FindCommonKey(const std::string &collada_key, const MetaKeyPairVecto
     return false;
 }
 
+// ------------------------------------------------------------------------------------------------
 static void readUrlAttribute(XmlNode &node, std::string &url) {
     url.clear();
     if (!XmlParser::getStdStrAttribute(node, "url", url)) {
@@ -98,23 +101,319 @@ static void readUrlAttribute(XmlNode &node, std::string &url) {
     url = url.c_str() + 1;
 }
 
+// ------------------------------------------------------------------------------------------------
+// Reads a node transformation entry of the given type and adds it to the given node's transformation list.
+static void ReadNodeTransformation(XmlNode &node, Node *pNode, TransformType pType) {
+    if (node.empty()) {
+        return;
+    }
+
+    std::string tagName = node.name();
+
+    Transform tf;
+    tf.mType = pType;
+
+    // read SID
+    if (XmlParser::hasAttribute(node, "sid")) {
+        XmlParser::getStdStrAttribute(node, "sid", tf.mID);
+    }
+
+    // how many parameters to read per transformation type
+    static constexpr unsigned int sNumParameters[] = { 9, 4, 3, 3, 7, 16 };
+    std::string value;
+    XmlParser::getValueAsString(node, value);
+    const char *content = value.c_str();
+    const char *end = value.c_str() + value.size();
+    // read as many parameters and store in the transformation
+    for (unsigned int a = 0; a < sNumParameters[pType]; a++) {
+        // skip whitespace before the number
+        SkipSpacesAndLineEnd(&content, end);
+        // read a number
+        content = fast_atoreal_move<ai_real>(content, tf.f[a]);
+    }
+
+    // place the transformation at the queue of the node
+    pNode->mTransforms.push_back(tf);
+}
+
+// ------------------------------------------------------------------------------------------------
+// Reads a single string metadata item
+static void ReadMetaDataItem(XmlNode &node, ColladaParser::StringMetaData &metadata) {
+    const MetaKeyPairVector &key_renaming = GetColladaAssimpMetaKeysCamelCase();
+    const std::string name = node.name();
+    if (name.empty()) {
+        return;
+    }
+
+    std::string v;
+    if (!XmlParser::getValueAsString(node, v)) {
+        return;
+    }
+
+    v = ai_trim(v);
+    aiString aistr;
+    aistr.Set(v);
+
+    std::string camel_key_str(name);
+    ToCamelCase(camel_key_str);
+
+    size_t found_index;
+    if (FindCommonKey(camel_key_str, key_renaming, found_index)) {
+        metadata.emplace(key_renaming[found_index].second, aistr);
+    } else {
+        metadata.emplace(camel_key_str, aistr);
+    }
+}
+
+// ------------------------------------------------------------------------------------------------
+// Reads an animation sampler into the given anim channel
+static void ReadAnimationSampler(const XmlNode &node, AnimationChannel &pChannel) {
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "input") {
+            if (XmlParser::hasAttribute(currentNode, "semantic")) {
+                std::string semantic, sourceAttr;
+                XmlParser::getStdStrAttribute(currentNode, "semantic", semantic);
+                if (XmlParser::hasAttribute(currentNode, "source")) {
+                    XmlParser::getStdStrAttribute(currentNode, "source", sourceAttr);
+                    const char *source = sourceAttr.c_str();
+                    if (source[0] != '#') {
+                        throw DeadlyImportError("Unsupported URL format");
+                    }
+                    source++;
+
+                    if (semantic == "INPUT") {
+                        pChannel.mSourceTimes = source;
+                    } else if (semantic == "OUTPUT") {
+                        pChannel.mSourceValues = source;
+                    } else if (semantic == "IN_TANGENT") {
+                        pChannel.mInTanValues = source;
+                    } else if (semantic == "OUT_TANGENT") {
+                        pChannel.mOutTanValues = source;
+                    } else if (semantic == "INTERPOLATION") {
+                        pChannel.mInterpolationValues = source;
+                    }
+                }
+            }
+        }
+    }
+}
+
+// ------------------------------------------------------------------------------------------------
+// Reads the joint definitions for the given controller
+static void ReadControllerJoints(const XmlNode &node, Controller &pController) {
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "input") {
+            const char *attrSemantic = currentNode.attribute("semantic").as_string();
+            const char *attrSource = currentNode.attribute("source").as_string();
+            if (attrSource[0] != '#') {
+                throw DeadlyImportError("Unsupported URL format in \"", attrSource, "\" in source attribute of <joints> data <input> element");
+            }
+            ++attrSource;
+            // parse source URL to corresponding source
+            if (strcmp(attrSemantic, "JOINT") == 0) {
+                pController.mJointNameSource = attrSource;
+            } else if (strcmp(attrSemantic, "INV_BIND_MATRIX") == 0) {
+                pController.mJointOffsetMatrixSource = attrSource;
+            } else {
+                throw DeadlyImportError("Unknown semantic \"", attrSemantic, "\" in <joints> data <input> element");
+            }
+        }
+    }
+}
+
+// ------------------------------------------------------------------------------------------------
+static void ReadControllerWeightsInput(const XmlNode &currentNode, Controller &pController) {
+    InputChannel channel;
+
+    const char *attrSemantic = currentNode.attribute("semantic").as_string();
+    const char *attrSource = currentNode.attribute("source").as_string();
+    channel.mOffset = currentNode.attribute("offset").as_int();
+
+    // local URLS always start with a '#'. We don't support global URLs
+    if (attrSource[0] != '#') {
+        throw DeadlyImportError("Unsupported URL format in \"", attrSource, "\" in source attribute of <vertex_weights> data <input> element");
+    }
+    channel.mAccessor = attrSource + 1;
+
+    // parse source URL to corresponding source
+    if (strcmp(attrSemantic, "JOINT") == 0) {
+        pController.mWeightInputJoints = channel;
+    } else if (strcmp(attrSemantic, "WEIGHT") == 0) {
+        pController.mWeightInputWeights = channel;
+    } else {
+        throw DeadlyImportError("Unknown semantic \"", attrSemantic, "\" in <vertex_weights> data <input> element");
+    }
+}
+
+// ------------------------------------------------------------------------------------------------
+static void ReadControllerWeightsVCount(const XmlNode &currentNode, Controller &pController) {
+    const std::string stdText = currentNode.text().as_string();
+    const char *text = stdText.c_str();
+    const char *end = text + stdText.size();
+    size_t numWeights = 0;
+    for (auto it = pController.mWeightCounts.begin(); it != pController.mWeightCounts.end(); ++it) {
+        if (*text == 0) {
+            throw DeadlyImportError("Out of data while reading <vcount>");
+        }
+
+        *it = strtoul10(text, &text);
+        numWeights += *it;
+        SkipSpacesAndLineEnd(&text, end);
+    }
+    // reserve weight count
+    pController.mWeights.resize(numWeights);
+}
+
+// ------------------------------------------------------------------------------------------------
+static void ReadControllerWeightsJoint2verts(XmlNode &currentNode, Controller &pController) {
+    // read JointIndex - WeightIndex pairs
+    std::string stdText;
+    XmlParser::getValueAsString(currentNode, stdText);
+    const char *text = stdText.c_str();
+    const char *end = text + stdText.size();
+    for (auto it = pController.mWeights.begin(); it != pController.mWeights.end(); ++it) {
+        if (text == nullptr) {
+            throw DeadlyImportError("Out of data while reading <vertex_weights>");
+        }
+        SkipSpacesAndLineEnd(&text, end);
+        it->first = strtoul10(text, &text);
+        SkipSpacesAndLineEnd(&text, end);
+        if (*text == 0) {
+            throw DeadlyImportError("Out of data while reading <vertex_weights>");
+        }
+        it->second = strtoul10(text, &text);
+        SkipSpacesAndLineEnd(&text, end);
+    }
+
+}
+
+// ------------------------------------------------------------------------------------------------
+// Reads the joint weights for the given controller
+static void ReadControllerWeights(XmlNode &node, Controller &pController) {
+    // Read vertex count from attributes and resize the array accordingly
+    int vertexCount = 0;
+    XmlParser::getIntAttribute(node, "count", vertexCount);
+    pController.mWeightCounts.resize(vertexCount);
+
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "input") {
+            ReadControllerWeightsInput(currentNode, pController);
+        } else if (currentName == "vcount" && vertexCount > 0) {
+            ReadControllerWeightsVCount(currentNode, pController);
+        } else if (currentName == "v" && vertexCount > 0) {
+            ReadControllerWeightsJoint2verts(currentNode, pController);
+        }
+    }
+}
+
+// ------------------------------------------------------------------------------------------------
+// Reads a material entry into the given material
+static void ReadMaterial(const XmlNode &node, Material &pMaterial) {
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "instance_effect") {
+            std::string url;
+            readUrlAttribute(currentNode, url);
+            pMaterial.mEffect = url;
+        }
+    }
+}
+
+// ------------------------------------------------------------------------------------------------
+// Reads a light entry into the given light
+static void ReadLight(XmlNode &node, Light &pLight) {
+    XmlNodeIterator xmlIt(node, XmlNodeIterator::PreOrderMode);
+    XmlNode currentNode;
+    // TODO: Check the current technique and skip over unsupported extra techniques
+
+    while (xmlIt.getNext(currentNode)) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "spot") {
+            pLight.mType = aiLightSource_SPOT;
+        } else if (currentName == "ambient") {
+            pLight.mType = aiLightSource_AMBIENT;
+        } else if (currentName == "directional") {
+            pLight.mType = aiLightSource_DIRECTIONAL;
+        } else if (currentName == "point") {
+            pLight.mType = aiLightSource_POINT;
+        } else if (currentName == "color") {
+            // text content contains 3 floats
+            std::string v;
+            XmlParser::getValueAsString(currentNode, v);
+            const char *content = v.c_str();
+            const char *end = content + v.size();
+
+            content = fast_atoreal_move<ai_real>(content, (ai_real &)pLight.mColor.r);
+            SkipSpacesAndLineEnd(&content, end);
+
+            content = fast_atoreal_move<ai_real>(content, (ai_real &)pLight.mColor.g);
+            SkipSpacesAndLineEnd(&content, end);
+
+            content = fast_atoreal_move<ai_real>(content, (ai_real &)pLight.mColor.b);
+            SkipSpacesAndLineEnd(&content, end);
+        } else if (currentName == "constant_attenuation") {
+            XmlParser::getValueAsReal(currentNode, pLight.mAttConstant);
+        } else if (currentName == "linear_attenuation") {
+            XmlParser::getValueAsReal(currentNode, pLight.mAttLinear);
+        } else if (currentName == "quadratic_attenuation") {
+            XmlParser::getValueAsReal(currentNode, pLight.mAttQuadratic);
+        } else if (currentName == "falloff_angle") {
+            XmlParser::getValueAsReal(currentNode, pLight.mFalloffAngle);
+        } else if (currentName == "falloff_exponent") {
+            XmlParser::getValueAsReal(currentNode, pLight.mFalloffExponent);
+        }
+        // FCOLLADA extensions
+        // -------------------------------------------------------
+        else if (currentName == "outer_cone") {
+            XmlParser::getValueAsReal(currentNode, pLight.mOuterAngle);
+        } else if (currentName == "penumbra_angle") { // this one is deprecated, now calculated using outer_cone
+            XmlParser::getValueAsReal(currentNode, pLight.mPenumbraAngle);
+        } else if (currentName == "intensity") {
+            XmlParser::getValueAsReal(currentNode, pLight.mIntensity);
+        } else if (currentName == "falloff") {
+            XmlParser::getValueAsReal(currentNode, pLight.mOuterAngle);
+        } else if (currentName == "hotspot_beam") {
+            XmlParser::getValueAsReal(currentNode, pLight.mFalloffAngle);
+        }
+        // OpenCOLLADA extensions
+        // -------------------------------------------------------
+        else if (currentName == "decay_falloff") {
+            XmlParser::getValueAsReal(currentNode, pLight.mOuterAngle);
+        }
+    }
+}
+
+// ------------------------------------------------------------------------------------------------
+// Reads a camera entry into the given light
+static void ReadCamera(XmlNode &node, Camera &camera) {
+    XmlNodeIterator xmlIt(node, XmlNodeIterator::PreOrderMode);
+    XmlNode currentNode;
+    while (xmlIt.getNext(currentNode)) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "orthographic") {
+            camera.mOrtho = true;
+        } else if (currentName == "xfov" || currentName == "xmag") {
+            XmlParser::getValueAsReal(currentNode, camera.mHorFov);
+        } else if (currentName == "yfov" || currentName == "ymag") {
+            XmlParser::getValueAsReal(currentNode, camera.mVerFov);
+        } else if (currentName == "aspect_ratio") {
+            XmlParser::getValueAsReal(currentNode, camera.mAspect);
+        } else if (currentName == "znear") {
+            XmlParser::getValueAsReal(currentNode, camera.mZNear);
+        } else if (currentName == "zfar") {
+            XmlParser::getValueAsReal(currentNode, camera.mZFar);
+        }
+    }
+}
+
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
 ColladaParser::ColladaParser(IOSystem *pIOHandler, const std::string &pFile) :
         mFileName(pFile),
-        mXmlParser(),
-        mDataLibrary(),
-        mAccessorLibrary(),
-        mMeshLibrary(),
-        mNodeLibrary(),
-        mImageLibrary(),
-        mEffectLibrary(),
-        mMaterialLibrary(),
-        mLightLibrary(),
-        mCameraLibrary(),
-        mControllerLibrary(),
         mRootNode(nullptr),
-        mAnims(),
         mUnitSize(1.0f),
         mUpDirection(UP_Y),
         mFormat(FV_1_5_n) {
@@ -122,13 +421,13 @@ ColladaParser::ColladaParser(IOSystem *pIOHandler, const std::string &pFile) :
         throw DeadlyImportError("IOSystem is nullptr.");
     }
 
-    std::unique_ptr<IOStream> daefile;
+    std::unique_ptr<IOStream> daeFile;
     std::unique_ptr<ZipArchiveIOSystem> zip_archive;
 
     // Determine type
-    std::string extension = BaseImporter::GetExtension(pFile);
+    const std::string extension = BaseImporter::GetExtension(pFile);
     if (extension != "dae") {
-        zip_archive.reset(new ZipArchiveIOSystem(pIOHandler, pFile));
+        zip_archive = std::make_unique<ZipArchiveIOSystem>(pIOHandler, pFile);
     }
 
     if (zip_archive && zip_archive->isOpen()) {
@@ -138,24 +437,24 @@ ColladaParser::ColladaParser(IOSystem *pIOHandler, const std::string &pFile) :
             throw DeadlyImportError("Invalid ZAE");
         }
 
-        daefile.reset(zip_archive->Open(dae_filename.c_str()));
-        if (daefile == nullptr) {
+        daeFile.reset(zip_archive->Open(dae_filename.c_str()));
+        if (daeFile == nullptr) {
             throw DeadlyImportError("Invalid ZAE manifest: '", dae_filename, "' is missing");
         }
     } else {
         // attempt to open the file directly
-        daefile.reset(pIOHandler->Open(pFile));
-        if (daefile == nullptr) {
+        daeFile.reset(pIOHandler->Open(pFile));
+        if (daeFile == nullptr) {
             throw DeadlyImportError("Failed to open file '", pFile, "'.");
         }
     }
 
     // generate a XML reader for it
-    if (!mXmlParser.parse(daefile.get())) {
+    if (!mXmlParser.parse(daeFile.get())) {
         throw DeadlyImportError("Unable to read file, malformed XML");
     }
     // start reading
-    XmlNode node = mXmlParser.getRootNode();
+    const XmlNode node = mXmlParser.getRootNode();
     XmlNode colladaNode = node.child("COLLADA");
     if (colladaNode.empty()) {
         return;
@@ -190,14 +489,14 @@ std::string ColladaParser::ReadZaeManifest(ZipArchiveIOSystem &zip_archive) {
         zip_archive.getFileListExtension(file_list, "dae");
 
         if (file_list.empty()) {
-            return std::string();
+            return {};
         }
 
         return file_list.front();
     }
     XmlParser manifestParser;
     if (!manifestParser.parse(manifestfile.get())) {
-        return std::string();
+        return {};
     }
 
     XmlNode root = manifestParser.getRootNode();
@@ -205,7 +504,7 @@ std::string ColladaParser::ReadZaeManifest(ZipArchiveIOSystem &zip_archive) {
     if (name != "dae_root") {
         root = *manifestParser.findNode("dae_root");
         if (nullptr == root) {
-            return std::string();
+            return {};
         }
         std::string v;
         XmlParser::getValueAsString(root, v);
@@ -214,7 +513,7 @@ std::string ColladaParser::ReadZaeManifest(ZipArchiveIOSystem &zip_archive) {
         return std::string(ai_str.C_Str());
     }
 
-    return std::string();
+    return {};
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -246,7 +545,7 @@ void ColladaParser::UriDecodePath(aiString &ss) {
             char mychar[3] = { it[1], it[2], 0 };
             size_t nbr = strtoul16(mychar);
             it += 3;
-            *out++ = (char)(nbr & 0xFF);
+            *out++ = static_cast<char>(nbr & 0xFF);
         } else {
             *out++ = *it++;
         }
@@ -261,12 +560,11 @@ void ColladaParser::UriDecodePath(aiString &ss) {
 // ------------------------------------------------------------------------------------------------
 // Reads the contents of the file
 void ColladaParser::ReadContents(XmlNode &node) {
-    const std::string name = node.name();
-    if (name == "COLLADA") {
+    if (const std::string name = node.name(); name == "COLLADA") {
         std::string version;
         if (XmlParser::getStdStrAttribute(node, "version", version)) {
             aiString v;
-            v.Set(version.c_str());
+            v.Set(version);
             mAssetMetaData.emplace(AI_METADATA_SOURCE_FORMAT_VERSION, v);
             if (!::strncmp(version.c_str(), "1.5", 3)) {
                 mFormat = FV_1_5_n;
@@ -287,8 +585,7 @@ void ColladaParser::ReadContents(XmlNode &node) {
 // Reads the structure of the file
 void ColladaParser::ReadStructure(XmlNode &node) {
     for (XmlNode &currentNode : node.children()) {
-        const std::string &currentName = currentNode.name();
-        if (currentName == "asset") {
+        if (const std::string &currentName = currentNode.name(); currentName == "asset") {
             ReadAssetInfo(currentNode);
         } else if (currentName == "library_animations") {
             ReadAnimationLibrary(currentNode);
@@ -329,8 +626,7 @@ void ColladaParser::ReadAssetInfo(XmlNode &node) {
     }
 
     for (XmlNode &currentNode : node.children()) {
-        const std::string &currentName = currentNode.name();
-        if (currentName == "unit") {
+        if (const std::string &currentName = currentNode.name(); currentName == "unit") {
             mUnitSize = 1.f;
             std::string tUnitSizeString;
             if (XmlParser::getStdStrAttribute(currentNode, "meter", tUnitSizeString)) {
@@ -364,35 +660,6 @@ void ColladaParser::ReadAssetInfo(XmlNode &node) {
     }
 }
 
-// ------------------------------------------------------------------------------------------------
-// Reads a single string metadata item
-void ColladaParser::ReadMetaDataItem(XmlNode &node, StringMetaData &metadata) {
-    const Collada::MetaKeyPairVector &key_renaming = GetColladaAssimpMetaKeysCamelCase();
-    const std::string name = node.name();
-    if (name.empty()) {
-        return;
-    }
-
-    std::string v;
-    if (!XmlParser::getValueAsString(node, v)) {
-        return;
-    }
-
-    v = ai_trim(v);
-    aiString aistr;
-    aistr.Set(v);
-
-    std::string camel_key_str(name);
-    ToCamelCase(camel_key_str);
-
-    size_t found_index;
-    if (FindCommonKey(camel_key_str, key_renaming, found_index)) {
-        metadata.emplace(key_renaming[found_index].second, aistr);
-    } else {
-        metadata.emplace(camel_key_str, aistr);
-    }
-}
-
 // ------------------------------------------------------------------------------------------------
 // Reads the animation clips
 void ColladaParser::ReadAnimationClipLibrary(XmlNode &node) {
@@ -424,15 +691,16 @@ void ColladaParser::ReadAnimationClipLibrary(XmlNode &node) {
     }
 }
 
+// ------------------------------------------------------------------------------------------------
+// The controller post processing step
 void ColladaParser::PostProcessControllers() {
-    std::string meshId;
     for (auto &it : mControllerLibrary) {
-        meshId = it.second.mMeshId;
+        std::string meshId = it.second.mMeshId;
         if (meshId.empty()) {
             continue;
         }
 
-        ControllerLibrary::iterator findItr = mControllerLibrary.find(meshId);
+        auto findItr = mControllerLibrary.find(meshId);
         while (findItr != mControllerLibrary.end()) {
             meshId = findItr->second.mMeshId;
             findItr = mControllerLibrary.find(meshId);
@@ -454,13 +722,13 @@ void ColladaParser::PostProcessRootAnimations() {
     for (auto &it : mAnimationClipLibrary) {
         std::string clipName = it.first;
 
-        Animation *clip = new Animation();
+        auto *clip = new Animation();
         clip->mName = clipName;
 
         temp.mSubAnims.push_back(clip);
 
         for (const std::string &animationID : it.second) {
-            AnimationLibrary::iterator animation = mAnimationLibrary.find(animationID);
+            auto animation = mAnimationLibrary.find(animationID);
 
             if (animation != mAnimationLibrary.end()) {
                 Animation *pSourceAnimation = animation->second;
@@ -533,7 +801,7 @@ void ColladaParser::ReadAnimation(XmlNode &node, Collada::Animation *pParent) {
             std::string id;
             if (XmlParser::getStdStrAttribute(currentNode, "id", id)) {
                 // have it read into a channel
-                ChannelMap::iterator newChannel = channels.insert(std::make_pair(id, AnimationChannel())).first;
+                auto newChannel = channels.insert(std::make_pair(id, AnimationChannel())).first;
                 ReadAnimationSampler(currentNode, newChannel->second);
             }
         } else if (currentName == "channel") {
@@ -543,7 +811,7 @@ void ColladaParser::ReadAnimation(XmlNode &node, Collada::Animation *pParent) {
             if (source_name[0] == '#') {
                 source_name = source_name.substr(1, source_name.size() - 1);
             }
-            ChannelMap::iterator cit = channels.find(source_name);
+            auto cit = channels.find(source_name);
             if (cit != channels.end()) {
                 cit->second.mTarget = target;
             }
@@ -568,40 +836,6 @@ void ColladaParser::ReadAnimation(XmlNode &node, Collada::Animation *pParent) {
     }
 }
 
-// ------------------------------------------------------------------------------------------------
-// Reads an animation sampler into the given anim channel
-void ColladaParser::ReadAnimationSampler(XmlNode &node, Collada::AnimationChannel &pChannel) {
-    for (XmlNode &currentNode : node.children()) {
-        const std::string &currentName = currentNode.name();
-        if (currentName == "input") {
-            if (XmlParser::hasAttribute(currentNode, "semantic")) {
-                std::string semantic, sourceAttr;
-                XmlParser::getStdStrAttribute(currentNode, "semantic", semantic);
-                if (XmlParser::hasAttribute(currentNode, "source")) {
-                    XmlParser::getStdStrAttribute(currentNode, "source", sourceAttr);
-                    const char *source = sourceAttr.c_str();
-                    if (source[0] != '#') {
-                        throw DeadlyImportError("Unsupported URL format");
-                    }
-                    source++;
-
-                    if (semantic == "INPUT") {
-                        pChannel.mSourceTimes = source;
-                    } else if (semantic == "OUTPUT") {
-                        pChannel.mSourceValues = source;
-                    } else if (semantic == "IN_TANGENT") {
-                        pChannel.mInTanValues = source;
-                    } else if (semantic == "OUT_TANGENT") {
-                        pChannel.mOutTanValues = source;
-                    } else if (semantic == "INTERPOLATION") {
-                        pChannel.mInterpolationValues = source;
-                    }
-                }
-            }
-        }
-    }
-}
-
 // ------------------------------------------------------------------------------------------------
 // Reads the skeleton controller library
 void ColladaParser::ReadControllerLibrary(XmlNode &node) {
@@ -614,8 +848,7 @@ void ColladaParser::ReadControllerLibrary(XmlNode &node) {
         if (currentName != "controller") {
             continue;
         }
-        std::string id;
-        if (XmlParser::getStdStrAttribute(currentNode, "id", id)) {
+        if (std::string id; XmlParser::getStdStrAttribute(currentNode, "id", id)) {
             mControllerLibrary[id] = Controller();
             ReadController(currentNode, mControllerLibrary[id]);
         }
@@ -632,12 +865,11 @@ void ColladaParser::ReadController(XmlNode &node, Collada::Controller &controlle
     XmlNodeIterator xmlIt(node, XmlNodeIterator::PreOrderMode);
     XmlNode currentNode;
     while (xmlIt.getNext(currentNode)) {
-        const std::string &currentName = currentNode.name();
-        if (currentName == "morph") {
+        if (const std::string &currentName = currentNode.name(); currentName == "morph") {
             controller.mType = Morph;
-            controller.mMeshId = currentNode.attribute("source").as_string();
-            int methodIndex = currentNode.attribute("method").as_int();
-            if (methodIndex > 0) {
+            std::string id = currentNode.attribute("source").as_string();
+            controller.mMeshId = id.substr(1, id.size() - 1);
+            if (const int methodIndex = currentNode.attribute("method").as_int(); methodIndex > 0) {
                 std::string method;
                 XmlParser::getValueAsString(currentNode, method);
 
@@ -646,20 +878,20 @@ void ColladaParser::ReadController(XmlNode &node, Collada::Controller &controlle
                 }
             }
         } else if (currentName == "skin") {
-            std::string id;
-            if (XmlParser::getStdStrAttribute(currentNode, "source", id)) {
+            if (std::string id; XmlParser::getStdStrAttribute(currentNode, "source", id)) {
                 controller.mMeshId = id.substr(1, id.size() - 1);
             }
         } else if (currentName == "bind_shape_matrix") {
             std::string v;
             XmlParser::getValueAsString(currentNode, v);
             const char *content = v.c_str();
-            for (unsigned int a = 0; a < 16; a++) {
-                SkipSpacesAndLineEnd(&content);
+            const char *end = content + v.size();
+            for (auto & a : controller.mBindShapeMatrix) {
+                SkipSpacesAndLineEnd(&content, end);
                 // read a number
-                content = fast_atoreal_move<ai_real>(content, controller.mBindShapeMatrix[a]);
+                content = fast_atoreal_move<ai_real>(content, a);
                 // skip whitespace after it
-                SkipSpacesAndLineEnd(&content);
+                SkipSpacesAndLineEnd(&content, end);
             }
         } else if (currentName == "source") {
             ReadSource(currentNode);
@@ -684,105 +916,13 @@ void ColladaParser::ReadController(XmlNode &node, Collada::Controller &controlle
     }
 }
 
-// ------------------------------------------------------------------------------------------------
-// Reads the joint definitions for the given controller
-void ColladaParser::ReadControllerJoints(XmlNode &node, Collada::Controller &pController) {
-    for (XmlNode &currentNode : node.children()) {
-        const std::string &currentName = currentNode.name();
-        if (currentName == "input") {
-            const char *attrSemantic = currentNode.attribute("semantic").as_string();
-            const char *attrSource = currentNode.attribute("source").as_string();
-            if (attrSource[0] != '#') {
-                throw DeadlyImportError("Unsupported URL format in \"", attrSource, "\" in source attribute of <joints> data <input> element");
-            }
-            ++attrSource;
-            // parse source URL to corresponding source
-            if (strcmp(attrSemantic, "JOINT") == 0) {
-                pController.mJointNameSource = attrSource;
-            } else if (strcmp(attrSemantic, "INV_BIND_MATRIX") == 0) {
-                pController.mJointOffsetMatrixSource = attrSource;
-            } else {
-                throw DeadlyImportError("Unknown semantic \"", attrSemantic, "\" in <joints> data <input> element");
-            }
-        }
-    }
-}
-
-// ------------------------------------------------------------------------------------------------
-// Reads the joint weights for the given controller
-void ColladaParser::ReadControllerWeights(XmlNode &node, Collada::Controller &pController) {
-    // Read vertex count from attributes and resize the array accordingly
-    int vertexCount = 0;
-    XmlParser::getIntAttribute(node, "count", vertexCount);
-    pController.mWeightCounts.resize(vertexCount);
-
-    for (XmlNode &currentNode : node.children()) {
-        const std::string &currentName = currentNode.name();
-        if (currentName == "input") {
-            InputChannel channel;
-
-            const char *attrSemantic = currentNode.attribute("semantic").as_string();
-            const char *attrSource = currentNode.attribute("source").as_string();
-            channel.mOffset = currentNode.attribute("offset").as_int();
-
-            // local URLS always start with a '#'. We don't support global URLs
-            if (attrSource[0] != '#') {
-                throw DeadlyImportError("Unsupported URL format in \"", attrSource, "\" in source attribute of <vertex_weights> data <input> element");
-            }
-            channel.mAccessor = attrSource + 1;
-
-            // parse source URL to corresponding source
-            if (strcmp(attrSemantic, "JOINT") == 0) {
-                pController.mWeightInputJoints = channel;
-            } else if (strcmp(attrSemantic, "WEIGHT") == 0) {
-                pController.mWeightInputWeights = channel;
-            } else {
-                throw DeadlyImportError("Unknown semantic \"", attrSemantic, "\" in <vertex_weights> data <input> element");
-            }
-        } else if (currentName == "vcount" && vertexCount > 0) {
-            const char *text = currentNode.text().as_string();
-            size_t numWeights = 0;
-            for (std::vector<size_t>::iterator it = pController.mWeightCounts.begin(); it != pController.mWeightCounts.end(); ++it) {
-                if (*text == 0) {
-                    throw DeadlyImportError("Out of data while reading <vcount>");
-                }
-
-                *it = strtoul10(text, &text);
-                numWeights += *it;
-                SkipSpacesAndLineEnd(&text);
-            }
-            // reserve weight count
-            pController.mWeights.resize(numWeights);
-        } else if (currentName == "v" && vertexCount > 0) {
-            // read JointIndex - WeightIndex pairs
-            std::string stdText;
-            XmlParser::getValueAsString(currentNode, stdText);
-            const char *text = stdText.c_str();
-            for (std::vector<std::pair<size_t, size_t>>::iterator it = pController.mWeights.begin(); it != pController.mWeights.end(); ++it) {
-                if (text == nullptr) {
-                    throw DeadlyImportError("Out of data while reading <vertex_weights>");
-                }
-                SkipSpacesAndLineEnd(&text);
-                it->first = strtoul10(text, &text);
-                SkipSpacesAndLineEnd(&text);
-                if (*text == 0) {
-                    throw DeadlyImportError("Out of data while reading <vertex_weights>");
-                }
-                it->second = strtoul10(text, &text);
-                SkipSpacesAndLineEnd(&text);
-            }
-        }
-    }
-}
-
 // ------------------------------------------------------------------------------------------------
 // Reads the image library contents
-void ColladaParser::ReadImageLibrary(XmlNode &node) {
+void ColladaParser::ReadImageLibrary(const XmlNode &node) {
     for (XmlNode &currentNode : node.children()) {
         const std::string &currentName = currentNode.name();
         if (currentName == "image") {
-            std::string id;
-            if (XmlParser::getStdStrAttribute(currentNode, "id", id)) {
+            if (std::basic_string<char> id; XmlParser::getStdStrAttribute(currentNode, "id", id)) {
                 mImageLibrary[id] = Image();
                 // read on from there
                 ReadImage(currentNode, mImageLibrary[id]);
@@ -793,7 +933,7 @@ void ColladaParser::ReadImageLibrary(XmlNode &node) {
 
 // ------------------------------------------------------------------------------------------------
 // Reads an image entry into the given image
-void ColladaParser::ReadImage(XmlNode &node, Collada::Image &pImage) {
+void ColladaParser::ReadImage(const XmlNode &node, Collada::Image &pImage) const {
     for (XmlNode &currentNode : node.children()) {
         const std::string currentName = currentNode.name();
         if (currentName == "image") {
@@ -856,13 +996,13 @@ void ColladaParser::ReadImage(XmlNode &node, Collada::Image &pImage) {
 // Reads the material library
 void ColladaParser::ReadMaterialLibrary(XmlNode &node) {
     std::map<std::string, int> names;
-    for (XmlNode &currentNode : node.children()) {
+    for (const XmlNode &currentNode : node.children()) {
         std::string id = currentNode.attribute("id").as_string();
         std::string name = currentNode.attribute("name").as_string();
         mMaterialLibrary[id] = Material();
 
         if (!name.empty()) {
-            std::map<std::string, int>::iterator it = names.find(name);
+            auto it = names.find(name);
             if (it != names.end()) {
                 std::ostringstream strStream;
                 strStream << ++it->second;
@@ -917,106 +1057,6 @@ void ColladaParser::ReadCameraLibrary(XmlNode &node) {
     }
 }
 
-// ------------------------------------------------------------------------------------------------
-// Reads a material entry into the given material
-void ColladaParser::ReadMaterial(XmlNode &node, Collada::Material &pMaterial) {
-    for (XmlNode &currentNode : node.children()) {
-        const std::string &currentName = currentNode.name();
-        if (currentName == "instance_effect") {
-            std::string url;
-            readUrlAttribute(currentNode, url);
-            pMaterial.mEffect = url;
-        }
-    }
-}
-
-// ------------------------------------------------------------------------------------------------
-// Reads a light entry into the given light
-void ColladaParser::ReadLight(XmlNode &node, Collada::Light &pLight) {
-    XmlNodeIterator xmlIt(node, XmlNodeIterator::PreOrderMode);
-    XmlNode currentNode;
-    // TODO: Check the current technique and skip over unsupported extra techniques
-
-    while (xmlIt.getNext(currentNode)) {
-        const std::string &currentName = currentNode.name();
-        if (currentName == "spot") {
-            pLight.mType = aiLightSource_SPOT;
-        } else if (currentName == "ambient") {
-            pLight.mType = aiLightSource_AMBIENT;
-        } else if (currentName == "directional") {
-            pLight.mType = aiLightSource_DIRECTIONAL;
-        } else if (currentName == "point") {
-            pLight.mType = aiLightSource_POINT;
-        } else if (currentName == "color") {
-            // text content contains 3 floats
-            std::string v;
-            XmlParser::getValueAsString(currentNode, v);
-            const char *content = v.c_str();
-
-            content = fast_atoreal_move<ai_real>(content, (ai_real &)pLight.mColor.r);
-            SkipSpacesAndLineEnd(&content);
-
-            content = fast_atoreal_move<ai_real>(content, (ai_real &)pLight.mColor.g);
-            SkipSpacesAndLineEnd(&content);
-
-            content = fast_atoreal_move<ai_real>(content, (ai_real &)pLight.mColor.b);
-            SkipSpacesAndLineEnd(&content);
-        } else if (currentName == "constant_attenuation") {
-            XmlParser::getValueAsFloat(currentNode, pLight.mAttConstant);
-        } else if (currentName == "linear_attenuation") {
-            XmlParser::getValueAsFloat(currentNode, pLight.mAttLinear);
-        } else if (currentName == "quadratic_attenuation") {
-            XmlParser::getValueAsFloat(currentNode, pLight.mAttQuadratic);
-        } else if (currentName == "falloff_angle") {
-            XmlParser::getValueAsFloat(currentNode, pLight.mFalloffAngle);
-        } else if (currentName == "falloff_exponent") {
-            XmlParser::getValueAsFloat(currentNode, pLight.mFalloffExponent);
-        }
-        // FCOLLADA extensions
-        // -------------------------------------------------------
-        else if (currentName == "outer_cone") {
-            XmlParser::getValueAsFloat(currentNode, pLight.mOuterAngle);
-        } else if (currentName == "penumbra_angle") { // this one is deprecated, now calculated using outer_cone
-            XmlParser::getValueAsFloat(currentNode, pLight.mPenumbraAngle);
-        } else if (currentName == "intensity") {
-            XmlParser::getValueAsFloat(currentNode, pLight.mIntensity);
-        }
-        else if (currentName == "falloff") {
-            XmlParser::getValueAsFloat(currentNode, pLight.mOuterAngle);
-        } else if (currentName == "hotspot_beam") {
-            XmlParser::getValueAsFloat(currentNode, pLight.mFalloffAngle);
-        }
-        // OpenCOLLADA extensions
-        // -------------------------------------------------------
-        else if (currentName == "decay_falloff") {
-            XmlParser::getValueAsFloat(currentNode, pLight.mOuterAngle);
-        }
-    }
-}
-
-// ------------------------------------------------------------------------------------------------
-// Reads a camera entry into the given light
-void ColladaParser::ReadCamera(XmlNode &node, Collada::Camera &camera) {
-    XmlNodeIterator xmlIt(node, XmlNodeIterator::PreOrderMode);
-    XmlNode currentNode;
-    while (xmlIt.getNext(currentNode)) {
-        const std::string &currentName = currentNode.name();
-        if (currentName == "orthographic") {
-            camera.mOrtho = true;
-        } else if (currentName == "xfov" || currentName == "xmag") {
-            XmlParser::getValueAsFloat(currentNode, camera.mHorFov);
-        } else if (currentName == "yfov" || currentName == "ymag") {
-            XmlParser::getValueAsFloat(currentNode, camera.mVerFov);
-        } else if (currentName == "aspect_ratio") {
-            XmlParser::getValueAsFloat(currentNode, camera.mAspect);
-        } else if (currentName == "znear") {
-            XmlParser::getValueAsFloat(currentNode, camera.mZNear);
-        } else if (currentName == "zfar") {
-            XmlParser::getValueAsFloat(currentNode, camera.mZFar);
-        }
-    }
-}
-
 // ------------------------------------------------------------------------------------------------
 // Reads the effect library
 void ColladaParser::ReadEffectLibrary(XmlNode &node) {
@@ -1164,15 +1204,15 @@ void ColladaParser::ReadSamplerProperties(XmlNode &node, Sampler &out) {
         } else if (currentName == "mirrorV") {
             XmlParser::getValueAsBool(currentNode, out.mMirrorV);
         } else if (currentName == "repeatU") {
-            XmlParser::getValueAsFloat(currentNode, out.mTransform.mScaling.x);
+            XmlParser::getValueAsReal(currentNode, out.mTransform.mScaling.x);
         } else if (currentName == "repeatV") {
-            XmlParser::getValueAsFloat(currentNode, out.mTransform.mScaling.y);
+            XmlParser::getValueAsReal(currentNode, out.mTransform.mScaling.y);
         } else if (currentName == "offsetU") {
-            XmlParser::getValueAsFloat(currentNode, out.mTransform.mTranslation.x);
+            XmlParser::getValueAsReal(currentNode, out.mTransform.mTranslation.x);
         } else if (currentName == "offsetV") {
-            XmlParser::getValueAsFloat(currentNode, out.mTransform.mTranslation.y);
+            XmlParser::getValueAsReal(currentNode, out.mTransform.mTranslation.y);
         } else if (currentName == "rotateUV") {
-            XmlParser::getValueAsFloat(currentNode, out.mTransform.mRotation);
+            XmlParser::getValueAsReal(currentNode, out.mTransform.mRotation);
         } else if (currentName == "blend_mode") {
             std::string v;
             XmlParser::getValueAsString(currentNode, v);
@@ -1192,14 +1232,14 @@ void ColladaParser::ReadSamplerProperties(XmlNode &node, Sampler &out) {
         // OKINO extensions
         // -------------------------------------------------------
         else if (currentName == "weighting") {
-            XmlParser::getValueAsFloat(currentNode, out.mWeighting);
+            XmlParser::getValueAsReal(currentNode, out.mWeighting);
         } else if (currentName == "mix_with_previous_layer") {
-            XmlParser::getValueAsFloat(currentNode, out.mMixWithPrevious);
+            XmlParser::getValueAsReal(currentNode, out.mMixWithPrevious);
         }
         // MAX3D extensions
         // -------------------------------------------------------
         else if (currentName == "amount") {
-            XmlParser::getValueAsFloat(currentNode, out.mWeighting);
+            XmlParser::getValueAsReal(currentNode, out.mWeighting);
         }
     }
 }
@@ -1220,18 +1260,19 @@ void ColladaParser::ReadEffectColor(XmlNode &node, aiColor4D &pColor, Sampler &p
             std::string v;
             XmlParser::getValueAsString(currentNode, v);
             const char *content = v.c_str();
+            const char *end = v.c_str() + v.size() + 1;
 
             content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.r);
-            SkipSpacesAndLineEnd(&content);
+            SkipSpacesAndLineEnd(&content, end);
 
             content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.g);
-            SkipSpacesAndLineEnd(&content);
+            SkipSpacesAndLineEnd(&content, end);
 
             content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.b);
-            SkipSpacesAndLineEnd(&content);
+            SkipSpacesAndLineEnd(&content, end);
 
             content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.a);
-            SkipSpacesAndLineEnd(&content);
+            SkipSpacesAndLineEnd(&content, end);
         } else if (currentName == "texture") {
             // get name of source texture/sampler
             XmlParser::getStdStrAttribute(currentNode, "texture", pSampler.mName);
@@ -1258,13 +1299,13 @@ void ColladaParser::ReadEffectColor(XmlNode &node, aiColor4D &pColor, Sampler &p
 
 // ------------------------------------------------------------------------------------------------
 // Reads an effect entry containing a float
-void ColladaParser::ReadEffectFloat(XmlNode &node, ai_real &pFloat) {
-    pFloat = 0.f;
+void ColladaParser::ReadEffectFloat(XmlNode &node, ai_real &pReal) {
+    pReal = 0.f;
     XmlNode floatNode = node.child("float");
     if (floatNode.empty()) {
         return;
     }
-    XmlParser::getValueAsFloat(floatNode, pFloat);
+    XmlParser::getValueAsReal(floatNode, pReal);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -1345,6 +1386,7 @@ void ColladaParser::ReadGeometry(XmlNode &node, Collada::Mesh &pMesh) {
     if (node.empty()) {
         return;
     }
+
     for (XmlNode &currentNode : node.children()) {
         const std::string &currentName = currentNode.name();
         if (currentName == "mesh") {
@@ -1415,6 +1457,7 @@ void ColladaParser::ReadDataArray(XmlNode &node) {
     XmlParser::getValueAsString(node, v);
     v = ai_trim(v);
     const char *content = v.c_str();
+    const char *end = content + v.size();
 
     // read values and store inside an array in the data library
     mDataLibrary[id] = Data();
@@ -1433,11 +1476,13 @@ void ColladaParser::ReadDataArray(XmlNode &node) {
                 }
 
                 s.clear();
-                while (!IsSpaceOrNewLine(*content))
-                    s += *content++;
+                while (!IsSpaceOrNewLine(*content)) {
+                    s += *content;
+                    content++;
+                }
                 data.mStrings.push_back(s);
 
-                SkipSpacesAndLineEnd(&content);
+                SkipSpacesAndLineEnd(&content, end);
             }
         } else {
             data.mValues.reserve(count);
@@ -1452,7 +1497,7 @@ void ColladaParser::ReadDataArray(XmlNode &node) {
                 content = fast_atoreal_move<ai_real>(content, value);
                 data.mValues.push_back(value);
                 // skip whitespace after it
-                SkipSpacesAndLineEnd(&content);
+                SkipSpacesAndLineEnd(&content, end);
             }
         }
     }
@@ -1617,8 +1662,10 @@ void ColladaParser::ReadIndexData(XmlNode &node, Mesh &pMesh) {
                     std::string v;
                     XmlParser::getValueAsString(currentNode, v);
                     const char *content = v.c_str();
+                    const char *end = content + v.size();
+
                     vcount.reserve(numPrimitives);
-                    SkipSpacesAndLineEnd(&content);
+                    SkipSpacesAndLineEnd(&content, end);
                     for (unsigned int a = 0; a < numPrimitives; a++) {
                         if (*content == 0) {
                             throw DeadlyImportError("Expected more values while reading <vcount> contents.");
@@ -1626,7 +1673,7 @@ void ColladaParser::ReadIndexData(XmlNode &node, Mesh &pMesh) {
                         // read a number
                         vcount.push_back((size_t)strtoul10(content, &content));
                         // skip whitespace after it
-                        SkipSpacesAndLineEnd(&content);
+                        SkipSpacesAndLineEnd(&content, end);
                     }
                 }
             }
@@ -1720,7 +1767,6 @@ size_t ColladaParser::ReadPrimitives(XmlNode &node, Mesh &pMesh, std::vector<Inp
         expectedPointCount = 3 * pNumPrimitives;
         break;
     default:
-        // other primitive types don't state the index count upfront... we need to guess
         break;
     }
 
@@ -1735,14 +1781,16 @@ size_t ColladaParser::ReadPrimitives(XmlNode &node, Mesh &pMesh, std::vector<Inp
         std::string v;
         XmlParser::getValueAsString(node, v);
         const char *content = v.c_str();
-        SkipSpacesAndLineEnd(&content);
+        const char *end = content + v.size();
+
+        SkipSpacesAndLineEnd(&content, end);
         while (*content != 0) {
             // read a value.
             // Hack: (thom) Some exporters put negative indices sometimes. We just try to carry on anyways.
             int value = std::max(0, strtol10(content, &content));
             indices.push_back(size_t(value));
             // skip whitespace after it
-            SkipSpacesAndLineEnd(&content);
+            SkipSpacesAndLineEnd(&content, end);
         }
     }
 
@@ -1760,7 +1808,7 @@ size_t ColladaParser::ReadPrimitives(XmlNode &node, Mesh &pMesh, std::vector<Inp
     }
 
     // find the data for all sources
-    for (std::vector<InputChannel>::iterator it = pMesh.mPerVertexData.begin(); it != pMesh.mPerVertexData.end(); ++it) {
+    for (auto it = pMesh.mPerVertexData.begin(); it != pMesh.mPerVertexData.end(); ++it) {
         InputChannel &input = *it;
         if (input.mResolved) {
             continue;
@@ -1772,10 +1820,14 @@ size_t ColladaParser::ReadPrimitives(XmlNode &node, Mesh &pMesh, std::vector<Inp
         const Accessor *acc = input.mResolved;
         if (!acc->mData) {
             acc->mData = &ResolveLibraryReference(mDataLibrary, acc->mSource);
+            const size_t dataSize = acc->mOffset + acc->mCount * acc->mStride;
+            if (dataSize > acc->mData->mValues.size()) {
+                throw DeadlyImportError("Not enough data for accessor");
+            }
         }
     }
     // and the same for the per-index channels
-    for (std::vector<InputChannel>::iterator it = pPerIndexChannels.begin(); it != pPerIndexChannels.end(); ++it) {
+    for (auto it = pPerIndexChannels.begin(); it != pPerIndexChannels.end(); ++it) {
         InputChannel &input = *it;
         if (input.mResolved) {
             continue;
@@ -1796,13 +1848,19 @@ size_t ColladaParser::ReadPrimitives(XmlNode &node, Mesh &pMesh, std::vector<Inp
         const Accessor *acc = input.mResolved;
         if (!acc->mData) {
             acc->mData = &ResolveLibraryReference(mDataLibrary, acc->mSource);
+            const size_t dataSize = acc->mOffset + acc->mCount * acc->mStride;
+            if (dataSize > acc->mData->mValues.size()) {
+                throw DeadlyImportError("Not enough data for accessor");
+            }
         }
     }
 
     // For continued primitives, the given count does not come all in one <p>, but only one primitive per <p>
     size_t numPrimitives = pNumPrimitives;
-    if (pPrimType == Prim_TriFans || pPrimType == Prim_Polygon)
+    if (pPrimType == Prim_TriFans || pPrimType == Prim_Polygon) {
         numPrimitives = 1;
+    }
+
     // For continued primitives, the given count is actually the number of <p>'s inside the parent tag
     if (pPrimType == Prim_TriStrips) {
         size_t numberOfVertices = indices.size() / numOffsets;
@@ -1877,11 +1935,11 @@ void ColladaParser::CopyVertex(size_t currentVertex, size_t numOffsets, size_t n
     ai_assert((baseOffset + numOffsets - 1) < indices.size());
 
     // extract per-vertex channels using the global per-vertex offset
-    for (std::vector<InputChannel>::iterator it = pMesh.mPerVertexData.begin(); it != pMesh.mPerVertexData.end(); ++it) {
+    for (auto it = pMesh.mPerVertexData.begin(); it != pMesh.mPerVertexData.end(); ++it) {
         ExtractDataObjectFromChannel(*it, indices[baseOffset + perVertexOffset], pMesh);
     }
     // and extract per-index channels using there specified offset
-    for (std::vector<InputChannel>::iterator it = pPerIndexChannels.begin(); it != pPerIndexChannels.end(); ++it) {
+    for (auto it = pPerIndexChannels.begin(); it != pPerIndexChannels.end(); ++it) {
         ExtractDataObjectFromChannel(*it, indices[baseOffset + it->mOffset], pMesh);
     }
 
@@ -2148,40 +2206,6 @@ void ColladaParser::ReadSceneNode(XmlNode &node, Node *pNode) {
     }
 }
 
-// ------------------------------------------------------------------------------------------------
-// Reads a node transformation entry of the given type and adds it to the given node's transformation list.
-void ColladaParser::ReadNodeTransformation(XmlNode &node, Node *pNode, TransformType pType) {
-    if (node.empty()) {
-        return;
-    }
-
-    std::string tagName = node.name();
-
-    Transform tf;
-    tf.mType = pType;
-
-    // read SID
-    if (XmlParser::hasAttribute(node, "sid")) {
-        XmlParser::getStdStrAttribute(node, "sid", tf.mID);
-    }
-
-    // how many parameters to read per transformation type
-    static const unsigned int sNumParameters[] = { 9, 4, 3, 3, 7, 16 };
-    std::string value;
-    XmlParser::getValueAsString(node, value);
-    const char *content = value.c_str();
-
-    // read as many parameters and store in the transformation
-    for (unsigned int a = 0; a < sNumParameters[pType]; a++) {
-        // skip whitespace before the number
-        SkipSpacesAndLineEnd(&content);
-        // read a number
-        content = fast_atoreal_move<ai_real>(content, tf.f[a]);
-    }
-
-    // place the transformation at the queue of the node
-    pNode->mTransforms.push_back(tf);
-}
 
 // ------------------------------------------------------------------------------------------------
 // Processes bind_vertex_input and bind elements
@@ -2219,9 +2243,7 @@ void ColladaParser::ReadMaterialVertexInputBinding(XmlNode &node, Collada::Seman
 void ColladaParser::ReadEmbeddedTextures(ZipArchiveIOSystem &zip_archive) {
     // Attempt to load any undefined Collada::Image in ImageLibrary
     for (auto &it : mImageLibrary) {
-        Collada::Image &image = it.second;
-
-        if (image.mImageData.empty()) {
+        if (Image &image = it.second; image.mImageData.empty()) {
             std::unique_ptr<IOStream> image_file(zip_archive.Open(image.mFileName.c_str()));
             if (image_file) {
                 image.mImageData.resize(image_file->FileSize());
@@ -2268,9 +2290,9 @@ void ColladaParser::ReadNodeGeometry(XmlNode &node, Node *pNode) {
                             urlMat++;
 
                         s.mMatName = urlMat;
+                        ReadMaterialVertexInputBinding(instanceMatNode, s);
                         // store the association
                         instance.mMaterials[group] = s;
-                        ReadMaterialVertexInputBinding(instanceMatNode, s);
                     }
                 }
             }
@@ -2304,7 +2326,7 @@ void ColladaParser::ReadScene(XmlNode &node) {
             }
 
             // find the referred scene, skip the leading #
-            NodeLibrary::const_iterator sit = mNodeLibrary.find(url.c_str() + 1);
+            auto sit = mNodeLibrary.find(url.c_str() + 1);
             if (sit == mNodeLibrary.end()) {
                 throw DeadlyImportError("Unable to resolve visual_scene reference \"", std::string(std::move(url)), "\" in <instance_visual_scene> element.");
             }
@@ -2376,7 +2398,7 @@ aiMatrix4x4 ColladaParser::CalculateResultTransform(const std::vector<Transform>
 
 // ------------------------------------------------------------------------------------------------
 // Determines the input data type for the given semantic string
-Collada::InputType ColladaParser::GetTypeForSemantic(const std::string &semantic) {
+InputType ColladaParser::GetTypeForSemantic(const std::string &semantic) {
     if (semantic.empty()) {
         ASSIMP_LOG_WARN("Vertex input type is empty.");
         return IT_Invalid;
diff --git a/code/AssetLib/Collada/ColladaParser.h b/code/AssetLib/Collada/ColladaParser.h
index 15982934f..e2bc895df 100644
--- a/code/AssetLib/Collada/ColladaParser.h
+++ b/code/AssetLib/Collada/ColladaParser.h
@@ -2,7 +2,7 @@
  Open Asset Import Library (assimp)
  ----------------------------------------------------------------------
 
- Copyright (c) 2006-2022, assimp team
+ Copyright (c) 2006-2025, assimp team
 
  All rights reserved.
 
@@ -48,7 +48,6 @@
 #define AI_COLLADAPARSER_H_INC
 
 #include "ColladaHelper.h"
-#include <assimp/TinyFormatter.h>
 #include <assimp/ai_assert.h>
 #include <assimp/XmlParser.h>
 
@@ -67,268 +66,240 @@ class ZipArchiveIOSystem;
 class ColladaParser {
     friend class ColladaLoader;
 
-    /** Converts a path read from a collada file to the usual representation */
-    static void UriDecodePath(aiString &ss);
+public:
+    /// Map for generic metadata as aiString.
+    using StringMetaData = std::map<std::string, aiString>;
 
-protected:
-    /** Map for generic metadata as aiString */
-    typedef std::map<std::string, aiString> StringMetaData;
-
-    /** Constructor from XML file */
+    /// Constructor from XML file.
     ColladaParser(IOSystem *pIOHandler, const std::string &pFile);
 
-    /** Destructor */
+    /// Destructor
     ~ColladaParser();
 
-    /** Attempts to read the ZAE manifest and returns the DAE to open */
+    /// Attempts to read the ZAE manifest and returns the DAE to open
     static std::string ReadZaeManifest(ZipArchiveIOSystem &zip_archive);
 
-    /** Reads the contents of the file */
+    /// Reads the contents of the file
     void ReadContents(XmlNode &node);
 
-    /** Reads the structure of the file */
+    /// Reads the structure of the file
     void ReadStructure(XmlNode &node);
 
-    /** Reads asset information such as coordinate system information and legal blah */
+    /// Reads asset information such as coordinate system information and legal blah
     void ReadAssetInfo(XmlNode &node);
 
-    /** Reads contributor information such as author and legal blah */
+    /// Reads contributor information such as author and legal blah
     void ReadContributorInfo(XmlNode &node);
 
-    /** Reads generic metadata into provided map and renames keys for Assimp */
-    void ReadMetaDataItem(XmlNode &node, StringMetaData &metadata);
-
-    /** Reads the animation library */
+    /// Reads the animation library
     void ReadAnimationLibrary(XmlNode &node);
 
-    /** Reads the animation clip library */
+    /// Reads the animation clip library
     void ReadAnimationClipLibrary(XmlNode &node);
 
-    /** Unwrap controllers dependency hierarchy */
+    /// Unwrap controllers dependency hierarchy
     void PostProcessControllers();
 
-    /** Re-build animations from animation clip library, if present, otherwise combine single-channel animations */
+    /// Re-build animations from animation clip library, if present, otherwise combine single-channel animations
     void PostProcessRootAnimations();
 
-    /** Reads an animation into the given parent structure */
+    /// Reads an animation into the given parent structure
     void ReadAnimation(XmlNode &node, Collada::Animation *pParent);
 
-    /** Reads an animation sampler into the given anim channel */
-    void ReadAnimationSampler(XmlNode &node, Collada::AnimationChannel &pChannel);
-
-    /** Reads the skeleton controller library */
+    /// Reads the skeleton controller library
     void ReadControllerLibrary(XmlNode &node);
 
-    /** Reads a controller into the given mesh structure */
+    /// Reads a controller into the given mesh structure
     void ReadController(XmlNode &node, Collada::Controller &pController);
 
-    /** Reads the joint definitions for the given controller */
-    void ReadControllerJoints(XmlNode &node, Collada::Controller &pController);
+    /// Reads the image library contents
+    void ReadImageLibrary(const XmlNode &node);
 
-    /** Reads the joint weights for the given controller */
-    void ReadControllerWeights(XmlNode &node, Collada::Controller &pController);
+    /// Reads an image entry into the given image
+    void ReadImage(const XmlNode &node, Collada::Image &pImage) const;
 
-    /** Reads the image library contents */
-    void ReadImageLibrary(XmlNode &node);
-
-    /** Reads an image entry into the given image */
-    void ReadImage(XmlNode &node, Collada::Image &pImage);
-
-    /** Reads the material library */
+    /// Reads the material library
     void ReadMaterialLibrary(XmlNode &node);
 
-    /** Reads a material entry into the given material */
-    void ReadMaterial(XmlNode &node, Collada::Material &pMaterial);
-
-    /** Reads the camera library */
+    /// Reads the camera library
     void ReadCameraLibrary(XmlNode &node);
 
-    /** Reads a camera entry into the given camera */
-    void ReadCamera(XmlNode &node, Collada::Camera &pCamera);
-
-    /** Reads the light library */
+    /// Reads the light library
     void ReadLightLibrary(XmlNode &node);
 
-    /** Reads a light entry into the given light */
-    void ReadLight(XmlNode &node, Collada::Light &pLight);
-
-    /** Reads the effect library */
+    /// Reads the effect library
     void ReadEffectLibrary(XmlNode &node);
 
-    /** Reads an effect entry into the given effect*/
+    /// Reads an effect entry into the given effect
     void ReadEffect(XmlNode &node, Collada::Effect &pEffect);
 
-    /** Reads an COMMON effect profile */
+    /// Reads an COMMON effect profile
     void ReadEffectProfileCommon(XmlNode &node, Collada::Effect &pEffect);
 
-    /** Read sampler properties */
+    /// Read sampler properties
     void ReadSamplerProperties(XmlNode &node, Collada::Sampler &pSampler);
 
-    /** Reads an effect entry containing a color or a texture defining that color */
+    /// Reads an effect entry containing a color or a texture defining that color
     void ReadEffectColor(XmlNode &node, aiColor4D &pColor, Collada::Sampler &pSampler);
 
-    /** Reads an effect entry containing a float */
+    /// Reads an effect entry containing a float
     void ReadEffectFloat(XmlNode &node, ai_real &pFloat);
 
-    /** Reads an effect parameter specification of any kind */
+    /// Reads an effect parameter specification of any kind
     void ReadEffectParam(XmlNode &node, Collada::EffectParam &pParam);
 
-    /** Reads the geometry library contents */
+    /// Reads the geometry library contents
     void ReadGeometryLibrary(XmlNode &node);
 
-    /** Reads a geometry from the geometry library. */
+    /// Reads a geometry from the geometry library.
     void ReadGeometry(XmlNode &node, Collada::Mesh &pMesh);
 
-    /** Reads a mesh from the geometry library */
+    /// Reads a mesh from the geometry library
     void ReadMesh(XmlNode &node, Collada::Mesh &pMesh);
 
-    /** Reads a source element - a combination of raw data and an accessor defining
-         * things that should not be redefinable. Yes, that's another rant.
-         */
+    /// Reads a source element - a combination of raw data and an accessor defining
+    ///things that should not be definable. Yes, that's another rant.
     void ReadSource(XmlNode &node);
 
-    /** Reads a data array holding a number of elements, and stores it in the global library.
-         * Currently supported are array of floats and arrays of strings.
-         */
+    /// Reads a data array holding a number of elements, and stores it in the global library.
+    /// Currently supported are array of floats and arrays of strings.
     void ReadDataArray(XmlNode &node);
 
-    /** Reads an accessor and stores it in the global library under the given ID -
-         * accessors use the ID of the parent <source> element
-         */
+    /// Reads an accessor and stores it in the global library under the given ID -
+    /// accessors use the ID of the parent <source> element
     void ReadAccessor(XmlNode &node, const std::string &pID);
 
-    /** Reads input declarations of per-vertex mesh data into the given mesh */
+    /// Reads input declarations of per-vertex mesh data into the given mesh
     void ReadVertexData(XmlNode &node, Collada::Mesh &pMesh);
 
-    /** Reads input declarations of per-index mesh data into the given mesh */
+    /// Reads input declarations of per-index mesh data into the given mesh
     void ReadIndexData(XmlNode &node, Collada::Mesh &pMesh);
 
-    /** Reads a single input channel element and stores it in the given array, if valid */
+    /// Reads a single input channel element and stores it in the given array, if valid
     void ReadInputChannel(XmlNode &node, std::vector<Collada::InputChannel> &poChannels);
 
-    /** Reads a <p> primitive index list and assembles the mesh data into the given mesh */
+    /// Reads a <p> primitive index list and assembles the mesh data into the given mesh
     size_t ReadPrimitives(XmlNode &node, Collada::Mesh &pMesh, std::vector<Collada::InputChannel> &pPerIndexChannels,
             size_t pNumPrimitives, const std::vector<size_t> &pVCount, Collada::PrimitiveType pPrimType);
 
-    /** Copies the data for a single primitive into the mesh, based on the InputChannels */
+    /// Copies the data for a single primitive into the mesh, based on the InputChannels
     void CopyVertex(size_t currentVertex, size_t numOffsets, size_t numPoints, size_t perVertexOffset,
             Collada::Mesh &pMesh, std::vector<Collada::InputChannel> &pPerIndexChannels,
             size_t currentPrimitive, const std::vector<size_t> &indices);
 
-    /** Reads one triangle of a tristrip into the mesh */
+    /// Reads one triangle of a tristrip into the mesh
     void ReadPrimTriStrips(size_t numOffsets, size_t perVertexOffset, Collada::Mesh &pMesh,
             std::vector<Collada::InputChannel> &pPerIndexChannels, size_t currentPrimitive, const std::vector<size_t> &indices);
 
-    /** Extracts a single object from an input channel and stores it in the appropriate mesh data array */
+    /// Extracts a single object from an input channel and stores it in the appropriate mesh data array
     void ExtractDataObjectFromChannel(const Collada::InputChannel &pInput, size_t pLocalIndex, Collada::Mesh &pMesh);
 
-    /** Reads the library of node hierarchies and scene parts */
+    /// Reads the library of node hierarchies and scene parts
     void ReadSceneLibrary(XmlNode &node);
 
-    /** Reads a scene node's contents including children and stores it in the given node */
+    /// Reads a scene node's contents including children and stores it in the given node
     void ReadSceneNode(XmlNode &node, Collada::Node *pNode);
-
-    /** Reads a node transformation entry of the given type and adds it to the given node's transformation list. */
-    void ReadNodeTransformation(XmlNode &node, Collada::Node *pNode, Collada::TransformType pType);
-
-    /** Reads a mesh reference in a node and adds it to the node's mesh list */
+    
+    /// Reads a mesh reference in a node and adds it to the node's mesh list
     void ReadNodeGeometry(XmlNode &node, Collada::Node *pNode);
 
-    /** Reads the collada scene */
+    /// Reads the collada scene
     void ReadScene(XmlNode &node);
 
-    // Processes bind_vertex_input and bind elements
+    /// Processes bind_vertex_input and bind elements
     void ReadMaterialVertexInputBinding(XmlNode &node, Collada::SemanticMappingTable &tbl);
 
-    /** Reads embedded textures from a ZAE archive*/
+    /// Reads embedded textures from a ZAE archive
     void ReadEmbeddedTextures(ZipArchiveIOSystem &zip_archive);
 
 protected:
-    /** Calculates the resulting transformation from all the given transform steps */
+    /// Converts a path read from a collada file to the usual representation
+    static void UriDecodePath(aiString &ss);
+
+    /// Calculates the resulting transformation from all the given transform steps
     aiMatrix4x4 CalculateResultTransform(const std::vector<Collada::Transform> &pTransforms) const;
 
-    /** Determines the input data type for the given semantic string */
+    /// Determines the input data type for the given semantic string
     Collada::InputType GetTypeForSemantic(const std::string &pSemantic);
 
-    /** Finds the item in the given library by its reference, throws if not found */
+    /// Finds the item in the given library by its reference, throws if not found
     template <typename Type>
     const Type &ResolveLibraryReference(const std::map<std::string, Type> &pLibrary, const std::string &pURL) const;
 
-protected:
-    // Filename, for a verbose error message
+private:
+    /// Filename, for a verbose error message
     std::string mFileName;
 
-    // XML reader, member for everyday use
+    /// XML reader, member for everyday use
     XmlParser mXmlParser;
 
-    /** All data arrays found in the file by ID. Might be referred to by actually
-         everyone. Collada, you are a steaming pile of indirection. */
+    /// All data arrays found in the file by ID. Might be referred to by actually
+    ///     everyone. Collada, you are a steaming pile of indirection.
     using DataLibrary = std::map<std::string, Collada::Data> ;
     DataLibrary mDataLibrary;
 
-    /** Same for accessors which define how the data in a data array is accessed. */
+    /// Same for accessors which define how the data in a data array is accessed.
     using AccessorLibrary = std::map<std::string, Collada::Accessor> ;
     AccessorLibrary mAccessorLibrary;
 
-    /** Mesh library: mesh by ID */
+    /// Mesh library: mesh by ID
     using MeshLibrary = std::map<std::string, Collada::Mesh *>;
     MeshLibrary mMeshLibrary;
 
-    /** node library: root node of the hierarchy part by ID */
+    /// node library: root node of the hierarchy part by ID
     using NodeLibrary = std::map<std::string, Collada::Node *>;
     NodeLibrary mNodeLibrary;
 
-    /** Image library: stores texture properties by ID */
+    /// Image library: stores texture properties by ID
     using ImageLibrary = std::map<std::string, Collada::Image> ;
     ImageLibrary mImageLibrary;
 
-    /** Effect library: surface attributes by ID */
+    /// Effect library: surface attributes by ID
     using EffectLibrary = std::map<std::string, Collada::Effect> ;
     EffectLibrary mEffectLibrary;
 
-    /** Material library: surface material by ID */
+    /// Material library: surface material by ID
     using MaterialLibrary = std::map<std::string, Collada::Material> ;
     MaterialLibrary mMaterialLibrary;
 
-    /** Light library: surface light by ID */
+    /// Light library: surface light by ID
     using LightLibrary = std::map<std::string, Collada::Light> ;
     LightLibrary mLightLibrary;
 
-    /** Camera library: surface material by ID */
+    /// Camera library: surface material by ID
     using CameraLibrary = std::map<std::string, Collada::Camera> ;
     CameraLibrary mCameraLibrary;
 
-    /** Controller library: joint controllers by ID */
+    /// Controller library: joint controllers by ID
     using ControllerLibrary = std::map<std::string, Collada::Controller> ;
     ControllerLibrary mControllerLibrary;
 
-    /** Animation library: animation references by ID */
+    /// Animation library: animation references by ID
     using AnimationLibrary = std::map<std::string, Collada::Animation *> ;
     AnimationLibrary mAnimationLibrary;
 
-    /** Animation clip library: clip animation references by ID */
+    /// Animation clip library: clip animation references by ID
     using AnimationClipLibrary = std::vector<std::pair<std::string, std::vector<std::string>>> ;
     AnimationClipLibrary mAnimationClipLibrary;
 
-    /** Pointer to the root node. Don't delete, it just points to one of
-         the nodes in the node library. */
+    /// Pointer to the root node. Don't delete, it just points to one of the nodes in the node library.
     Collada::Node *mRootNode;
 
-    /** Root animation container */
+    /// Root animation container
     Collada::Animation mAnims;
 
-    /** Size unit: how large compared to a meter */
+    /// Size unit: how large compared to a meter
     ai_real mUnitSize;
 
-    /** Which is the up vector */
+    /// Which is the up vector
     enum { UP_X,
         UP_Y,
         UP_Z } mUpDirection;
 
-    /** Asset metadata (global for scene) */
+    /// Asset metadata (global for scene)
     StringMetaData mAssetMetaData;
 
-    /** Collada file format version */
+    /// Collada file format version
     Collada::FormatVersion mFormat;
 };
 
diff --git a/code/AssetLib/DXF/DXFHelper.h b/code/AssetLib/DXF/DXFHelper.h
index 4d7893cc4..1626ee922 100644
--- a/code/AssetLib/DXF/DXFHelper.h
+++ b/code/AssetLib/DXF/DXFHelper.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -62,10 +61,7 @@ namespace DXF {
 // do NOT skip empty lines. In DXF files, they count as valid data.
 class LineReader {
 public:
-    LineReader(StreamReaderLE& reader)
-    : splitter(reader,false,true)
-    , groupcode( 0 )
-    , end() {
+    LineReader(StreamReaderLE& reader) : splitter(reader,false,true), groupcode( 0 ), end() {
         // empty
     }
 
@@ -165,8 +161,7 @@ private:
 
 // represents a POLYLINE or a LWPOLYLINE. or even a 3DFACE The data is converted as needed.
 struct PolyLine {
-    PolyLine()
-    : flags() {
+    PolyLine() : flags() {
         // empty
     }
 
@@ -182,10 +177,7 @@ struct PolyLine {
 
 // reference to a BLOCK. Specifies its own coordinate system.
 struct InsertBlock {
-    InsertBlock()
-    : pos()
-    , scale(1.f,1.f,1.f)
-    , angle() {
+    InsertBlock() : pos(0.f, 0.f, 0.f), scale(1.f,1.f,1.f), angle(0.0f) {
         // empty
     }
 
@@ -198,8 +190,7 @@ struct InsertBlock {
 
 
 // keeps track of all geometry in a single BLOCK.
-struct Block
-{
+struct Block {
     std::vector< std::shared_ptr<PolyLine> > lines;
     std::vector<InsertBlock> insertions;
 
@@ -207,14 +198,12 @@ struct Block
     aiVector3D base;
 };
 
-
-struct FileData
-{
+struct FileData {
     // note: the LAST block always contains the stuff from ENTITIES.
     std::vector<Block> blocks;
 };
 
-}
-} // Namespace Assimp
+} // namespace DXF
+} // namespace Assimp
 
-#endif
+#endif // INCLUDED_DXFHELPER_H
diff --git a/code/AssetLib/DXF/DXFLoader.cpp b/code/AssetLib/DXF/DXFLoader.cpp
index f69cdfce2..213dce2b6 100644
--- a/code/AssetLib/DXF/DXFLoader.cpp
+++ b/code/AssetLib/DXF/DXFLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -43,11 +43,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the DXF importer class
  */
 
-
 #ifndef ASSIMP_BUILD_NO_DXF_IMPORTER
 
-#include "AssetLib/DXF/DXFLoader.h"
-#include "AssetLib/DXF/DXFHelper.h"
+#include "DXFLoader.h"
+#include "DXFHelper.h"
 #include "PostProcessing/ConvertToLHProcess.h"
 
 #include <assimp/ParsingUtils.h>
@@ -68,25 +67,267 @@ static constexpr size_t AI_DXF_BINARY_IDENT_LEN = sizeof AI_DXF_BINARY_IDENT;
 // default vertex color that all uncolored vertices will receive
 static const aiColor4D AI_DXF_DEFAULT_COLOR(aiColor4D(0.6f, 0.6f, 0.6f, 0.6f));
 
-// color indices for DXF - 16 are supported, the table is
-// taken directly from the DXF spec.
-static const aiColor4D g_aclrDxfIndexColors[] = {
-    aiColor4D(0.6f, 0.6f, 0.6f, 1.0f),
-    aiColor4D (1.0f, 0.0f, 0.0f, 1.0f), // red
-    aiColor4D (0.0f, 1.0f, 0.0f, 1.0f), // green
-    aiColor4D (0.0f, 0.0f, 1.0f, 1.0f), // blue
-    aiColor4D (0.3f, 1.0f, 0.3f, 1.0f), // light green
-    aiColor4D (0.3f, 0.3f, 1.0f, 1.0f), // light blue
-    aiColor4D (1.0f, 0.3f, 0.3f, 1.0f), // light red
-    aiColor4D (1.0f, 0.0f, 1.0f, 1.0f), // pink
-    aiColor4D (1.0f, 0.6f, 0.0f, 1.0f), // orange
-    aiColor4D (0.6f, 0.3f, 0.0f, 1.0f), // dark orange
-    aiColor4D (1.0f, 1.0f, 0.0f, 1.0f), // yellow
-    aiColor4D (0.3f, 0.3f, 0.3f, 1.0f), // dark gray
-    aiColor4D (0.8f, 0.8f, 0.8f, 1.0f), // light gray
-    aiColor4D (0.0f, 00.f, 0.0f, 1.0f), // black
-    aiColor4D (1.0f, 1.0f, 1.0f, 1.0f), // white
-    aiColor4D (0.6f, 0.0f, 1.0f, 1.0f)  // violet
+// color indices for DXF - 256 are supported, the table is
+// taken directly from the AutoCad Index (ACI) table
+// https://gohtx.com/acadcolors.php
+//STH 2024-0126
+static const aiColor4D g_aclrDxfIndexColors[256] = {
+    aiColor4D (0.0f, 0.0f ,0.0f, 1.0f), //dxf color code 0
+    aiColor4D (1.0f, 0.0f ,0.0f, 1.0f), //dxf color code 1
+    aiColor4D (1.0f, 1.0f ,0.0f, 1.0f), //dxf color code 2
+    aiColor4D (0.0f, 1.0f ,0.0f, 1.0f), //dxf color code 3
+    aiColor4D (0.0f, 1.0f ,1.0f, 1.0f), //dxf color code 4
+    aiColor4D (0.0f, 0.0f ,1.0f, 1.0f), //dxf color code 5
+    aiColor4D (1.0f, 0.0f ,1.0f, 1.0f), //dxf color code 6
+    aiColor4D (1.0f, 1.0f ,1.0f, 1.0f), //dxf color code 7
+    aiColor4D (0.3f, 0.3f ,0.3f, 1.0f), //dxf color code 8
+    aiColor4D (0.5f, 0.5f ,0.5f, 1.0f), //dxf color code 9
+    aiColor4D (1.0f, 0.0f ,0.0f, 1.0f), //dxf color code 10
+    aiColor4D (1.0f, 0.7f ,0.7f, 1.0f), //dxf color code 11
+    aiColor4D (0.7f, 0.0f ,0.0f, 1.0f), //dxf color code 12
+    aiColor4D (0.7f, 0.5f ,0.5f, 1.0f), //dxf color code 13
+    aiColor4D (0.5f, 0.0f ,0.0f, 1.0f), //dxf color code 14
+    aiColor4D (0.5f, 0.3f ,0.3f, 1.0f), //dxf color code 15
+    aiColor4D (0.4f, 0.0f ,0.0f, 1.0f), //dxf color code 16
+    aiColor4D (0.4f, 0.3f ,0.3f, 1.0f), //dxf color code 17
+    aiColor4D (0.3f, 0.0f ,0.0f, 1.0f), //dxf color code 18
+    aiColor4D (0.3f, 0.2f ,0.2f, 1.0f), //dxf color code 19
+    aiColor4D (1.0f, 0.2f ,0.0f, 1.0f), //dxf color code 20
+    aiColor4D (1.0f, 0.7f ,0.7f, 1.0f), //dxf color code 21
+    aiColor4D (0.7f, 0.2f ,0.0f, 1.0f), //dxf color code 22
+    aiColor4D (0.7f, 0.6f ,0.5f, 1.0f), //dxf color code 23
+    aiColor4D (0.5f, 0.1f ,0.0f, 1.0f), //dxf color code 24
+    aiColor4D (0.5f, 0.4f ,0.3f, 1.0f), //dxf color code 25
+    aiColor4D (0.4f, 0.1f ,0.0f, 1.0f), //dxf color code 26
+    aiColor4D (0.4f, 0.3f ,0.3f, 1.0f), //dxf color code 27
+    aiColor4D (0.3f, 0.1f ,0.0f, 1.0f), //dxf color code 28
+    aiColor4D (0.3f, 0.2f ,0.2f, 1.0f), //dxf color code 29
+    aiColor4D (1.0f, 0.5f ,0.0f, 1.0f), //dxf color code 30
+    aiColor4D (1.0f, 0.8f ,0.7f, 1.0f), //dxf color code 31
+    aiColor4D (0.7f, 0.4f ,0.0f, 1.0f), //dxf color code 32
+    aiColor4D (0.7f, 0.6f ,0.5f, 1.0f), //dxf color code 33
+    aiColor4D (0.5f, 0.3f ,0.0f, 1.0f), //dxf color code 34
+    aiColor4D (0.5f, 0.4f ,0.3f, 1.0f), //dxf color code 35
+    aiColor4D (0.4f, 0.2f ,0.0f, 1.0f), //dxf color code 36
+    aiColor4D (0.4f, 0.3f ,0.3f, 1.0f), //dxf color code 37
+    aiColor4D (0.3f, 0.2f ,0.0f, 1.0f), //dxf color code 38
+    aiColor4D (0.3f, 0.3f ,0.2f, 1.0f), //dxf color code 39
+    aiColor4D (1.0f, 0.7f ,0.0f, 1.0f), //dxf color code 40
+    aiColor4D (1.0f, 0.9f ,0.7f, 1.0f), //dxf color code 41
+    aiColor4D (0.7f, 0.6f ,0.0f, 1.0f), //dxf color code 42
+    aiColor4D (0.7f, 0.7f ,0.5f, 1.0f), //dxf color code 43
+    aiColor4D (0.5f, 0.4f ,0.0f, 1.0f), //dxf color code 44
+    aiColor4D (0.5f, 0.5f ,0.3f, 1.0f), //dxf color code 45
+    aiColor4D (0.4f, 0.3f ,0.0f, 1.0f), //dxf color code 46
+    aiColor4D (0.4f, 0.4f ,0.3f, 1.0f), //dxf color code 47
+    aiColor4D (0.3f, 0.2f ,0.0f, 1.0f), //dxf color code 48
+    aiColor4D (0.3f, 0.3f ,0.2f, 1.0f), //dxf color code 49
+    aiColor4D (1.0f, 1.0f ,0.0f, 1.0f), //dxf color code 50
+    aiColor4D (1.0f, 1.0f ,0.7f, 1.0f), //dxf color code 51
+    aiColor4D (0.7f, 0.7f ,0.0f, 1.0f), //dxf color code 52
+    aiColor4D (0.7f, 0.7f ,0.5f, 1.0f), //dxf color code 53
+    aiColor4D (0.5f, 0.5f ,0.0f, 1.0f), //dxf color code 54
+    aiColor4D (0.5f, 0.5f ,0.3f, 1.0f), //dxf color code 55
+    aiColor4D (0.4f, 0.4f ,0.0f, 1.0f), //dxf color code 56
+    aiColor4D (0.4f, 0.4f ,0.3f, 1.0f), //dxf color code 57
+    aiColor4D (0.3f, 0.3f ,0.0f, 1.0f), //dxf color code 58
+    aiColor4D (0.3f, 0.3f ,0.2f, 1.0f), //dxf color code 59
+    aiColor4D (0.7f, 1.0f ,0.0f, 1.0f), //dxf color code 60
+    aiColor4D (0.9f, 1.0f ,0.7f, 1.0f), //dxf color code 61
+    aiColor4D (0.6f, 0.7f ,0.0f, 1.0f), //dxf color code 62
+    aiColor4D (0.7f, 0.7f ,0.5f, 1.0f), //dxf color code 63
+    aiColor4D (0.4f, 0.5f ,0.0f, 1.0f), //dxf color code 64
+    aiColor4D (0.5f, 0.5f ,0.3f, 1.0f), //dxf color code 65
+    aiColor4D (0.3f, 0.4f ,0.0f, 1.0f), //dxf color code 66
+    aiColor4D (0.4f, 0.4f ,0.3f, 1.0f), //dxf color code 67
+    aiColor4D (0.2f, 0.3f ,0.0f, 1.0f), //dxf color code 68
+    aiColor4D (0.3f, 0.3f ,0.2f, 1.0f), //dxf color code 69
+    aiColor4D (0.5f, 1.0f ,0.0f, 1.0f), //dxf color code 70
+    aiColor4D (0.8f, 1.0f ,0.7f, 1.0f), //dxf color code 71
+    aiColor4D (0.4f, 0.7f ,0.0f, 1.0f), //dxf color code 72
+    aiColor4D (0.6f, 0.7f ,0.5f, 1.0f), //dxf color code 73
+    aiColor4D (0.3f, 0.5f ,0.0f, 1.0f), //dxf color code 74
+    aiColor4D (0.4f, 0.5f ,0.3f, 1.0f), //dxf color code 75
+    aiColor4D (0.2f, 0.4f ,0.0f, 1.0f), //dxf color code 76
+    aiColor4D (0.3f, 0.4f ,0.3f, 1.0f), //dxf color code 77
+    aiColor4D (0.2f, 0.3f ,0.0f, 1.0f), //dxf color code 78
+    aiColor4D (0.3f, 0.3f ,0.2f, 1.0f), //dxf color code 79
+    aiColor4D (0.2f, 1.0f ,0.0f, 1.0f), //dxf color code 80
+    aiColor4D (0.7f, 1.0f ,0.7f, 1.0f), //dxf color code 81
+    aiColor4D (0.2f, 0.7f ,0.0f, 1.0f), //dxf color code 82
+    aiColor4D (0.6f, 0.7f ,0.5f, 1.0f), //dxf color code 83
+    aiColor4D (0.1f, 0.5f ,0.0f, 1.0f), //dxf color code 84
+    aiColor4D (0.4f, 0.5f ,0.3f, 1.0f), //dxf color code 85
+    aiColor4D (0.1f, 0.4f ,0.0f, 1.0f), //dxf color code 86
+    aiColor4D (0.3f, 0.4f ,0.3f, 1.0f), //dxf color code 87
+    aiColor4D (0.1f, 0.3f ,0.0f, 1.0f), //dxf color code 88
+    aiColor4D (0.2f, 0.3f ,0.2f, 1.0f), //dxf color code 89
+    aiColor4D (0.0f, 1.0f ,0.0f, 1.0f), //dxf color code 90
+    aiColor4D (0.7f, 1.0f ,0.7f, 1.0f), //dxf color code 91
+    aiColor4D (0.0f, 0.7f ,0.0f, 1.0f), //dxf color code 92
+    aiColor4D (0.5f, 0.7f ,0.5f, 1.0f), //dxf color code 93
+    aiColor4D (0.0f, 0.5f ,0.0f, 1.0f), //dxf color code 94
+    aiColor4D (0.3f, 0.5f ,0.3f, 1.0f), //dxf color code 95
+    aiColor4D (0.0f, 0.4f ,0.0f, 1.0f), //dxf color code 96
+    aiColor4D (0.3f, 0.4f ,0.3f, 1.0f), //dxf color code 97
+    aiColor4D (0.0f, 0.3f ,0.0f, 1.0f), //dxf color code 98
+    aiColor4D (0.2f, 0.3f ,0.2f, 1.0f), //dxf color code 99
+    aiColor4D (0.0f, 1.0f ,0.2f, 1.0f), //dxf color code 100
+    aiColor4D (0.7f, 1.0f ,0.7f, 1.0f), //dxf color code 101
+    aiColor4D (0.0f, 0.7f ,0.2f, 1.0f), //dxf color code 102
+    aiColor4D (0.5f, 0.7f ,0.6f, 1.0f), //dxf color code 103
+    aiColor4D (0.0f, 0.5f ,0.1f, 1.0f), //dxf color code 104
+    aiColor4D (0.3f, 0.5f ,0.4f, 1.0f), //dxf color code 105
+    aiColor4D (0.0f, 0.4f ,0.1f, 1.0f), //dxf color code 106
+    aiColor4D (0.3f, 0.4f ,0.3f, 1.0f), //dxf color code 107
+    aiColor4D (0.0f, 0.3f ,0.1f, 1.0f), //dxf color code 108
+    aiColor4D (0.2f, 0.3f ,0.2f, 1.0f), //dxf color code 109
+    aiColor4D (0.0f, 1.0f ,0.5f, 1.0f), //dxf color code 110
+    aiColor4D (0.7f, 1.0f ,0.8f, 1.0f), //dxf color code 111
+    aiColor4D (0.0f, 0.7f ,0.4f, 1.0f), //dxf color code 112
+    aiColor4D (0.5f, 0.7f ,0.6f, 1.0f), //dxf color code 113
+    aiColor4D (0.0f, 0.5f ,0.3f, 1.0f), //dxf color code 114
+    aiColor4D (0.3f, 0.5f ,0.4f, 1.0f), //dxf color code 115
+    aiColor4D (0.0f, 0.4f ,0.2f, 1.0f), //dxf color code 116
+    aiColor4D (0.3f, 0.4f ,0.3f, 1.0f), //dxf color code 117
+    aiColor4D (0.0f, 0.3f ,0.2f, 1.0f), //dxf color code 118
+    aiColor4D (0.2f, 0.3f ,0.3f, 1.0f), //dxf color code 119
+    aiColor4D (0.0f, 1.0f ,0.7f, 1.0f), //dxf color code 120
+    aiColor4D (0.7f, 1.0f ,0.9f, 1.0f), //dxf color code 121
+    aiColor4D (0.0f, 0.7f ,0.6f, 1.0f), //dxf color code 122
+    aiColor4D (0.5f, 0.7f ,0.7f, 1.0f), //dxf color code 123
+    aiColor4D (0.0f, 0.5f ,0.4f, 1.0f), //dxf color code 124
+    aiColor4D (0.3f, 0.5f ,0.5f, 1.0f), //dxf color code 125
+    aiColor4D (0.0f, 0.4f ,0.3f, 1.0f), //dxf color code 126
+    aiColor4D (0.3f, 0.4f ,0.4f, 1.0f), //dxf color code 127
+    aiColor4D (0.0f, 0.3f ,0.2f, 1.0f), //dxf color code 128
+    aiColor4D (0.2f, 0.3f ,0.3f, 1.0f), //dxf color code 129
+    aiColor4D (0.0f, 1.0f ,1.0f, 1.0f), //dxf color code 130
+    aiColor4D (0.7f, 1.0f ,1.0f, 1.0f), //dxf color code 131
+    aiColor4D (0.0f, 0.7f ,0.7f, 1.0f), //dxf color code 132
+    aiColor4D (0.5f, 0.7f ,0.7f, 1.0f), //dxf color code 133
+    aiColor4D (0.0f, 0.5f ,0.5f, 1.0f), //dxf color code 134
+    aiColor4D (0.3f, 0.5f ,0.5f, 1.0f), //dxf color code 135
+    aiColor4D (0.0f, 0.4f ,0.4f, 1.0f), //dxf color code 136
+    aiColor4D (0.3f, 0.4f ,0.4f, 1.0f), //dxf color code 137
+    aiColor4D (0.0f, 0.3f ,0.3f, 1.0f), //dxf color code 138
+    aiColor4D (0.2f, 0.3f ,0.3f, 1.0f), //dxf color code 139
+    aiColor4D (0.0f, 0.7f ,1.0f, 1.0f), //dxf color code 140
+    aiColor4D (0.7f, 0.9f ,1.0f, 1.0f), //dxf color code 141
+    aiColor4D (0.0f, 0.6f ,0.7f, 1.0f), //dxf color code 142
+    aiColor4D (0.5f, 0.7f ,0.7f, 1.0f), //dxf color code 143
+    aiColor4D (0.0f, 0.4f ,0.5f, 1.0f), //dxf color code 144
+    aiColor4D (0.3f, 0.5f ,0.5f, 1.0f), //dxf color code 145
+    aiColor4D (0.0f, 0.3f ,0.4f, 1.0f), //dxf color code 146
+    aiColor4D (0.3f, 0.4f ,0.4f, 1.0f), //dxf color code 147
+    aiColor4D (0.0f, 0.2f ,0.3f, 1.0f), //dxf color code 148
+    aiColor4D (0.2f, 0.3f ,0.3f, 1.0f), //dxf color code 149
+    aiColor4D (0.0f, 0.5f ,1.0f, 1.0f), //dxf color code 150
+    aiColor4D (0.7f, 0.8f ,1.0f, 1.0f), //dxf color code 151
+    aiColor4D (0.0f, 0.4f ,0.7f, 1.0f), //dxf color code 152
+    aiColor4D (0.5f, 0.6f ,0.7f, 1.0f), //dxf color code 153
+    aiColor4D (0.0f, 0.3f ,0.5f, 1.0f), //dxf color code 154
+    aiColor4D (0.3f, 0.4f ,0.5f, 1.0f), //dxf color code 155
+    aiColor4D (0.0f, 0.2f ,0.4f, 1.0f), //dxf color code 156
+    aiColor4D (0.3f, 0.3f ,0.4f, 1.0f), //dxf color code 157
+    aiColor4D (0.0f, 0.2f ,0.3f, 1.0f), //dxf color code 158
+    aiColor4D (0.2f, 0.3f ,0.3f, 1.0f), //dxf color code 159
+    aiColor4D (0.0f, 0.2f ,1.0f, 1.0f), //dxf color code 160
+    aiColor4D (0.7f, 0.7f ,1.0f, 1.0f), //dxf color code 161
+    aiColor4D (0.0f, 0.2f ,0.7f, 1.0f), //dxf color code 162
+    aiColor4D (0.5f, 0.6f ,0.7f, 1.0f), //dxf color code 163
+    aiColor4D (0.0f, 0.1f ,0.5f, 1.0f), //dxf color code 164
+    aiColor4D (0.3f, 0.4f ,0.5f, 1.0f), //dxf color code 165
+    aiColor4D (0.0f, 0.1f ,0.4f, 1.0f), //dxf color code 166
+    aiColor4D (0.3f, 0.3f ,0.4f, 1.0f), //dxf color code 167
+    aiColor4D (0.0f, 0.1f ,0.3f, 1.0f), //dxf color code 168
+    aiColor4D (0.2f, 0.2f ,0.3f, 1.0f), //dxf color code 169
+    aiColor4D (0.0f, 0.0f ,1.0f, 1.0f), //dxf color code 170
+    aiColor4D (0.7f, 0.7f ,1.0f, 1.0f), //dxf color code 171
+    aiColor4D (0.0f, 0.0f ,0.7f, 1.0f), //dxf color code 172
+    aiColor4D (0.5f, 0.5f ,0.7f, 1.0f), //dxf color code 173
+    aiColor4D (0.0f, 0.0f ,0.5f, 1.0f), //dxf color code 174
+    aiColor4D (0.3f, 0.3f ,0.5f, 1.0f), //dxf color code 175
+    aiColor4D (0.0f, 0.0f ,0.4f, 1.0f), //dxf color code 176
+    aiColor4D (0.3f, 0.3f ,0.4f, 1.0f), //dxf color code 177
+    aiColor4D (0.0f, 0.0f ,0.3f, 1.0f), //dxf color code 178
+    aiColor4D (0.2f, 0.2f ,0.3f, 1.0f), //dxf color code 179
+    aiColor4D (0.2f, 0.0f ,1.0f, 1.0f), //dxf color code 180
+    aiColor4D (0.7f, 0.7f ,1.0f, 1.0f), //dxf color code 181
+    aiColor4D (0.2f, 0.0f ,0.7f, 1.0f), //dxf color code 182
+    aiColor4D (0.6f, 0.5f ,0.7f, 1.0f), //dxf color code 183
+    aiColor4D (0.1f, 0.0f ,0.5f, 1.0f), //dxf color code 184
+    aiColor4D (0.4f, 0.3f ,0.5f, 1.0f), //dxf color code 185
+    aiColor4D (0.1f, 0.0f ,0.4f, 1.0f), //dxf color code 186
+    aiColor4D (0.3f, 0.3f ,0.4f, 1.0f), //dxf color code 187
+    aiColor4D (0.1f, 0.0f ,0.3f, 1.0f), //dxf color code 188
+    aiColor4D (0.2f, 0.2f ,0.3f, 1.0f), //dxf color code 189
+    aiColor4D (0.5f, 0.0f ,1.0f, 1.0f), //dxf color code 190
+    aiColor4D (0.8f, 0.7f ,1.0f, 1.0f), //dxf color code 191
+    aiColor4D (0.4f, 0.0f ,0.7f, 1.0f), //dxf color code 192
+    aiColor4D (0.6f, 0.5f ,0.7f, 1.0f), //dxf color code 193
+    aiColor4D (0.3f, 0.0f ,0.5f, 1.0f), //dxf color code 194
+    aiColor4D (0.4f, 0.3f ,0.5f, 1.0f), //dxf color code 195
+    aiColor4D (0.2f, 0.0f ,0.4f, 1.0f), //dxf color code 196
+    aiColor4D (0.3f, 0.3f ,0.4f, 1.0f), //dxf color code 197
+    aiColor4D (0.2f, 0.0f ,0.3f, 1.0f), //dxf color code 198
+    aiColor4D (0.3f, 0.2f ,0.3f, 1.0f), //dxf color code 199
+    aiColor4D (0.7f, 0.0f ,1.0f, 1.0f), //dxf color code 200
+    aiColor4D (0.9f, 0.7f ,1.0f, 1.0f), //dxf color code 201
+    aiColor4D (0.6f, 0.0f ,0.7f, 1.0f), //dxf color code 202
+    aiColor4D (0.7f, 0.5f ,0.7f, 1.0f), //dxf color code 203
+    aiColor4D (0.4f, 0.0f ,0.5f, 1.0f), //dxf color code 204
+    aiColor4D (0.5f, 0.3f ,0.5f, 1.0f), //dxf color code 205
+    aiColor4D (0.3f, 0.0f ,0.4f, 1.0f), //dxf color code 206
+    aiColor4D (0.4f, 0.3f ,0.4f, 1.0f), //dxf color code 207
+    aiColor4D (0.2f, 0.0f ,0.3f, 1.0f), //dxf color code 208
+    aiColor4D (0.3f, 0.2f ,0.3f, 1.0f), //dxf color code 209
+    aiColor4D (1.0f, 0.0f ,1.0f, 1.0f), //dxf color code 210
+    aiColor4D (1.0f, 0.7f ,1.0f, 1.0f), //dxf color code 211
+    aiColor4D (0.7f, 0.0f ,0.7f, 1.0f), //dxf color code 212
+    aiColor4D (0.7f, 0.5f ,0.7f, 1.0f), //dxf color code 213
+    aiColor4D (0.5f, 0.0f ,0.5f, 1.0f), //dxf color code 214
+    aiColor4D (0.5f, 0.3f ,0.5f, 1.0f), //dxf color code 215
+    aiColor4D (0.4f, 0.0f ,0.4f, 1.0f), //dxf color code 216
+    aiColor4D (0.4f, 0.3f ,0.4f, 1.0f), //dxf color code 217
+    aiColor4D (0.3f, 0.0f ,0.3f, 1.0f), //dxf color code 218
+    aiColor4D (0.3f, 0.2f ,0.3f, 1.0f), //dxf color code 219
+    aiColor4D (1.0f, 0.0f ,0.7f, 1.0f), //dxf color code 220
+    aiColor4D (1.0f, 0.7f ,0.9f, 1.0f), //dxf color code 221
+    aiColor4D (0.7f, 0.0f ,0.6f, 1.0f), //dxf color code 222
+    aiColor4D (0.7f, 0.5f ,0.7f, 1.0f), //dxf color code 223
+    aiColor4D (0.5f, 0.0f ,0.4f, 1.0f), //dxf color code 224
+    aiColor4D (0.5f, 0.3f ,0.5f, 1.0f), //dxf color code 225
+    aiColor4D (0.4f, 0.0f ,0.3f, 1.0f), //dxf color code 226
+    aiColor4D (0.4f, 0.3f ,0.4f, 1.0f), //dxf color code 227
+    aiColor4D (0.3f, 0.0f ,0.2f, 1.0f), //dxf color code 228
+    aiColor4D (0.3f, 0.2f ,0.3f, 1.0f), //dxf color code 229
+    aiColor4D (1.0f, 0.0f ,0.5f, 1.0f), //dxf color code 230
+    aiColor4D (1.0f, 0.7f ,0.8f, 1.0f), //dxf color code 231
+    aiColor4D (0.7f, 0.0f ,0.4f, 1.0f), //dxf color code 232
+    aiColor4D (0.7f, 0.5f ,0.6f, 1.0f), //dxf color code 233
+    aiColor4D (0.5f, 0.0f ,0.3f, 1.0f), //dxf color code 234
+    aiColor4D (0.5f, 0.3f ,0.4f, 1.0f), //dxf color code 235
+    aiColor4D (0.4f, 0.0f ,0.2f, 1.0f), //dxf color code 236
+    aiColor4D (0.4f, 0.3f ,0.3f, 1.0f), //dxf color code 237
+    aiColor4D (0.3f, 0.0f ,0.2f, 1.0f), //dxf color code 238
+    aiColor4D (0.3f, 0.2f ,0.3f, 1.0f), //dxf color code 239
+    aiColor4D (1.0f, 0.0f ,0.2f, 1.0f), //dxf color code 240
+    aiColor4D (1.0f, 0.7f ,0.7f, 1.0f), //dxf color code 241
+    aiColor4D (0.7f, 0.0f ,0.2f, 1.0f), //dxf color code 242
+    aiColor4D (0.7f, 0.5f ,0.6f, 1.0f), //dxf color code 243
+    aiColor4D (0.5f, 0.0f ,0.1f, 1.0f), //dxf color code 244
+    aiColor4D (0.5f, 0.3f ,0.4f, 1.0f), //dxf color code 245
+    aiColor4D (0.4f, 0.0f ,0.1f, 1.0f), //dxf color code 246
+    aiColor4D (0.4f, 0.3f ,0.3f, 1.0f), //dxf color code 247
+    aiColor4D (0.3f, 0.0f ,0.1f, 1.0f), //dxf color code 248
+    aiColor4D (0.3f, 0.2f ,0.2f, 1.0f), //dxf color code 249
+    aiColor4D (0.2f, 0.2f ,0.2f, 1.0f), //dxf color code 250
+    aiColor4D (0.3f, 0.3f ,0.3f, 1.0f), //dxf color code 251
+    aiColor4D (0.4f, 0.4f ,0.4f, 1.0f), //dxf color code 252
+    aiColor4D (0.5f, 0.5f ,0.5f, 1.0f), //dxf color code 253
+    aiColor4D (0.7f, 0.7f ,0.7f, 1.0f), //dxf color code 254
+    aiColor4D (1.0f, 1.0f ,1.0f, 1.0f) //dxf color code 255
 };
 
 #define AI_DXF_NUM_INDEX_COLORS (sizeof(g_aclrDxfIndexColors)/sizeof(g_aclrDxfIndexColors[0]))
@@ -372,8 +613,12 @@ void DXFImporter::ExpandBlockReferences(DXF::Block& bl,const DXF::BlockMap& bloc
                 // XXX order
                 aiMatrix4x4 trafo, tmp;
                 aiMatrix4x4::Translation(-bl_src.base,trafo);
-                trafo *= aiMatrix4x4::Scaling(insert.scale,tmp);
+                //Need to translate position before scaling the insert
+                //otherwise the position ends up being the position*scaling
+                //STH 2024.01.17
                 trafo *= aiMatrix4x4::Translation(insert.pos,tmp);
+                trafo *= aiMatrix4x4::Scaling(insert.scale,tmp);
+                //trafo *= aiMatrix4x4::Translation(insert.pos,tmp);
 
                 // XXX rotation currently ignored - I didn't find an appropriate sample model.
                 if (insert.angle != 0.f) {
diff --git a/code/AssetLib/DXF/DXFLoader.h b/code/AssetLib/DXF/DXFLoader.h
index 89a0b79c2..8cc798fbc 100644
--- a/code/AssetLib/DXF/DXFLoader.h
+++ b/code/AssetLib/DXF/DXFLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/BaseImporter.h>
 #include <map>
 
-namespace Assimp    {
+namespace Assimp {
 
 // Forward declarations
 namespace DXF {
diff --git a/code/AssetLib/FBX/FBXAnimation.cpp b/code/AssetLib/FBX/FBXAnimation.cpp
index af92ebe51..4c13d2bd6 100644
--- a/code/AssetLib/FBX/FBXAnimation.cpp
+++ b/code/AssetLib/FBX/FBXAnimation.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -143,31 +143,33 @@ AnimationCurveNode::AnimationCurveNode(uint64_t id, const Element &element, cons
 
 // ------------------------------------------------------------------------------------------------
 const AnimationCurveMap &AnimationCurveNode::Curves() const {
-    if (curves.empty()) {
-        // resolve attached animation curves
-        const std::vector<const Connection *> &conns = doc.GetConnectionsByDestinationSequenced(ID(), "AnimationCurve");
+    if (!curves.empty()) {
+        return curves;
+    }
 
-        for (const Connection *con : conns) {
+    // resolve attached animation curves
+    const std::vector<const Connection *> &conns = doc.GetConnectionsByDestinationSequenced(ID(), "AnimationCurve");
 
-            // link should go for a property
-            if (!con->PropertyName().length()) {
-                continue;
-            }
+    for (const Connection *con : conns) {
 
-            const Object *const ob = con->SourceObject();
-            if (nullptr == ob) {
-                DOMWarning("failed to read source object for AnimationCurve->AnimationCurveNode link, ignoring", &element);
-                continue;
-            }
-
-            const AnimationCurve *const anim = dynamic_cast<const AnimationCurve *>(ob);
-            if (nullptr == anim) {
-                DOMWarning("source object for ->AnimationCurveNode link is not an AnimationCurve", &element);
-                continue;
-            }
-
-            curves[con->PropertyName()] = anim;
+        // link should go for a property
+        if (!con->PropertyName().length()) {
+            continue;
         }
+
+        const Object *const ob = con->SourceObject();
+        if (nullptr == ob) {
+            DOMWarning("failed to read source object for AnimationCurve->AnimationCurveNode link, ignoring", &element);
+            continue;
+        }
+
+        const AnimationCurve *const anim = dynamic_cast<const AnimationCurve *>(ob);
+        if (nullptr == anim) {
+            DOMWarning("source object for ->AnimationCurveNode link is not an AnimationCurve", &element);
+            continue;
+        }
+
+        curves[con->PropertyName()] = anim;
     }
 
     return curves;
diff --git a/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
index 55424a6a8..3f56006d2 100644
--- a/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+++ b/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -60,58 +59,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace Assimp {
 namespace FBX {
 
-//enum Flag
-//{
-//   e_unknown_0 = 1 << 0,
-//   e_unknown_1 = 1 << 1,
-//   e_unknown_2 = 1 << 2,
-//   e_unknown_3 = 1 << 3,
-//   e_unknown_4 = 1 << 4,
-//   e_unknown_5 = 1 << 5,
-//   e_unknown_6 = 1 << 6,
-//   e_unknown_7 = 1 << 7,
-//   e_unknown_8 = 1 << 8,
-//   e_unknown_9 = 1 << 9,
-//   e_unknown_10 = 1 << 10,
-//   e_unknown_11 = 1 << 11,
-//   e_unknown_12 = 1 << 12,
-//   e_unknown_13 = 1 << 13,
-//   e_unknown_14 = 1 << 14,
-//   e_unknown_15 = 1 << 15,
-//   e_unknown_16 = 1 << 16,
-//   e_unknown_17 = 1 << 17,
-//   e_unknown_18 = 1 << 18,
-//   e_unknown_19 = 1 << 19,
-//   e_unknown_20 = 1 << 20,
-//   e_unknown_21 = 1 << 21,
-//   e_unknown_22 = 1 << 22,
-//   e_unknown_23 = 1 << 23,
-//   e_flag_field_size_64_bit = 1 << 24, // Not sure what is
-//   e_unknown_25 = 1 << 25,
-//   e_unknown_26 = 1 << 26,
-//   e_unknown_27 = 1 << 27,
-//   e_unknown_28 = 1 << 28,
-//   e_unknown_29 = 1 << 29,
-//   e_unknown_30 = 1 << 30,
-//   e_unknown_31 = 1 << 31
-//};
-//
-//bool check_flag(uint32_t flags, Flag to_check)
-//{
-//	return (flags & to_check) != 0;
-//}
 // ------------------------------------------------------------------------------------------------
-Token::Token(const char* sbegin, const char* send, TokenType type, size_t offset)
-    :
-    #ifdef DEBUG
-    contents(sbegin, static_cast<size_t>(send-sbegin)),
-    #endif
-    sbegin(sbegin)
-    , send(send)
-    , type(type)
-    , line(offset)
-    , column(BINARY_MARKER)
-{
+Token::Token(const char* sbegin, const char* send, TokenType type, size_t offset) :
+        #ifdef DEBUG
+        contents(sbegin, static_cast<size_t>(send-sbegin)),
+        #endif
+        sbegin(sbegin),
+        send(send),
+        type(type),
+        line(offset),
+        column(BINARY_MARKER) {
     ai_assert(sbegin);
     ai_assert(send);
 
diff --git a/code/AssetLib/FBX/FBXCommon.h b/code/AssetLib/FBX/FBXCommon.h
index c3d715892..5a53a7e95 100644
--- a/code/AssetLib/FBX/FBXCommon.h
+++ b/code/AssetLib/FBX/FBXCommon.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -51,7 +51,8 @@ namespace Assimp {
 namespace FBX {
 
 static constexpr size_t NumNullRecords = 25;
-const char NULL_RECORD[NumNullRecords] = { // 25 null bytes in 64-bit and 13 null bytes in 32-bit
+
+constexpr char NULL_RECORD[NumNullRecords] = { // 25 null bytes in 64-bit and 13 null bytes in 32-bit
     '\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'
 }; // who knows why, it looks like two integers 32/64 bit (compressed and uncompressed sizes?) + 1 byte (might be compression type?)
diff --git a/code/AssetLib/FBX/FBXCompileConfig.h b/code/AssetLib/FBX/FBXCompileConfig.h
index 927a3c5f6..8ff1e06e2 100644
--- a/code/AssetLib/FBX/FBXCompileConfig.h
+++ b/code/AssetLib/FBX/FBXCompileConfig.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/FBX/FBXConverter.cpp b/code/AssetLib/FBX/FBXConverter.cpp
index 62ada774f..7ddc231b7 100644
--- a/code/AssetLib/FBX/FBXConverter.cpp
+++ b/code/AssetLib/FBX/FBXConverter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -76,6 +76,53 @@ using namespace Util;
 
 #define CONVERT_FBX_TIME(time) static_cast<double>(time) / 46186158000LL
 
+static void correctRootTransform(const aiScene *scene) {
+    if (scene == nullptr) {
+        return;
+    }
+
+    if (scene->mMetaData == nullptr) {
+        return;
+    }
+
+    int32_t UpAxis = 1, UpAxisSign = 1, FrontAxis = 2, FrontAxisSign = 1, CoordAxis = 0, CoordAxisSign = 1;
+    double UnitScaleFactor = 1.0;
+    for (unsigned MetadataIndex = 0; MetadataIndex < scene->mMetaData->mNumProperties; ++MetadataIndex) {
+        if (strcmp(scene->mMetaData->mKeys[MetadataIndex].C_Str(), "UpAxis") == 0) {
+            scene->mMetaData->Get<int32_t>(MetadataIndex, UpAxis);
+        }
+        if (strcmp(scene->mMetaData->mKeys[MetadataIndex].C_Str(), "UpAxisSign") == 0) {
+            scene->mMetaData->Get<int32_t>(MetadataIndex, UpAxisSign);
+        }
+        if (strcmp(scene->mMetaData->mKeys[MetadataIndex].C_Str(), "FrontAxis") == 0) {
+            scene->mMetaData->Get<int32_t>(MetadataIndex, FrontAxis);
+        }
+        if (strcmp(scene->mMetaData->mKeys[MetadataIndex].C_Str(), "FrontAxisSign") == 0) {
+            scene->mMetaData->Get<int32_t>(MetadataIndex, FrontAxisSign);
+        }
+        if (strcmp(scene->mMetaData->mKeys[MetadataIndex].C_Str(), "CoordAxis") == 0) {
+            scene->mMetaData->Get<int32_t>(MetadataIndex, CoordAxis);
+        }
+        if (strcmp(scene->mMetaData->mKeys[MetadataIndex].C_Str(), "CoordAxisSign") == 0) {
+            scene->mMetaData->Get<int32_t>(MetadataIndex, CoordAxisSign);
+        }
+        if (strcmp(scene->mMetaData->mKeys[MetadataIndex].C_Str(), "UnitScaleFactor") == 0) {
+            scene->mMetaData->Get<double>(MetadataIndex, UnitScaleFactor);
+        }
+    }
+
+    aiVector3D upVec, forwardVec, rightVec;
+    upVec[UpAxis] = UpAxisSign * static_cast<float>(UnitScaleFactor);
+    forwardVec[FrontAxis] = FrontAxisSign * static_cast<float>(UnitScaleFactor);
+    rightVec[CoordAxis] = CoordAxisSign * (float)UnitScaleFactor;
+
+    aiMatrix4x4 mat(rightVec.x, rightVec.y, rightVec.z, 0.0f,
+                    upVec.x, upVec.y, upVec.z, 0.0f,
+                    forwardVec.x, forwardVec.y, forwardVec.z, 0.0f,
+                    0.0f, 0.0f, 0.0f, 1.0f);
+    scene->mRootNode->mTransformation *= mat;
+}
+
 FBXConverter::FBXConverter(aiScene *out, const Document &doc, bool removeEmptyBones) :
         defaultMaterialIndex(),
         mMeshes(),
@@ -133,6 +180,10 @@ FBXConverter::FBXConverter(aiScene *out, const Document &doc, bool removeEmptyBo
     // need not contain geometry (i.e. camera animations, raw armatures).
     if (out->mNumMeshes == 0) {
         out->mFlags |= AI_SCENE_FLAGS_INCOMPLETE;
+    } else {
+        // Apply the FBX axis metadata unless requested not to
+        if (!doc.Settings().ignoreUpDirection)
+            correctRootTransform(mSceneOut);
     }
 }
 
@@ -196,7 +247,7 @@ struct FBXConverter::PotentialNode {
 /// todo: get bone from stack
 /// todo: make map of aiBone* to aiNode*
 /// then update convert clusters to the new format
-void FBXConverter::ConvertNodes(uint64_t id, aiNode *parent, aiNode *root_node) {
+void FBXConverter::ConvertNodes(uint64_t id, aiNode *parent, aiNode *root_node, const aiMatrix4x4& parent_transform) {
     const std::vector<const Connection *> &conns = doc.GetConnectionsByDestinationSequenced(id, "Model");
 
     std::vector<PotentialNode> nodes;
@@ -227,7 +278,7 @@ void FBXConverter::ConvertNodes(uint64_t id, aiNode *parent, aiNode *root_node)
         if (nullptr != model) {
             nodes_chain.clear();
             post_nodes_chain.clear();
-            aiMatrix4x4 new_abs_transform = parent->mTransformation;
+            aiMatrix4x4 new_abs_transform = parent_transform;
             std::string node_name = FixNodeName(model->Name());
             // even though there is only a single input node, the design of
             // assimp (or rather: the complicated transformation chain that
@@ -261,6 +312,8 @@ void FBXConverter::ConvertNodes(uint64_t id, aiNode *parent, aiNode *root_node)
 
                 child->mParent = last_parent;
                 last_parent = child.mNode;
+
+                new_abs_transform *= child->mTransformation;
             }
 
             // attach geometry
@@ -283,6 +336,8 @@ void FBXConverter::ConvertNodes(uint64_t id, aiNode *parent, aiNode *root_node)
 
                     postnode->mParent = last_parent;
                     last_parent = postnode.mNode;
+
+                    new_abs_transform *= postnode->mTransformation;
                 }
             } else {
                 // free the nodes we allocated as we don't need them
@@ -290,7 +345,7 @@ void FBXConverter::ConvertNodes(uint64_t id, aiNode *parent, aiNode *root_node)
             }
 
             // recursion call - child nodes
-            ConvertNodes(model->ID(), last_parent, root_node);
+            ConvertNodes(model->ID(), last_parent, root_node, new_abs_transform);
 
             if (doc.Settings().readLights) {
                 ConvertLights(*model, node_name);
@@ -308,12 +363,12 @@ void FBXConverter::ConvertNodes(uint64_t id, aiNode *parent, aiNode *root_node)
     if (nodes.empty()) {
         parent->mNumChildren = 0;
         parent->mChildren = nullptr;
-    }
-
-    parent->mChildren = new aiNode *[nodes.size()]();
-    parent->mNumChildren = static_cast<unsigned int>(nodes.size());
-    for (unsigned int i = 0; i < nodes.size(); ++i) {
-        parent->mChildren[i] = nodes[i].mOwnership.release();
+    } else {
+        parent->mChildren = new aiNode *[nodes.size()]();
+        parent->mNumChildren = static_cast<unsigned int>(nodes.size());
+        for (unsigned int i = 0; i < nodes.size(); ++i) {
+            parent->mChildren[i] = nodes[i].mOwnership.release();
+        }
     }
 }
 
@@ -383,7 +438,8 @@ void FBXConverter::ConvertLight(const Light &light, const std::string &orig_name
             out_light->mType = aiLightSource_UNDEFINED;
             break;
         default:
-            ai_assert(false);
+            FBXImporter::LogError("Not handled light type: ", light.LightType());
+            break;
     }
 
     float decay = light.DecayStart();
@@ -408,7 +464,7 @@ void FBXConverter::ConvertLight(const Light &light, const std::string &orig_name
             out_light->mAttenuationQuadratic = 1.0f;
             break;
         default:
-            ai_assert(false);
+            FBXImporter::LogError("Not handled light decay type: ", light.DecayType());
             break;
     }
 }
@@ -546,7 +602,7 @@ const char *FBXConverter::NameTransformationCompProperty(TransformationComp comp
             return "GeometricRotationInverse";
         case TransformationComp_GeometricTranslationInverse:
             return "GeometricTranslationInverse";
-        case TransformationComp_MAXIMUM: // this is to silence compiler warnings
+        case TransformationComp_MAXIMUM:
             break;
     }
 
@@ -662,8 +718,7 @@ bool FBXConverter::NeedsComplexTransformationChain(const Model &model) {
     for (size_t i = 0; i < TransformationComp_MAXIMUM; ++i) {
         const TransformationComp comp = static_cast<TransformationComp>(i);
 
-        if (comp == TransformationComp_Rotation || comp == TransformationComp_Scaling || comp == TransformationComp_Translation ||
-            comp == TransformationComp_PreRotation || comp == TransformationComp_PostRotation) {
+        if (comp == TransformationComp_Rotation || comp == TransformationComp_Scaling || comp == TransformationComp_Translation) {
             continue;
         }
 
@@ -1199,9 +1254,9 @@ unsigned int FBXConverter::ConvertMeshSingleMaterial(const MeshGeometry &mesh, c
         for (const BlendShapeChannel *blendShapeChannel : blendShape->BlendShapeChannels()) {
             const auto& shapeGeometries = blendShapeChannel->GetShapeGeometries();
             for (const ShapeGeometry *shapeGeometry : shapeGeometries) {
-                aiAnimMesh *animMesh = aiCreateAnimMesh(out_mesh);
-                const auto &curVertices = shapeGeometry->GetVertices();
                 const auto &curNormals = shapeGeometry->GetNormals();
+                aiAnimMesh *animMesh = aiCreateAnimMesh(out_mesh, true, !curNormals.empty());
+                const auto &curVertices = shapeGeometry->GetVertices();
                 const auto &curIndices = shapeGeometry->GetIndices();
                 //losing channel name if using shapeGeometry->Name()
                 // if blendShapeChannel Name is empty or doesn't have a ".", add geoMetryName;
@@ -1217,7 +1272,7 @@ unsigned int FBXConverter::ConvertMeshSingleMaterial(const MeshGeometry &mesh, c
                 for (size_t j = 0; j < curIndices.size(); j++) {
                     const unsigned int curIndex = curIndices.at(j);
                     aiVector3D vertex = curVertices.at(j);
-                    aiVector3D normal = curNormals.at(j);
+                    aiVector3D normal = curNormals.empty() ? aiVector3D() : curNormals.at(j);
                     unsigned int count = 0;
                     const unsigned int *outIndices = mesh.ToOutputVertexIndex(curIndex, count);
                     for (unsigned int k = 0; k < count; k++) {
@@ -1437,15 +1492,15 @@ unsigned int FBXConverter::ConvertMeshMultiMaterial(const MeshGeometry &mesh, co
         for (const BlendShapeChannel *blendShapeChannel : blendShape->BlendShapeChannels()) {
             const auto& shapeGeometries = blendShapeChannel->GetShapeGeometries();
             for (const ShapeGeometry *shapeGeometry : shapeGeometries) {
-                aiAnimMesh *animMesh = aiCreateAnimMesh(out_mesh);
-                const auto& curVertices = shapeGeometry->GetVertices();
                 const auto& curNormals = shapeGeometry->GetNormals();
+                aiAnimMesh *animMesh = aiCreateAnimMesh(out_mesh, true, !curNormals.empty());
+                const auto& curVertices = shapeGeometry->GetVertices();
                 const auto& curIndices = shapeGeometry->GetIndices();
                 animMesh->mName.Set(FixAnimMeshName(shapeGeometry->Name()));
                 for (size_t j = 0; j < curIndices.size(); j++) {
                     unsigned int curIndex = curIndices.at(j);
                     aiVector3D vertex = curVertices.at(j);
-                    aiVector3D normal = curNormals.at(j);
+                    aiVector3D normal = curNormals.empty() ? aiVector3D() : curNormals.at(j);
                     unsigned int count = 0;
                     const unsigned int *outIndices = mesh.ToOutputVertexIndex(curIndex, count);
                     for (unsigned int k = 0; k < count; k++) {
@@ -1621,14 +1676,14 @@ void FBXConverter::ConvertCluster(std::vector<aiBone*> &local_mesh_bones, const
 
         //bone->mOffsetMatrix = cluster->Transform();
         // store local transform link for post processing
-        
+
         bone->mOffsetMatrix = cluster->TransformLink();
         bone->mOffsetMatrix.Inverse();
 
         const aiMatrix4x4 matrix = (aiMatrix4x4)absolute_transform;
 
         bone->mOffsetMatrix = bone->mOffsetMatrix * matrix; // * mesh_offset
-        
+
         //
         // Now calculate the aiVertexWeights
         //
@@ -1811,7 +1866,7 @@ aiString FBXConverter::GetTexturePath(const Texture *tex) {
                 // We need to load all textures before referencing them, as FBX file format order may reference a texture before loading it
                 // This may occur on this case too, it has to be studied
                 path.data[0] = '*';
-                path.length = 1 + ASSIMP_itoa10(path.data + 1, MAXLEN - 1, index);
+                path.length = 1 + ASSIMP_itoa10(path.data + 1, AI_MAXLEN - 1, index);
             }
         }
     }
@@ -2079,6 +2134,10 @@ void FBXConverter::SetTextureProperties(aiMaterial *out_mat, const TextureMap &_
     TrySetTextureProperties(out_mat, _textures, "Maya|emissionColor", aiTextureType_EMISSION_COLOR, mesh);
     TrySetTextureProperties(out_mat, _textures, "Maya|metalness", aiTextureType_METALNESS, mesh);
     TrySetTextureProperties(out_mat, _textures, "Maya|diffuseRoughness", aiTextureType_DIFFUSE_ROUGHNESS, mesh);
+    TrySetTextureProperties(out_mat, _textures, "Maya|base", aiTextureType_MAYA_BASE, mesh);
+    TrySetTextureProperties(out_mat, _textures, "Maya|specular", aiTextureType_MAYA_SPECULAR, mesh);
+    TrySetTextureProperties(out_mat, _textures, "Maya|specularColor", aiTextureType_MAYA_SPECULAR_COLOR, mesh);
+    TrySetTextureProperties(out_mat, _textures, "Maya|specularRoughness", aiTextureType_MAYA_SPECULAR_ROUGHNESS, mesh);
 
     // Maya stingray
     TrySetTextureProperties(out_mat, _textures, "Maya|TEX_color_map", aiTextureType_BASE_COLOR, mesh);
@@ -2391,7 +2450,7 @@ void FBXConverter::SetShadingPropertiesRaw(aiMaterial *out_mat, const PropertyTa
 
                 // setup texture reference string (copied from ColladaLoader::FindFilenameForEffectTexture)
                 path.data[0] = '*';
-                path.length = 1 + ASSIMP_itoa10(path.data + 1, MAXLEN - 1, index);
+                path.length = 1 + ASSIMP_itoa10(path.data + 1, AI_MAXLEN - 1, index);
             }
 
             out_mat->AddProperty(&path, (name + "|file").c_str(), aiTextureType_UNKNOWN, 0);
@@ -2757,7 +2816,7 @@ void FBXConverter::ProcessMorphAnimDatas(std::map<std::string, morphAnimData *>
                                 auto geoIt = std::find(model->GetGeometry().begin(), model->GetGeometry().end(), geo);
                                 auto geoIndex = static_cast<unsigned int>(std::distance(model->GetGeometry().begin(), geoIt));
                                 auto name = aiString(FixNodeName(model->Name() + "*"));
-                                name.length = 1 + ASSIMP_itoa10(name.data + name.length, MAXLEN - 1, geoIndex);
+                                name.length = 1 + ASSIMP_itoa10(name.data + name.length, AI_MAXLEN - 1, geoIndex);
                                 morphAnimData *animData;
                                 auto animIt = morphAnimDatas->find(name.C_Str());
                                 if (animIt == morphAnimDatas->end()) {
@@ -2899,7 +2958,7 @@ void FBXConverter::GenerateNodeAnimations(std::vector<aiNodeAnim *> &node_anims,
     // be invoked _later_ (animations come first). If this node has only rotation,
     // scaling and translation _and_ there are no animated other components either,
     // we can use a single node and also a single node animation channel.
-    if( !has_complex && !NeedsComplexTransformationChain(target)) {
+    if (!doc.Settings().preservePivots || (!has_complex && !NeedsComplexTransformationChain(target))) {
         aiNodeAnim* const nd = GenerateSimpleNodeAnim(fixed_name, target, chain,
                 node_property_map.end(),
                 start, stop,
@@ -3239,9 +3298,9 @@ aiNodeAnim* FBXConverter::GenerateSimpleNodeAnim(const std::string& name,
     }
 
     if (keyframeLists[TransformationComp_Rotation].size() > 0) {
-        InterpolateKeys(outRotations, keytimes, keyframeLists[TransformationComp_Rotation], AI_DEG_TO_RAD(defRotation), maxTime, minTime, rotOrder);
+        InterpolateKeys(outRotations, keytimes, keyframeLists[TransformationComp_Rotation], defRotation, maxTime, minTime, rotOrder);
     } else {
-        aiQuaternion defQuat = EulerToQuaternion(AI_DEG_TO_RAD(defRotation), rotOrder);
+        aiQuaternion defQuat = EulerToQuaternion(defRotation, rotOrder);
         for (size_t i = 0; i < keyCount; ++i) {
             outRotations[i].mTime = CONVERT_FBX_TIME(keytimes[i]) * anim_fps;
             outRotations[i].mValue = defQuat;
@@ -3263,7 +3322,7 @@ aiNodeAnim* FBXConverter::GenerateSimpleNodeAnim(const std::string& name,
 
     const aiVector3D& preRotation = PropertyGet<aiVector3D>(props, "PreRotation", ok);
     if (ok && preRotation.SquareLength() > zero_epsilon) {
-        const aiQuaternion preQuat = EulerToQuaternion(AI_DEG_TO_RAD(preRotation), Model::RotOrder_EulerXYZ);
+        const aiQuaternion preQuat = EulerToQuaternion(preRotation, Model::RotOrder_EulerXYZ);
         for (size_t i = 0; i < keyCount; ++i) {
             outRotations[i].mValue = preQuat * outRotations[i].mValue;
         }
@@ -3271,7 +3330,7 @@ aiNodeAnim* FBXConverter::GenerateSimpleNodeAnim(const std::string& name,
 
     const aiVector3D& postRotation = PropertyGet<aiVector3D>(props, "PostRotation", ok);
     if (ok && postRotation.SquareLength() > zero_epsilon) {
-        const aiQuaternion postQuat = EulerToQuaternion(AI_DEG_TO_RAD(postRotation), Model::RotOrder_EulerXYZ);
+        const aiQuaternion postQuat = EulerToQuaternion(postRotation, Model::RotOrder_EulerXYZ);
         for (size_t i = 0; i < keyCount; ++i) {
             outRotations[i].mValue = outRotations[i].mValue * postQuat;
         }
@@ -3357,7 +3416,7 @@ FBXConverter::KeyFrameListList FBXConverter::GetRotationKeyframeList(const std::
     KeyFrameListList inputs;
     inputs.reserve(nodes.size() * 3);
 
-    //give some breathing room for rounding errors
+    // give some breathing room for rounding errors
     const int64_t adj_start = start - 10000;
     const int64_t adj_stop = stop + 10000;
 
@@ -3383,7 +3442,7 @@ FBXConverter::KeyFrameListList FBXConverter::GetRotationKeyframeList(const std::
             ai_assert(curve->GetKeys().size() == curve->GetValues().size());
             ai_assert(curve->GetKeys().size());
 
-            //get values within the start/stop time window
+            // get values within the start/stop time window
             std::shared_ptr<KeyTimeList> Keys(new KeyTimeList());
             std::shared_ptr<KeyValueList> Values(new KeyValueList());
             const size_t count = curve->GetKeys().size();
@@ -3403,8 +3462,7 @@ FBXConverter::KeyFrameListList FBXConverter::GetRotationKeyframeList(const std::
                         if (tnew >= adj_start && tnew <= adj_stop) {
                             Keys->push_back(tnew);
                             Values->push_back(vnew);
-                        }
-                        else {
+                        } else {
                             // Something broke
                             break;
                         }
diff --git a/code/AssetLib/FBX/FBXConverter.h b/code/AssetLib/FBX/FBXConverter.h
index 41acb6ffe..b9d3ce90b 100644
--- a/code/AssetLib/FBX/FBXConverter.h
+++ b/code/AssetLib/FBX/FBXConverter.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -70,7 +69,7 @@ struct morphKeyData {
     std::vector<unsigned int> values;
     std::vector<float> weights;
 };
-typedef std::map<int64_t, morphKeyData*> morphAnimData;
+using morphAnimData = std::map<int64_t, morphKeyData*> ;
 
 namespace Assimp {
 namespace FBX {
@@ -134,7 +133,7 @@ private:
 
     // ------------------------------------------------------------------------------------------------
     // collect and assign child nodes
-    void ConvertNodes(uint64_t id, aiNode *parent, aiNode *root_node);
+    void ConvertNodes(uint64_t id, aiNode *parent, aiNode *root_node, const aiMatrix4x4& parent_transform = aiMatrix4x4());
 
     // ------------------------------------------------------------------------------------------------
     void ConvertLights(const Model& model, const std::string &orig_name );
diff --git a/code/AssetLib/FBX/FBXDeformer.cpp b/code/AssetLib/FBX/FBXDeformer.cpp
index 8f944527a..4b8b1d863 100644
--- a/code/AssetLib/FBX/FBXDeformer.cpp
+++ b/code/AssetLib/FBX/FBXDeformer.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -65,9 +65,6 @@ Deformer::Deformer(uint64_t id, const Element& element, const Document& doc, con
     props = GetPropertyTable(doc,"Deformer.Fbx" + classname,element,sc,true);
 }
 
-// ------------------------------------------------------------------------------------------------
-Deformer::~Deformer() = default;
-
 // ------------------------------------------------------------------------------------------------
 Cluster::Cluster(uint64_t id, const Element& element, const Document& doc, const std::string& name)
 : Deformer(id,element,doc,name)
@@ -113,10 +110,6 @@ Cluster::Cluster(uint64_t id, const Element& element, const Document& doc, const
     }
 }
 
-
-// ------------------------------------------------------------------------------------------------
-Cluster::~Cluster() = default;
-
 // ------------------------------------------------------------------------------------------------
 Skin::Skin(uint64_t id, const Element& element, const Document& doc, const std::string& name)
 : Deformer(id,element,doc,name)
@@ -142,9 +135,6 @@ Skin::Skin(uint64_t id, const Element& element, const Document& doc, const std::
     }
 }
 
-
-// ------------------------------------------------------------------------------------------------
-Skin::~Skin() = default;
 // ------------------------------------------------------------------------------------------------
 BlendShape::BlendShape(uint64_t id, const Element& element, const Document& doc, const std::string& name)
     : Deformer(id, element, doc, name)
@@ -161,8 +151,7 @@ BlendShape::BlendShape(uint64_t id, const Element& element, const Document& doc,
         }
     }
 }
-// ------------------------------------------------------------------------------------------------
-BlendShape::~BlendShape() = default;
+
 // ------------------------------------------------------------------------------------------------
 BlendShapeChannel::BlendShapeChannel(uint64_t id, const Element& element, const Document& doc, const std::string& name)
     : Deformer(id, element, doc, name)
@@ -188,10 +177,8 @@ BlendShapeChannel::BlendShapeChannel(uint64_t id, const Element& element, const
         }
     }
 }
-// ------------------------------------------------------------------------------------------------
-BlendShapeChannel::~BlendShapeChannel() = default;
-// ------------------------------------------------------------------------------------------------
-}
-}
-#endif
 
+} // namespace FBX
+} // Namespace Assimp
+
+#endif // ASSIMP_BUILD_NO_FBX_IMPORTER
diff --git a/code/AssetLib/FBX/FBXDocument.cpp b/code/AssetLib/FBX/FBXDocument.cpp
index ee4a6632b..693ee8cf1 100644
--- a/code/AssetLib/FBX/FBXDocument.cpp
+++ b/code/AssetLib/FBX/FBXDocument.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -269,7 +269,7 @@ Document::~Document()
 {
 	// The document does not own the memory for the following objects, but we need to call their d'tor
 	// so they can properly free memory like string members:
-	
+
     for (ObjectMap::value_type &v : objects) {
         delete_LazyObject(v.second);
     }
@@ -663,6 +663,10 @@ LazyObject& Connection::LazyDestinationObject() const {
 const Object* Connection::SourceObject() const {
     LazyObject* const lazy = doc.GetObject(src);
     ai_assert(lazy);
+    if (lazy == nullptr) {
+        return nullptr;
+    }
+
     return lazy->Get();
 }
 
@@ -670,6 +674,10 @@ const Object* Connection::SourceObject() const {
 const Object* Connection::DestinationObject() const {
     LazyObject* const lazy = doc.GetObject(dest);
     ai_assert(lazy);
+    if (lazy == nullptr) {
+        return nullptr;
+    }
+
     return lazy->Get();
 }
 
diff --git a/code/AssetLib/FBX/FBXDocument.h b/code/AssetLib/FBX/FBXDocument.h
index 3af757a19..efeb0073e 100644
--- a/code/AssetLib/FBX/FBXDocument.h
+++ b/code/AssetLib/FBX/FBXDocument.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -657,11 +657,11 @@ private:
 };
 
 /** DOM class for generic FBX materials */
-class Material : public Object {
+class Material final : public Object {
 public:
     Material(uint64_t id, const Element& element, const Document& doc, const std::string& name);
 
-    virtual ~Material();
+    ~Material() override = default;
 
     const std::string& GetShadingModel() const {
         return shading;
@@ -835,7 +835,7 @@ private:
 class Deformer : public Object {
 public:
     Deformer(uint64_t id, const Element& element, const Document& doc, const std::string& name);
-    virtual ~Deformer();
+    virtual ~Deformer() = default;
 
     const PropertyTable& Props() const {
         ai_assert(props.get());
@@ -855,7 +855,7 @@ class BlendShapeChannel : public Deformer {
 public:
     BlendShapeChannel(uint64_t id, const Element& element, const Document& doc, const std::string& name);
 
-    virtual ~BlendShapeChannel();
+    virtual ~BlendShapeChannel() = default;
 
     float DeformPercent() const {
         return percent;
@@ -880,7 +880,7 @@ class BlendShape : public Deformer {
 public:
     BlendShape(uint64_t id, const Element& element, const Document& doc, const std::string& name);
 
-    virtual ~BlendShape();
+    virtual ~BlendShape() = default;
 
     const std::unordered_set<const BlendShapeChannel*>& BlendShapeChannels() const {
         return blendShapeChannels;
@@ -895,7 +895,7 @@ class Cluster : public Deformer {
 public:
     Cluster(uint64_t id, const Element& element, const Document& doc, const std::string& name);
 
-    virtual ~Cluster();
+    virtual ~Cluster() = default;
 
     /** get the list of deformer weights associated with this cluster.
      *  Use #GetIndices() to get the associated vertices. Both arrays
@@ -939,7 +939,7 @@ class Skin : public Deformer {
 public:
     Skin(uint64_t id, const Element& element, const Document& doc, const std::string& name);
 
-    virtual ~Skin();
+    virtual ~Skin() = default;
 
     float DeformAccuracy() const {
         return accuracy;
diff --git a/code/AssetLib/FBX/FBXDocumentUtil.cpp b/code/AssetLib/FBX/FBXDocumentUtil.cpp
index c41eb2747..32a77a321 100644
--- a/code/AssetLib/FBX/FBXDocumentUtil.cpp
+++ b/code/AssetLib/FBX/FBXDocumentUtil.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -36,7 +35,6 @@ 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.
-
 ----------------------------------------------------------------------
 */
 
@@ -81,8 +79,7 @@ void DOMWarning(const std::string& message, const Token& token) {
 }
 
 // ------------------------------------------------------------------------------------------------
-void DOMWarning(const std::string& message, const Element* element /*= nullptr*/)
-{
+void DOMWarning(const std::string& message, const Element* element /*= nullptr*/) {
     if(element) {
         DOMWarning(message,element->KeyToken());
         return;
@@ -92,41 +89,39 @@ void DOMWarning(const std::string& message, const Element* element /*= nullptr*/
     }
 }
 
-
 // ------------------------------------------------------------------------------------------------
 // fetch a property table and the corresponding property template
 std::shared_ptr<const PropertyTable> GetPropertyTable(const Document& doc,
-    const std::string& templateName,
-    const Element &element,
-    const Scope& sc,
-    bool no_warn /*= false*/)
-{
+        const std::string& templateName,
+        const Element &element,
+        const Scope& sc,
+        bool no_warn /*= false*/) {
     const Element* const Properties70 = sc["Properties70"];
     std::shared_ptr<const PropertyTable> templateProps = std::shared_ptr<const PropertyTable>(
             static_cast<const PropertyTable *>(nullptr));
 
-    if(templateName.length()) {
+    if (templateName.length()) {
         PropertyTemplateMap::const_iterator it = doc.Templates().find(templateName);
         if(it != doc.Templates().end()) {
             templateProps = (*it).second;
         }
     }
 
-    if(!Properties70 || !Properties70->Compound()) {
+    if (!Properties70 || !Properties70->Compound()) {
         if(!no_warn) {
             DOMWarning("property table (Properties70) not found",&element);
         }
         if(templateProps) {
             return templateProps;
-        }
-        else {
+        } else {
             return std::make_shared<const PropertyTable>();
         }
     }
     return std::make_shared<const PropertyTable>(*Properties70,templateProps);
 }
+
 } // !Util
 } // !FBX
 } // !Assimp
 
-#endif
+#endif // ASSIMP_BUILD_NO_FBX_IMPORTER
diff --git a/code/AssetLib/FBX/FBXDocumentUtil.h b/code/AssetLib/FBX/FBXDocumentUtil.h
index 1e4653201..d770ecd6f 100644
--- a/code/AssetLib/FBX/FBXDocumentUtil.h
+++ b/code/AssetLib/FBX/FBXDocumentUtil.h
@@ -114,4 +114,4 @@ inline const T* ProcessSimpleConnection(const Connection& con,
 } //!FBX
 } //!Assimp
 
-#endif
+#endif // ASSIMP_BUILD_NO_FBX_IMPORTER
diff --git a/code/AssetLib/FBX/FBXExportNode.cpp b/code/AssetLib/FBX/FBXExportNode.cpp
index 21e591425..9132579c9 100644
--- a/code/AssetLib/FBX/FBXExportNode.cpp
+++ b/code/AssetLib/FBX/FBXExportNode.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -35,7 +35,6 @@ 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.
-
 ----------------------------------------------------------------------
 */
 #ifndef ASSIMP_BUILD_NO_EXPORT
@@ -55,37 +54,31 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <memory> // shared_ptr
 
 namespace Assimp {
+
 // AddP70<type> helpers... there's no usable pattern here,
 // so all are defined as separate functions.
 // Even "animatable" properties are often completely different
 // from the standard (nonanimated) property definition,
 // so they are specified with an 'A' suffix.
 
-void FBX::Node::AddP70int(
-    const std::string& cur_name, int32_t value
-) {
+void FBX::Node::AddP70int(const std::string& cur_name, int32_t value) {
     FBX::Node n("P");
     n.AddProperties(cur_name, "int", "Integer", "", value);
     AddChild(n);
 }
 
-void FBX::Node::AddP70bool(
-    const std::string& cur_name, bool value
-) {
+void FBX::Node::AddP70bool(const std::string& cur_name, bool value) {
     FBX::Node n("P");
     n.AddProperties(cur_name, "bool", "", "", int32_t(value));
     AddChild(n);
 }
 
-void FBX::Node::AddP70double(
-        const std::string &cur_name, double value) {
-    FBX::Node n("P");
+void FBX::Node::AddP70double(const std::string &cur_name, double value) {    FBX::Node n("P");
     n.AddProperties(cur_name, "double", "Number", "", value);
     AddChild(n);
 }
 
-void FBX::Node::AddP70numberA(
-        const std::string &cur_name, double value) {
+void FBX::Node::AddP70numberA(const std::string &cur_name, double value) {
     FBX::Node n("P");
     n.AddProperties(cur_name, "Number", "", "A", value);
     AddChild(n);
@@ -405,8 +398,7 @@ void FBX::Node::DumpChildrenAscii(std::ostream& s, int indent)
     }
 }
 
-void FBX::Node::EndAscii(std::ostream& s, int indent, bool has_children)
-{
+void FBX::Node::EndAscii(std::ostream& s, int indent, bool has_children) {
     if (!has_children) { return; } // nothing to do
     s << '\n';
     for (int i = 0; i < indent; ++i) { s << '\t'; }
@@ -417,11 +409,10 @@ void FBX::Node::EndAscii(std::ostream& s, int indent, bool has_children)
 
 // ascii property node from vector of doubles
 void FBX::Node::WritePropertyNodeAscii(
-    const std::string& name,
-    const std::vector<double>& v,
-    Assimp::StreamWriterLE& s,
-    int indent
-){
+        const std::string& name,
+        const std::vector<double>& v,
+        Assimp::StreamWriterLE& s,
+        int indent){
     char buffer[32];
     FBX::Node node(name);
     node.Begin(s, false, indent);
@@ -556,6 +547,8 @@ void FBX::Node::WritePropertyNode(
         FBX::Node::WritePropertyNodeAscii(name, v, s, indent);
     }
 }
-}
+
+} // namespace Assimp
+
 #endif // ASSIMP_BUILD_NO_FBX_EXPORTER
 #endif // ASSIMP_BUILD_NO_EXPORT
diff --git a/code/AssetLib/FBX/FBXExportNode.h b/code/AssetLib/FBX/FBXExportNode.h
index 99644b216..ed48a9e20 100644
--- a/code/AssetLib/FBX/FBXExportNode.h
+++ b/code/AssetLib/FBX/FBXExportNode.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -35,7 +35,6 @@ 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.
-
 ----------------------------------------------------------------------
 */
 
@@ -70,7 +69,6 @@ public:
     // some nodes always pretend they have children...
     bool force_has_children = false;
 
-public: // constructors
     /// The default class constructor.
     Node() = default;
 
@@ -89,7 +87,6 @@ public: // constructors
         AddProperties(std::forward<More>(more)...);
     }
 
-public: // functions to add properties or children
     // add a single property to the node
     template <typename T>
     void AddProperty(T&& value) {
@@ -118,8 +115,6 @@ public: // functions to add properties or children
         children.push_back(std::move(c));
     }
 
-public: // support specifically for dealing with Properties70 nodes
-
     // it really is simpler to make these all separate functions.
     // the versions with 'A' suffixes are for animatable properties.
     // those often follow a completely different format internally in FBX.
@@ -150,8 +145,6 @@ public: // support specifically for dealing with Properties70 nodes
         AddChild(n);
     }
 
-public: // member functions for writing data to a file or stream
-
     // write the full node to the given file or stream
     void Dump(
             const std::shared_ptr<Assimp::IOStream> &outfile,
@@ -175,31 +168,6 @@ public: // member functions for writing data to a file or stream
         bool has_children
     );
 
-private: // internal functions used for writing
-
-    void DumpBinary(Assimp::StreamWriterLE &s);
-    void DumpAscii(Assimp::StreamWriterLE &s, int indent);
-    void DumpAscii(std::ostream &s, int indent);
-
-    void BeginBinary(Assimp::StreamWriterLE &s);
-    void DumpPropertiesBinary(Assimp::StreamWriterLE& s);
-    void EndPropertiesBinary(Assimp::StreamWriterLE &s);
-    void EndPropertiesBinary(Assimp::StreamWriterLE &s, size_t num_properties);
-    void DumpChildrenBinary(Assimp::StreamWriterLE& s);
-    void EndBinary(Assimp::StreamWriterLE &s, bool has_children);
-
-    void BeginAscii(std::ostream &s, int indent);
-    void DumpPropertiesAscii(std::ostream &s, int indent);
-    void BeginChildrenAscii(std::ostream &s, int indent);
-    void DumpChildrenAscii(std::ostream &s, int indent);
-    void EndAscii(std::ostream &s, int indent, bool has_children);
-
-private: // data used for binary dumps
-    size_t start_pos; // starting position in stream
-    size_t end_pos; // ending position in stream
-    size_t property_start; // starting position of property section
-
-public: // static member functions
 
     // convenience function to create a node with a single property,
     // and write it to the stream.
@@ -235,7 +203,26 @@ public: // static member functions
         bool binary, int indent
     );
 
-private: // static helper functions
+private: // internal functions used for writing
+
+    void DumpBinary(Assimp::StreamWriterLE &s);
+    void DumpAscii(Assimp::StreamWriterLE &s, int indent);
+    void DumpAscii(std::ostream &s, int indent);
+
+    void BeginBinary(Assimp::StreamWriterLE &s);
+    void DumpPropertiesBinary(Assimp::StreamWriterLE& s);
+    void EndPropertiesBinary(Assimp::StreamWriterLE &s);
+    void EndPropertiesBinary(Assimp::StreamWriterLE &s, size_t num_properties);
+    void DumpChildrenBinary(Assimp::StreamWriterLE& s);
+    void EndBinary(Assimp::StreamWriterLE &s, bool has_children);
+
+    void BeginAscii(std::ostream &s, int indent);
+    void DumpPropertiesAscii(std::ostream &s, int indent);
+    void BeginChildrenAscii(std::ostream &s, int indent);
+    void DumpChildrenAscii(std::ostream &s, int indent);
+    void EndAscii(std::ostream &s, int indent, bool has_children);
+
+    // static helper functions
     static void WritePropertyNodeAscii(
         const std::string& name,
         const std::vector<double>& v,
@@ -259,9 +246,13 @@ private: // static helper functions
         Assimp::StreamWriterLE& s
     );
 
+private: // data used for binary dumps
+    size_t start_pos; // starting position in stream
+    size_t end_pos; // ending position in stream
+    size_t property_start; // starting position of property section
 };
-}
+
+} // Namespace Assimp
 
 #endif // ASSIMP_BUILD_NO_FBX_EXPORTER
-
 #endif // AI_FBXEXPORTNODE_H_INC
diff --git a/code/AssetLib/FBX/FBXExportProperty.cpp b/code/AssetLib/FBX/FBXExportProperty.cpp
index 3216d7d85..1a0d9fcf3 100644
--- a/code/AssetLib/FBX/FBXExportProperty.cpp
+++ b/code/AssetLib/FBX/FBXExportProperty.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -286,6 +286,8 @@ void FBXExportProperty::DumpAscii(std::ostream& s, int indent) {
                 break;
             }
         }
+        // assimp issue #6112; fallthrough confirmed by @mesilliac
+        [[fallthrough]];
     case 'R':
         s << '"';
         // we might as well check this now,
diff --git a/code/AssetLib/FBX/FBXExportProperty.h b/code/AssetLib/FBX/FBXExportProperty.h
index 26d0cf223..9f4a1b7eb 100644
--- a/code/AssetLib/FBX/FBXExportProperty.h
+++ b/code/AssetLib/FBX/FBXExportProperty.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/FBX/FBXExporter.cpp b/code/AssetLib/FBX/FBXExporter.cpp
index 28299544a..d4bcaafa2 100644
--- a/code/AssetLib/FBX/FBXExporter.cpp
+++ b/code/AssetLib/FBX/FBXExporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -51,6 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/IOSystem.hpp>
 #include <assimp/Exporter.hpp>
 #include <assimp/DefaultLogger.hpp>
+#include <assimp/Logger.hpp>
 #include <assimp/StreamWriter.h> // StreamWriterLE
 #include <assimp/Exceptional.h> // DeadlyExportError
 #include <assimp/material.h> // aiTextureType
@@ -69,6 +70,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <unordered_set>
 #include <utility>
 #include <vector>
+#include <cmath>
 
 // RESOURCES:
 // https://code.blender.org/2013/08/fbx-binary-file-format-specification/
@@ -369,12 +371,6 @@ void FBXExporter::WriteHeaderExtension ()
         "Creator", creator.str(), outstream, binary, indent
     );
 
-    //FBX::Node sceneinfo("SceneInfo");
-    //sceneinfo.AddProperty("GlobalInfo" + FBX::SEPARATOR + "SceneInfo");
-    // not sure if any of this is actually needed,
-    // so just write an empty node for now.
-    //sceneinfo.Dump(outstream, binary, indent);
-
     indent = 0;
 
     // finish node
@@ -458,11 +454,7 @@ void WritePropString(const aiScene* scene, FBX::Node& p, const std::string& key,
     }
 }
 
-void FBXExporter::WriteGlobalSettings ()
-{
-    if (!binary) {
-        // no title, follows directly from the header extension
-    }
+void FBXExporter::WriteGlobalSettings () {
     FBX::Node gs("GlobalSettings");
     gs.AddChild("Version", int32_t(1000));
 
@@ -492,8 +484,7 @@ void FBXExporter::WriteGlobalSettings ()
     gs.Dump(outfile, binary, 0);
 }
 
-void FBXExporter::WriteDocuments ()
-{
+void FBXExporter::WriteDocuments() {
     if (!binary) {
         WriteAsciiSectionHeader("Documents Description");
     }
@@ -522,8 +513,7 @@ void FBXExporter::WriteDocuments ()
     docs.Dump(outfile, binary, 0);
 }
 
-void FBXExporter::WriteReferences ()
-{
+void FBXExporter::WriteReferences() {
     if (!binary) {
         WriteAsciiSectionHeader("Document References");
     }
@@ -539,7 +529,6 @@ void FBXExporter::WriteReferences ()
 // some internal helper functions used for writing the definitions
 // (before any actual data is written)
 // ---------------------------------------------------------------
-
 size_t count_nodes(const aiNode* n, const aiNode* root) {
     size_t count;
     if (n == root) {
@@ -555,8 +544,7 @@ size_t count_nodes(const aiNode* n, const aiNode* root) {
     return count;
 }
 
-bool has_phong_mat(const aiScene* scene)
-{
+static bool has_phong_mat(const aiScene* scene) {
     // just search for any material with a shininess exponent
     for (size_t i = 0; i < scene->mNumMaterials; ++i) {
         aiMaterial* mat = scene->mMaterials[i];
@@ -569,16 +557,12 @@ bool has_phong_mat(const aiScene* scene)
     return false;
 }
 
-size_t count_images(const aiScene* scene) {
+static size_t count_images(const aiScene* scene) {
     std::unordered_set<std::string> images;
     aiString texpath;
     for (size_t i = 0; i < scene->mNumMaterials; ++i) {
-        aiMaterial* mat = scene->mMaterials[i];
-        for (
-            size_t tt = aiTextureType_DIFFUSE;
-            tt < aiTextureType_UNKNOWN;
-            ++tt
-        ){
+        aiMaterial *mat = scene->mMaterials[i];
+        for (size_t tt = aiTextureType_DIFFUSE; tt < aiTextureType_UNKNOWN; ++tt) {
             const aiTextureType textype = static_cast<aiTextureType>(tt);
             const size_t texcount = mat->GetTextureCount(textype);
             for (unsigned int j = 0; j < texcount; ++j) {
@@ -587,10 +571,11 @@ size_t count_images(const aiScene* scene) {
             }
         }
     }
+
     return images.size();
 }
 
-size_t count_textures(const aiScene* scene) {
+static size_t count_textures(const aiScene* scene) {
     size_t count = 0;
     for (size_t i = 0; i < scene->mNumMaterials; ++i) {
         aiMaterial* mat = scene->mMaterials[i];
@@ -608,7 +593,7 @@ size_t count_textures(const aiScene* scene) {
     return count;
 }
 
-size_t count_deformers(const aiScene* scene) {
+static size_t count_deformers(const aiScene* scene) {
     size_t count = 0;
     for (size_t i = 0; i < scene->mNumMeshes; ++i) {
         const size_t n = scene->mMeshes[i]->mNumBones;
@@ -620,8 +605,7 @@ size_t count_deformers(const aiScene* scene) {
     return count;
 }
 
-void FBXExporter::WriteDefinitions ()
-{
+void FBXExporter::WriteDefinitions () {
     // basically this is just bookkeeping:
     // determining how many of each type of object there are
     // and specifying the base properties to use when otherwise unspecified.
@@ -1032,9 +1016,7 @@ void FBXExporter::WriteDefinitions ()
 // some internal helper functions used for writing the objects section
 // (which holds the actual data)
 // -------------------------------------------------------------------
-
-aiNode* get_node_for_mesh(unsigned int meshIndex, aiNode* node)
-{
+static aiNode* get_node_for_mesh(unsigned int meshIndex, aiNode* node) {
     for (size_t i = 0; i < node->mNumMeshes; ++i) {
         if (node->mMeshes[i] == meshIndex) {
             return node;
@@ -1047,10 +1029,9 @@ aiNode* get_node_for_mesh(unsigned int meshIndex, aiNode* node)
     return nullptr;
 }
 
-aiMatrix4x4 get_world_transform(const aiNode* node, const aiScene* scene)
-{
+aiMatrix4x4 get_world_transform(const aiNode* node, const aiScene* scene) {
     std::vector<const aiNode*> node_chain;
-    while (node != scene->mRootNode) {
+    while (node != scene->mRootNode && node != nullptr) {
         node_chain.push_back(node);
         node = node->mParent;
     }
@@ -1062,18 +1043,47 @@ aiMatrix4x4 get_world_transform(const aiNode* node, const aiScene* scene)
 }
 
 inline int64_t to_ktime(double ticks, const aiAnimation* anim) {
-    if (anim->mTicksPerSecond <= 0) {
-        return static_cast<int64_t>(ticks) * FBX::SECOND;
+    if (FP_ZERO == std::fpclassify(anim->mTicksPerSecond)) {
+        return static_cast<int64_t>(ticks * FBX::SECOND);
     }
-    return (static_cast<int64_t>(ticks / anim->mTicksPerSecond)) * FBX::SECOND;
+    
+    // Defensive: handle zero or near-zero mTicksPerSecond
+    double tps = anim->mTicksPerSecond;
+    double timeVal;
+    if (FP_ZERO == std::fpclassify(tps)) {
+        timeVal = ticks;
+    } else {
+        timeVal = ticks / tps;
+    }
+
+    // Clamp to prevent overflow
+    const double kMax = static_cast<double>(INT64_MAX) / static_cast<double>(FBX::SECOND);
+    const double kMin = static_cast<double>(INT64_MIN) / static_cast<double>(FBX::SECOND);
+
+    if (timeVal > kMax) {
+        return INT64_MAX;
+    }
+    if (timeVal < kMin) {
+        return INT64_MIN;
+    }
+    return static_cast<int64_t>((ticks / anim->mTicksPerSecond) * FBX::SECOND);
 }
 
 inline int64_t to_ktime(double time) {
-    return (static_cast<int64_t>(time * FBX::SECOND));
+    // Clamp to prevent overflow
+    const double kMax = static_cast<double>(INT64_MAX) / static_cast<double>(FBX::SECOND);
+    const double kMin = static_cast<double>(INT64_MIN) / static_cast<double>(FBX::SECOND);
+
+    if (time > kMax) {
+        return INT64_MAX;
+    }
+    if (time < kMin) {
+        return INT64_MIN;
+    }
+    return static_cast<int64_t>(time * FBX::SECOND);
 }
 
-void FBXExporter::WriteObjects ()
-{
+void FBXExporter::WriteObjects () {
     if (!binary) {
         WriteAsciiSectionHeader("Object properties");
     }
@@ -1086,19 +1096,27 @@ void FBXExporter::WriteObjects ()
     object_node.BeginChildren(outstream, binary, indent);
 
     bool bJoinIdenticalVertices = mProperties->GetPropertyBool("bJoinIdenticalVertices", true);
-    std::vector<std::vector<int32_t>> vVertexIndice;//save vertex_indices as it is needed later
+    // save vertex_indices as it is needed later
+    std::vector<std::vector<int32_t>> vVertexIndice(mScene->mNumMeshes);
+    std::vector<uint32_t> uniq_v_before_mi;
+
+    const auto bTransparencyFactorReferencedToOpacity = mProperties->GetPropertyBool(AI_CONFIG_EXPORT_FBX_TRANSPARENCY_FACTOR_REFER_TO_OPACITY, false);
 
     // geometry (aiMesh)
     mesh_uids.clear();
     indent = 1;
-    for (size_t mi = 0; mi < mScene->mNumMeshes; ++mi) {
-        // it's all about this mesh
-        aiMesh* m = mScene->mMeshes[mi];
+    std::function<void(const aiNode*)> visit_node_geo = [&](const aiNode *node) {
+        if (node->mNumMeshes == 0) {
+          for (uint32_t ni = 0; ni < node->mNumChildren; ni++) {
+            visit_node_geo(node->mChildren[ni]);
+          }
+          return;
+        }
 
         // start the node record
         FBX::Node n("Geometry");
         int64_t uid = generate_uid();
-        mesh_uids.push_back(uid);
+        mesh_uids[node] = uid;
         n.AddProperty(uid);
         n.AddProperty(FBX::SEPARATOR + "Geometry");
         n.AddProperty("Mesh");
@@ -1106,161 +1124,113 @@ void FBXExporter::WriteObjects ()
         n.DumpProperties(outstream, binary, indent);
         n.EndProperties(outstream, binary, indent);
         n.BeginChildren(outstream, binary, indent);
-        indent = 2;
 
         // output vertex data - each vertex should be unique (probably)
         std::vector<double> flattened_vertices;
         // index of original vertex in vertex data vector
         std::vector<int32_t> vertex_indices;
-        // map of vertex value to its index in the data vector
-        std::map<aiVector3D,size_t> index_by_vertex_value;
-        if(bJoinIdenticalVertices){
-            int32_t index = 0;
-            for (size_t vi = 0; vi < m->mNumVertices; ++vi) {
-                aiVector3D vtx = m->mVertices[vi];
-                auto elem = index_by_vertex_value.find(vtx);
-                if (elem == index_by_vertex_value.end()) {
-                    vertex_indices.push_back(index);
-                    index_by_vertex_value[vtx] = index;
-                    flattened_vertices.push_back(vtx[0]);
-                    flattened_vertices.push_back(vtx[1]);
-                    flattened_vertices.push_back(vtx[2]);
-                    ++index;
-                } else {
-                    vertex_indices.push_back(int32_t(elem->second));
-                }
-            }
-        }
-        else { // do not join vertex, respect the export flag
-            vertex_indices.resize(m->mNumVertices);
-            std::iota(vertex_indices.begin(), vertex_indices.end(), 0);
-            for(unsigned int v = 0; v < m->mNumVertices; ++ v) {
-                aiVector3D vtx = m->mVertices[v];
-                flattened_vertices.push_back(vtx.x);
-                flattened_vertices.push_back(vtx.y);
-                flattened_vertices.push_back(vtx.z);
-            }
-        }
-        vVertexIndice.push_back(vertex_indices);
 
-        FBX::Node::WritePropertyNode(
-            "Vertices", flattened_vertices, outstream, binary, indent
-        );
+        std::vector<double> normal_data;
+        std::vector<double> color_data;
+
+        std::vector<int32_t> polygon_data;
+
+        std::vector<std::vector<double>> uv_data;
+        std::vector<std::vector<int32_t>> uv_indices;
+
+        indent = 2;
+
+        for (uint32_t n_mi = 0; n_mi < node->mNumMeshes; n_mi++) {
+          const auto mi = node->mMeshes[n_mi];
+          const aiMesh *m = mScene->mMeshes[mi];
+
+          size_t v_offset = vertex_indices.size();
+          size_t uniq_v_before = flattened_vertices.size() / 3;
+
+          // map of vertex value to its index in the data vector
+          std::map<aiVector3D,size_t> index_by_vertex_value;
+          if (bJoinIdenticalVertices) {
+              int32_t index = 0;
+              for (size_t vi = 0; vi < m->mNumVertices; ++vi) {
+                  aiVector3D vtx = m->mVertices[vi];
+                  auto elem = index_by_vertex_value.find(vtx);
+                  if (elem == index_by_vertex_value.end()) {
+                      vertex_indices.push_back(index);
+                      index_by_vertex_value[vtx] = index;
+                      flattened_vertices.insert(flattened_vertices.end(), { vtx.x, vtx.y, vtx.z });
+                      ++index;
+                  } else {
+                      vertex_indices.push_back(int32_t(elem->second));
+                  }
+              }
+          } else { // do not join vertex, respect the export flag
+              vertex_indices.resize(v_offset + m->mNumVertices);
+              std::iota(vertex_indices.begin() + v_offset, vertex_indices.end(), 0);
+              for(unsigned int v = 0; v < m->mNumVertices; ++ v) {
+                  aiVector3D vtx = m->mVertices[v];
+                  flattened_vertices.insert(flattened_vertices.end(), {vtx.x, vtx.y, vtx.z});
+              }
+          }
+          vVertexIndice[mi].insert(
+            // TODO test whether this can be end or not
+            vVertexIndice[mi].end(),
+            vertex_indices.begin() + v_offset,
+            vertex_indices.end()
+          );
+
+          // here could be edges but they're insane.
+          // it's optional anyway, so let's ignore it.
 
         // output polygon data as a flattened array of vertex indices.
         // the last vertex index of each polygon is negated and - 1
-        std::vector<int32_t> polygon_data;
-        for (size_t fi = 0; fi < m->mNumFaces; ++fi) {
+          for (size_t fi = 0; fi < m->mNumFaces; fi++) {
             const aiFace &f = m->mFaces[fi];
-            for (size_t pvi = 0; pvi < f.mNumIndices - 1; ++pvi) {
-                polygon_data.push_back(vertex_indices[f.mIndices[pvi]]);
+            if (f.mNumIndices == 0) continue;
+            size_t pvi = 0;
+            for (; pvi < f.mNumIndices - 1; pvi++) {
+              polygon_data.push_back(
+                static_cast<int32_t>(uniq_v_before + vertex_indices[v_offset + f.mIndices[pvi]])
+              );
             }
             polygon_data.push_back(
-                -1 - vertex_indices[f.mIndices[f.mNumIndices-1]]
+              static_cast<int32_t>(-1 ^ (uniq_v_before + vertex_indices[v_offset+f.mIndices[pvi]]))
             );
-        }
-        FBX::Node::WritePropertyNode(
-            "PolygonVertexIndex", polygon_data, outstream, binary, indent
-        );
+          }
 
-        // here could be edges but they're insane.
-        // it's optional anyway, so let's ignore it.
+          uniq_v_before_mi.push_back(static_cast<uint32_t>(uniq_v_before));
 
-        FBX::Node::WritePropertyNode(
-            "GeometryVersion", int32_t(124), outstream, binary, indent
-        );
-
-        // normals, if any
-        if (m->HasNormals()) {
-            FBX::Node normals("LayerElementNormal", int32_t(0));
-            normals.Begin(outstream, binary, indent);
-            normals.DumpProperties(outstream, binary, indent);
-            normals.EndProperties(outstream, binary, indent);
-            normals.BeginChildren(outstream, binary, indent);
-            indent = 3;
-            FBX::Node::WritePropertyNode(
-                "Version", int32_t(101), outstream, binary, indent
-            );
-            FBX::Node::WritePropertyNode(
-                "Name", "", outstream, binary, indent
-            );
-            FBX::Node::WritePropertyNode(
-                "MappingInformationType", "ByPolygonVertex",
-                outstream, binary, indent
-            );
-            // TODO: vertex-normals or indexed normals when appropriate
-            FBX::Node::WritePropertyNode(
-                "ReferenceInformationType", "Direct",
-                outstream, binary, indent
-            );
-            std::vector<double> normal_data;
+          if (m->HasNormals()) {
             normal_data.reserve(3 * polygon_data.size());
-            for (size_t fi = 0; fi < m->mNumFaces; ++fi) {
-                const aiFace &f = m->mFaces[fi];
-                for (size_t pvi = 0; pvi < f.mNumIndices; ++pvi) {
-                    const aiVector3D &curN = m->mNormals[f.mIndices[pvi]];
-                    normal_data.push_back(curN.x);
-                    normal_data.push_back(curN.y);
-                    normal_data.push_back(curN.z);
-                }
+            for (size_t fi = 0; fi < m->mNumFaces; fi++) {
+              const aiFace & f = m->mFaces[fi];
+              for (size_t pvi = 0; pvi < f.mNumIndices; pvi++) {
+                const aiVector3D &curN = m->mNormals[f.mIndices[pvi]];
+                normal_data.insert(normal_data.end(), { curN.x, curN.y, curN.z });
+              }
             }
-            FBX::Node::WritePropertyNode(
-                "Normals", normal_data, outstream, binary, indent
-            );
-            // note: version 102 has a NormalsW also... not sure what it is,
-            // so we can stick with version 101 for now.
-            indent = 2;
-            normals.End(outstream, binary, indent, true);
-        }
+          }
 
-        // colors, if any
-        // TODO only one color channel currently
-        const int32_t colorChannelIndex = 0;
-        if (m->HasVertexColors(colorChannelIndex)) {
-            FBX::Node vertexcolors("LayerElementColor", int32_t(colorChannelIndex));
-            vertexcolors.Begin(outstream, binary, indent);
-            vertexcolors.DumpProperties(outstream, binary, indent);
-            vertexcolors.EndProperties(outstream, binary, indent);
-            vertexcolors.BeginChildren(outstream, binary, indent);
-            indent = 3;
-            FBX::Node::WritePropertyNode(
-                "Version", int32_t(101), outstream, binary, indent
-            );
-            char layerName[8];
-            snprintf(layerName, sizeof(layerName), "COLOR_%d", colorChannelIndex);
-            FBX::Node::WritePropertyNode(
-                "Name", (const char*)layerName, outstream, binary, indent
-            );
-            FBX::Node::WritePropertyNode(
-                "MappingInformationType", "ByPolygonVertex",
-                outstream, binary, indent
-            );
-            FBX::Node::WritePropertyNode(
-                "ReferenceInformationType", "Direct",
-                outstream, binary, indent
-            );
-            std::vector<double> color_data;
+          const int32_t colorChannelIndex = 0;
+          if (m->HasVertexColors(colorChannelIndex)) {
             color_data.reserve(4 * polygon_data.size());
-            for (size_t fi = 0; fi < m->mNumFaces; ++fi) {
-                const aiFace &f = m->mFaces[fi];
-                for (size_t pvi = 0; pvi < f.mNumIndices; ++pvi) {
-                    const aiColor4D &c = m->mColors[colorChannelIndex][f.mIndices[pvi]];
-                    color_data.push_back(c.r);
-                    color_data.push_back(c.g);
-                    color_data.push_back(c.b);
-                    color_data.push_back(c.a);
-                }
+            for (size_t fi = 0; fi < m->mNumFaces; fi++) {
+              const aiFace &f = m->mFaces[fi];
+              for (size_t pvi = 0; pvi < f.mNumIndices; pvi++) {
+                const aiColor4D &c = m->mColors[colorChannelIndex][f.mIndices[pvi]];
+                color_data.insert(color_data.end(), { c.r, c.g, c.b, c.a });
+              }
             }
-            FBX::Node::WritePropertyNode(
-                "Colors", color_data, outstream, binary, indent
-            );
-            indent = 2;
-            vertexcolors.End(outstream, binary, indent, true);
-        }
+          }
 
-        // uvs, if any
-        for (size_t uvi = 0; uvi < m->GetNumUVChannels(); ++uvi) {
-            if (m->mNumUVComponents[uvi] > 2) {
+          const auto num_uv = static_cast<size_t>(m->GetNumUVChannels());
+          uv_indices.resize(std::max(num_uv, uv_indices.size()));
+          uv_data.resize(std::max(num_uv, uv_data.size()));
+          std::map<aiVector3D, int32_t> index_by_uv;
+
+          // uvs, if any
+          for (size_t uvi = 0; uvi < m->GetNumUVChannels(); uvi++) {
+            const auto nc = m->mNumUVComponents[uvi];
+            if (nc > 2) {
                 // FBX only supports 2-channel UV maps...
                 // or at least i'm not sure how to indicate a different number
                 std::stringstream err;
@@ -1275,71 +1245,112 @@ void FBXExporter::WriteObjects ()
                 err << " but may be incorrectly interpreted on load.";
                 ASSIMP_LOG_WARN(err.str());
             }
-            FBX::Node uv("LayerElementUV", int32_t(uvi));
-            uv.Begin(outstream, binary, indent);
-            uv.DumpProperties(outstream, binary, indent);
-            uv.EndProperties(outstream, binary, indent);
-            uv.BeginChildren(outstream, binary, indent);
-            indent = 3;
-            FBX::Node::WritePropertyNode(
-                "Version", int32_t(101), outstream, binary, indent
-            );
-            // it doesn't seem like assimp keeps the uv map name,
-            // so just leave it blank.
-            FBX::Node::WritePropertyNode(
-                "Name", "", outstream, binary, indent
-            );
-            FBX::Node::WritePropertyNode(
-                "MappingInformationType", "ByPolygonVertex",
-                outstream, binary, indent
-            );
-            FBX::Node::WritePropertyNode(
-                "ReferenceInformationType", "IndexToDirect",
-                outstream, binary, indent
-            );
 
-            std::vector<double> uv_data;
-            std::vector<int32_t> uv_indices;
-            std::map<aiVector3D,int32_t> index_by_uv;
-            int32_t index = 0;
-            for (size_t fi = 0; fi < m->mNumFaces; ++fi) {
-                const aiFace &f = m->mFaces[fi];
-                for (size_t pvi = 0; pvi < f.mNumIndices; ++pvi) {
-                    const aiVector3D &curUv =
-                        m->mTextureCoords[uvi][f.mIndices[pvi]];
-                    auto elem = index_by_uv.find(curUv);
-                    if (elem == index_by_uv.end()) {
-                        index_by_uv[curUv] = index;
-                        uv_indices.push_back(index);
-                        for (unsigned int x = 0; x < m->mNumUVComponents[uvi]; ++x) {
-                            uv_data.push_back(curUv[x]);
-                        }
-                        ++index;
-                    } else {
-                        uv_indices.push_back(elem->second);
-                    }
+            int32_t index = static_cast<int32_t>(uv_data[uvi].size()) / nc;
+            for (size_t fi = 0; fi < m->mNumFaces; fi++) {
+              const aiFace &f = m->mFaces[fi];
+              for (size_t pvi = 0; pvi < f.mNumIndices; pvi++) {
+                const aiVector3D &curUv = m->mTextureCoords[uvi][f.mIndices[pvi]];
+                auto elem = index_by_uv.find(curUv);
+                if (elem == index_by_uv.end()) {
+                  index_by_uv[curUv] = index;
+                  uv_indices[uvi].push_back(index);
+                  for (uint32_t x = 0; x < nc; ++x) {
+                    uv_data[uvi].push_back(curUv[x]);
+                  }
+                  ++index;
+                } else {
+                  uv_indices[uvi].push_back(elem->second);
                 }
+              }
             }
-            FBX::Node::WritePropertyNode(
-                "UV", uv_data, outstream, binary, indent
-            );
-            FBX::Node::WritePropertyNode(
-                "UVIndex", uv_indices, outstream, binary, indent
-            );
-            indent = 2;
-            uv.End(outstream, binary, indent, true);
+          }
         }
 
-        // i'm not really sure why this material section exists,
-        // as the material is linked via "Connections".
-        // it seems to always have the same "0" value.
+
+        FBX::Node::WritePropertyNode("Vertices", flattened_vertices, outstream, binary, indent);
+        FBX::Node::WritePropertyNode("PolygonVertexIndex", polygon_data, outstream, binary, indent);
+        FBX::Node::WritePropertyNode("GeometryVersion", int32_t(124), outstream, binary, indent);
+
+	if (!normal_data.empty()) {
+	    FBX::Node normals("LayerElementNormal", int32_t(0));
+	    normals.Begin(outstream, binary, indent);
+	    normals.DumpProperties(outstream, binary, indent);
+	    normals.EndProperties(outstream, binary, indent);
+	    normals.BeginChildren(outstream, binary, indent);
+	    indent = 3;
+	    FBX::Node::WritePropertyNode("Version", int32_t(101), outstream, binary, indent);
+	    FBX::Node::WritePropertyNode("Name", "", outstream, binary, indent);
+	    FBX::Node::WritePropertyNode("MappingInformationType", "ByPolygonVertex", outstream, binary, indent);
+	    FBX::Node::WritePropertyNode("ReferenceInformationType", "Direct", outstream, binary, indent);
+	    FBX::Node::WritePropertyNode("Normals", normal_data, outstream, binary, indent);
+	    // note: version 102 has a NormalsW also... not sure what it is,
+	    // so stick with version 101 for now.
+	    indent = 2;
+	    normals.End(outstream, binary, indent, true);
+        }
+
+	if (!color_data.empty()) {
+	    const auto colorChannelIndex = 0;
+	    FBX::Node vertexcolors("LayerElementColor", int32_t(colorChannelIndex));
+	    vertexcolors.Begin(outstream, binary, indent);
+	    vertexcolors.DumpProperties(outstream, binary, indent);
+	    vertexcolors.EndProperties(outstream, binary, indent);
+	    vertexcolors.BeginChildren(outstream, binary, indent);
+	    indent = 3;
+	    FBX::Node::WritePropertyNode("Version", int32_t(101), outstream, binary, indent);
+	    char layerName[8];
+	    snprintf(layerName, sizeof(layerName), "COLOR_%d", colorChannelIndex);
+	    FBX::Node::WritePropertyNode("Name", (const char *)layerName, outstream, binary, indent);
+	    FBX::Node::WritePropertyNode("MappingInformationType", "ByPolygonVertex", outstream, binary, indent);
+	    FBX::Node::WritePropertyNode("ReferenceInformationType", "Direct", outstream, binary, indent);
+	    FBX::Node::WritePropertyNode("Colors", color_data, outstream, binary, indent);
+	    indent = 2;
+	    vertexcolors.End(outstream, binary, indent, true);
+        }
+
+        for (uint32_t uvi = 0; uvi < uv_data.size(); uvi++) {
+          FBX::Node uv("LayerElementUV", int32_t(uvi));
+          uv.Begin(outstream, binary, indent);
+          uv.DumpProperties(outstream, binary, indent);
+          uv.EndProperties(outstream, binary, indent);
+          uv.BeginChildren(outstream, binary, indent);
+          indent = 3;
+          FBX::Node::WritePropertyNode("Version", int32_t(101), outstream, binary, indent);
+          FBX::Node::WritePropertyNode("Name", "", outstream, binary, indent);
+          FBX::Node::WritePropertyNode("MappingInformationType", "ByPolygonVertex", outstream, binary, indent);
+          FBX::Node::WritePropertyNode("ReferenceInformationType", "IndexToDirect", outstream, binary, indent);
+          FBX::Node::WritePropertyNode("UV", uv_data[uvi], outstream, binary, indent);
+          FBX::Node::WritePropertyNode("UVIndex", uv_indices[uvi], outstream, binary, indent);
+          indent = 2;
+          uv.End(outstream, binary, indent, true);
+        }
+
+
+        // When merging multiple meshes, we instead use by polygon so the correct material is
+        // assigned to each face. Previously, this LayerElementMaterial always had 0 since it
+        // assumed there was 1 material for each node for all meshes.
         FBX::Node mat("LayerElementMaterial", int32_t(0));
         mat.AddChild("Version", int32_t(101));
         mat.AddChild("Name", "");
-        mat.AddChild("MappingInformationType", "AllSame");
-        mat.AddChild("ReferenceInformationType", "IndexToDirect");
-        std::vector<int32_t> mat_indices = {0};
-        mat.AddChild("Materials", mat_indices);
+        if (node->mNumMeshes == 1) {
+          mat.AddChild("MappingInformationType", "AllSame");
+          mat.AddChild("ReferenceInformationType", "IndexToDirect");
+          std::vector<int32_t> mat_indices = {0};
+          mat.AddChild("Materials", mat_indices);
+        } else {
+          mat.AddChild("MappingInformationType", "ByPolygon");
+          mat.AddChild("ReferenceInformationType", "IndexToDirect");
+          std::vector<int32_t> mat_indices;
+          for (uint32_t n_mi = 0; n_mi < node->mNumMeshes; n_mi++) {
+            const auto mi = node->mMeshes[n_mi];
+            const auto *const m = mScene->mMeshes[mi];
+            for (size_t fi = 0; fi < m->mNumFaces; fi++) {
+              mat_indices.push_back(n_mi);
+            }
+          }
+          mat.AddChild("Materials", mat_indices);
+        }
         mat.Dump(outstream, binary, indent);
 
         // finally we have the layer specifications,
@@ -1347,15 +1358,22 @@ void FBXExporter::WriteObjects ()
         // TODO: handle multiple uv sets correctly?
         FBX::Node layer("Layer", int32_t(0));
         layer.AddChild("Version", int32_t(100));
-        FBX::Node le("LayerElement");
-        le.AddChild("Type", "LayerElementNormal");
-        le.AddChild("TypedIndex", int32_t(0));
-        layer.AddChild(le);
-        // TODO only 1 color channel currently
-        le = FBX::Node("LayerElement");
-        le.AddChild("Type", "LayerElementColor");
-        le.AddChild("TypedIndex", int32_t(0));
-        layer.AddChild(le);
+        FBX::Node le;
+
+		if (!normal_data.empty()) {
+		  le = FBX::Node("LayerElement");
+		  le.AddChild("Type", "LayerElementNormal");
+		  le.AddChild("TypedIndex", int32_t(0));
+		  layer.AddChild(le);
+        }
+
+		if (!color_data.empty()) {
+		  le = FBX::Node("LayerElement");
+		  le.AddChild("Type", "LayerElementColor");
+		  le.AddChild("TypedIndex", int32_t(0));
+		  layer.AddChild(le);
+        }
+
         le = FBX::Node("LayerElement");
         le.AddChild("Type", "LayerElementMaterial");
         le.AddChild("TypedIndex", int32_t(0));
@@ -1366,8 +1384,7 @@ void FBXExporter::WriteObjects ()
         layer.AddChild(le);
         layer.Dump(outstream, binary, indent);
 
-        for(unsigned int lr = 1; lr < m->GetNumUVChannels(); ++ lr)
-        {
+        for(unsigned int lr = 1; lr < uv_data.size(); ++ lr) {
             FBX::Node layerExtra("Layer", int32_t(lr));
             layerExtra.AddChild("Version", int32_t(100));
             FBX::Node leExtra("LayerElement");
@@ -1379,7 +1396,14 @@ void FBXExporter::WriteObjects ()
         // finish the node record
         indent = 1;
         n.End(outstream, binary, indent, true);
-    }
+
+        for (uint32_t ni = 0; ni < node->mNumChildren; ni++) {
+          visit_node_geo(node->mChildren[ni]);
+        }
+        return;
+    };
+
+    visit_node_geo(mScene->mRootNode);
 
 
     // aiMaterial
@@ -1444,13 +1468,21 @@ void FBXExporter::WriteObjects ()
             // "TransparentColor" / "TransparencyFactor"...
             // thanks FBX, for your insightful interpretation of consistency
             p.AddP70colorA("TransparentColor", c.r, c.g, c.b);
-            // TransparencyFactor defaults to 0.0, so set it to 1.0.
-            // note: Maya always sets this to 1.0,
-            // so we can't use it sensibly as "Opacity".
-            // In stead we rely on the legacy "Opacity" value, below.
-            // Blender also relies on "Opacity" not "TransparencyFactor",
-            // probably for a similar reason.
-            p.AddP70numberA("TransparencyFactor", 1.0);
+
+            if (!bTransparencyFactorReferencedToOpacity) {
+                // TransparencyFactor defaults to 0.0, so set it to 1.0.
+                // note: Maya always sets this to 1.0,
+                // so we can't use it sensibly as "Opacity".
+                // In stead we rely on the legacy "Opacity" value, below.
+                // Blender also relies on "Opacity" not "TransparencyFactor",
+                // probably for a similar reason.
+                p.AddP70numberA("TransparencyFactor", 1.0);
+            }
+        }
+        if (bTransparencyFactorReferencedToOpacity) {
+            if (m->Get(AI_MATKEY_OPACITY, f) == aiReturn_SUCCESS) {
+                p.AddP70numberA("TransparencyFactor", 1.0 - f);
+            }
         }
         if (m->Get(AI_MATKEY_COLOR_REFLECTIVE, c) == aiReturn_SUCCESS) {
             p.AddP70colorA("ReflectionColor", c.r, c.g, c.b);
@@ -1736,7 +1768,8 @@ void FBXExporter::WriteObjects ()
       dnode.AddChild("Version", int32_t(101));
       dnode.Dump(outstream, binary, indent);
       // connect it
-      connections.emplace_back("C", "OO", deformer_uid, mesh_uids[mi]);
+      const auto node = get_node_for_mesh((unsigned int)mi, mScene->mRootNode);
+      connections.emplace_back("C", "OO", deformer_uid, mesh_uids[node]);
       std::vector<int32_t> vertex_indices = vVertexIndice[mi];
 
       for (unsigned int am = 0; am < m->mNumAnimMeshes; ++am) {
@@ -1746,9 +1779,9 @@ void FBXExporter::WriteObjects ()
         // start the node record
         FBX::Node bsnode("Geometry");
         int64_t blendshape_uid = generate_uid();
-        mesh_uids.push_back(blendshape_uid);
+        blendshape_uids.push_back(blendshape_uid);
         bsnode.AddProperty(blendshape_uid);
-        bsnode.AddProperty(blendshape_name + FBX::SEPARATOR + "Blendshape");
+        bsnode.AddProperty(blendshape_name + FBX::SEPARATOR + "Geometry");
         bsnode.AddProperty("Shape");
         bsnode.AddChild("Version", int32_t(100));
         bsnode.Begin(outstream, binary, indent);
@@ -1758,23 +1791,25 @@ void FBXExporter::WriteObjects ()
         indent++;
         if (pAnimMesh->HasPositions()) {
           std::vector<int32_t>shape_indices;
-          std::vector<double>pPositionDiff;
-          std::vector<double>pNormalDiff;
+          std::vector<float>pPositionDiff;
+          std::vector<float>pNormalDiff;
 
           for (unsigned int vt = 0; vt < vertex_indices.size(); ++vt) {
               aiVector3D pDiff = (pAnimMesh->mVertices[vertex_indices[vt]] - m->mVertices[vertex_indices[vt]]);
-              if(pDiff.Length()>1e-8){
-                shape_indices.push_back(vertex_indices[vt]);
-                pPositionDiff.push_back(pDiff[0]);
-                pPositionDiff.push_back(pDiff[1]);
-                pPositionDiff.push_back(pDiff[2]);
+              shape_indices.push_back(vertex_indices[vt]);
+              pPositionDiff.push_back(pDiff[0]);
+              pPositionDiff.push_back(pDiff[1]);
+              pPositionDiff.push_back(pDiff[2]);
 
-                if (pAnimMesh->HasNormals()) {
-                    aiVector3D nDiff = (pAnimMesh->mNormals[vertex_indices[vt]] - m->mNormals[vertex_indices[vt]]);
-                    pNormalDiff.push_back(nDiff[0]);
-                    pNormalDiff.push_back(nDiff[1]);
-                    pNormalDiff.push_back(nDiff[2]);
-                }
+              if (pAnimMesh->HasNormals()) {
+                  aiVector3D nDiff = (pAnimMesh->mNormals[vertex_indices[vt]] - m->mNormals[vertex_indices[vt]]);
+                  pNormalDiff.push_back(nDiff[0]);
+                  pNormalDiff.push_back(nDiff[1]);
+                  pNormalDiff.push_back(nDiff[2]);
+              } else {
+                  pNormalDiff.push_back(0.0);
+                  pNormalDiff.push_back(0.0);
+                  pNormalDiff.push_back(0.0);
               }
           }
 
@@ -1807,7 +1842,7 @@ void FBXExporter::WriteObjects ()
         p.AddP70numberA("DeformPercent", 0.0);
         sdnode.AddChild(p);
         // TODO: Normally just one weight per channel, adding stub for later development
-        std::vector<float>fFullWeights;
+        std::vector<double>fFullWeights;
         fFullWeights.push_back(100.);
         sdnode.AddChild("FullWeights", fFullWeights);
         sdnode.Dump(outstream, binary, indent);
@@ -1857,33 +1892,26 @@ void FBXExporter::WriteObjects ()
     // one sticky point is that the number of vertices may not match,
     // because assimp splits vertices by normal, uv, etc.
 
-    // functor for aiNode sorting
-    struct SortNodeByName
-    {
-        bool operator()(const aiNode *lhs, const aiNode *rhs) const
-        {
-            return strcmp(lhs->mName.C_Str(), rhs->mName.C_Str()) < 0;
-        }
-    };
 
     // first we should mark the skeleton for each mesh.
     // the skeleton must include not only the aiBones,
     // but also all their parent nodes.
     // anything that affects the position of any bone node must be included.
-    // Use SorNodeByName to make sure the exported result will be the same across all systems
-    // Otherwise the aiNodes of the skeleton would be sorted based on the pointer address, which isn't consistent
-    std::vector<std::set<const aiNode*, SortNodeByName>> skeleton_by_mesh(mScene->mNumMeshes);
+
+    // note that we want to preserve input order as much as possible here.
+    // previously, sorting by name lead to consistent output across systems, but was not
+    // suitable for downstream consumption by some applications.
+    std::vector<std::vector<const aiNode*>> skeleton_by_mesh(mScene->mNumMeshes);
     // at the same time we can build a list of all the skeleton nodes,
     // which will be used later to mark them as type "limbNode".
     std::unordered_set<const aiNode*> limbnodes;
 
     //actual bone nodes in fbx, without parenting-up
-    std::unordered_set<std::string> setAllBoneNamesInScene;
-    for(unsigned int m = 0; m < mScene->mNumMeshes; ++ m)
-    {
+    std::vector<std::string> allBoneNames;
+    for(unsigned int m = 0; m < mScene->mNumMeshes; ++ m) {
         aiMesh* pMesh = mScene->mMeshes[m];
         for(unsigned int b = 0; b < pMesh->mNumBones; ++ b)
-            setAllBoneNamesInScene.insert(pMesh->mBones[b]->mName.data);
+            allBoneNames.push_back(pMesh->mBones[b]->mName.data);
     }
     aiMatrix4x4 mxTransIdentity;
 
@@ -1891,7 +1919,7 @@ void FBXExporter::WriteObjects ()
     std::map<std::string,aiNode*> node_by_bone;
     for (size_t mi = 0; mi < mScene->mNumMeshes; ++mi) {
         const aiMesh* m = mScene->mMeshes[mi];
-        std::set<const aiNode*, SortNodeByName> skeleton;
+        std::vector<const aiNode*> skeleton;
         for (size_t bi =0; bi < m->mNumBones; ++bi) {
             const aiBone* b = m->mBones[bi];
             const std::string name(b->mName.C_Str());
@@ -1910,7 +1938,7 @@ void FBXExporter::WriteObjects ()
                 node_by_bone[name] = n;
                 limbnodes.insert(n);
             }
-            skeleton.insert(n);
+            skeleton.push_back(n);
             // mark all parent nodes as skeleton as well,
             // up until we find the root node,
             // or else the node containing the mesh,
@@ -1921,7 +1949,7 @@ void FBXExporter::WriteObjects ()
                 parent = parent->mParent
             ) {
                 // if we've already done this node we can skip it all
-                if (skeleton.count(parent)) {
+                if (std::find(skeleton.begin(), skeleton.end(), parent) != skeleton.end()) {
                     break;
                 }
                 // ignore fbx transform nodes as these will be collapsed later
@@ -1931,29 +1959,22 @@ void FBXExporter::WriteObjects ()
                     continue;
                 }
                 //not a bone in scene && no effect in transform
-                if(setAllBoneNamesInScene.find(node_name)==setAllBoneNamesInScene.end()
+                if (std::find(allBoneNames.begin(), allBoneNames.end(), node_name) == allBoneNames.end()
                    && parent->mTransformation == mxTransIdentity) {
                         continue;
                 }
                 // otherwise check if this is the root of the skeleton
                 bool end = false;
                 // is the mesh part of this node?
-                for (size_t i = 0; i < parent->mNumMeshes; ++i) {
-                    if (parent->mMeshes[i] == mi) {
-                        end = true;
-                        break;
-                    }
+                for (size_t i = 0; i < parent->mNumMeshes && !end; ++i) {
+                    end |= parent->mMeshes[i] == mi;
                 }
                 // is the mesh in one of the children of this node?
-                for (size_t j = 0; j < parent->mNumChildren; ++j) {
+                for (size_t j = 0; j < parent->mNumChildren && !end; ++j) {
                     aiNode* child = parent->mChildren[j];
-                    for (size_t i = 0; i < child->mNumMeshes; ++i) {
-                        if (child->mMeshes[i] == mi) {
-                            end = true;
-                            break;
-                        }
+                    for (size_t i = 0; i < child->mNumMeshes && !end; ++i) {
+                        end |= child->mMeshes[i] == mi;
                     }
-                    if (end) { break; }
                 }
 
                 // if it was the skeleton root we can finish here
@@ -1967,8 +1988,7 @@ void FBXExporter::WriteObjects ()
     for (size_t i = 0; i < mScene->mNumMeshes; ++i) {
         auto &s = skeleton_by_mesh[i];
         for (const aiNode* n : s) {
-            auto elem = node_uids.find(n);
-            if (elem == node_uids.end()) {
+            if (node_uids.find(n) == node_uids.end()) {
                 node_uids[n] = generate_uid();
             }
         }
@@ -1984,6 +2004,8 @@ void FBXExporter::WriteObjects ()
         if (!m->HasBones()) {
             continue;
         }
+
+        const aiNode *mesh_node = get_node_for_mesh((uint32_t)mi, mScene->mRootNode);
         // make a deformer for this mesh
         int64_t deformer_uid = generate_uid();
         FBX::Node dnode("Deformer");
@@ -1995,10 +2017,7 @@ void FBXExporter::WriteObjects ()
         dnode.Dump(outstream, binary, indent);
 
         // connect it
-        connections.emplace_back("C", "OO", deformer_uid, mesh_uids[mi]);
-
-        //computed before
-        std::vector<int32_t>& vertex_indices = vVertexIndice[mi];
+        connections.emplace_back("C", "OO", deformer_uid, mesh_uids[mesh_node]);
 
         // TODO, FIXME: this won't work if anything is not in the bind pose.
         // for now if such a situation is detected, we throw an exception.
@@ -2012,11 +2031,10 @@ void FBXExporter::WriteObjects ()
         // as it can be instanced to many nodes.
         // All we can do is assume no instancing,
         // and take the first node we find that contains the mesh.
-        aiNode* mesh_node = get_node_for_mesh((unsigned int)mi, mScene->mRootNode);
         aiMatrix4x4 mesh_xform = get_world_transform(mesh_node, mScene);
 
         // now make a subdeformer for each bone in the skeleton
-        const std::set<const aiNode*, SortNodeByName> skeleton= skeleton_by_mesh[mi];
+        const auto & skeleton= skeleton_by_mesh[mi];
         for (const aiNode* bone_node : skeleton) {
             // if there's a bone for this node, find it
             const aiBone* b = nullptr;
@@ -2041,14 +2059,19 @@ void FBXExporter::WriteObjects ()
             sdnode.AddChild("Version", int32_t(100));
             sdnode.AddChild("UserData", "", "");
 
-            std::set<int32_t> setWeightedVertex;
             // add indices and weights, if any
             if (b) {
+                std::set<int32_t> setWeightedVertex;
                 std::vector<int32_t> subdef_indices;
                 std::vector<double> subdef_weights;
                 int32_t last_index = -1;
                 for (size_t wi = 0; wi < b->mNumWeights; ++wi) {
-                    int32_t vi = vertex_indices[b->mWeights[wi].mVertexId];
+                    if (b->mWeights[wi].mVertexId >= vVertexIndice[mi].size()) {
+                  			ASSIMP_LOG_ERROR("UNREAL: Skipping vertex index to prevent buffer overflow.");
+                        continue;
+                    }
+                    int32_t vi = vVertexIndice[mi][b->mWeights[wi].mVertexId]
+                      + uniq_v_before_mi[mi];
                     bool bIsWeightedAlready = (setWeightedVertex.find(vi) != setWeightedVertex.end());
                     if (vi == last_index || bIsWeightedAlready) {
                         // only for vertices we exported to fbx
@@ -2482,6 +2505,57 @@ const std::map<std::string,std::pair<std::string,char>> transform_types = {
     {"GeometricScalingInverse", {"GeometricScalingInverse", 'i'}}
 };
 
+//add metadata to fbx property
+void add_meta(FBX::Node& fbx_node, const aiNode* node){
+    if(node->mMetaData == nullptr) return;
+    aiMetadata* meta = node->mMetaData;
+    for (unsigned int i = 0; i < meta->mNumProperties; ++i) {
+        aiString key = meta->mKeys[i];
+        aiMetadataEntry* entry = &meta->mValues[i];
+        switch (entry->mType) {
+        case AI_BOOL:{
+            bool val = *static_cast<bool *>(entry->mData);
+            fbx_node.AddP70bool(key.C_Str(), val);
+            break;
+        }
+        case AI_INT32:{
+            int32_t val = *static_cast<int32_t *>(entry->mData);
+            fbx_node.AddP70int(key.C_Str(), val);
+            break;
+        }
+        case AI_UINT64:{
+            //use string to add uint64
+            uint64_t val = *static_cast<uint64_t *>(entry->mData);
+            fbx_node.AddP70string(key.C_Str(), std::to_string(val).c_str());
+            break;
+        }
+        case AI_FLOAT:{
+            float val = *static_cast<float *>(entry->mData);
+            fbx_node.AddP70double(key.C_Str(), val);
+            break;
+        }
+        case AI_DOUBLE:{
+            double val = *static_cast<double *>(entry->mData);
+            fbx_node.AddP70double(key.C_Str(), val);
+            break;
+        }
+        case AI_AISTRING:{
+            aiString val = *static_cast<aiString *>(entry->mData);
+            fbx_node.AddP70string(key.C_Str(), val.C_Str());
+            break;
+        }
+        case AI_AIMETADATA: {
+            //ignore
+            break;
+        }
+        default:
+            break;
+        }
+
+    }
+
+}
+
 // write a single model node to the stream
 void FBXExporter::WriteModelNode(
     StreamWriterLE& outstream,
@@ -2549,6 +2623,7 @@ void FBXExporter::WriteModelNode(
             }
         }
     }
+    add_meta(p, node);
     m.AddChild(p);
 
     // not sure what these are for,
@@ -2643,9 +2718,8 @@ void FBXExporter::WriteModelNodes(
         // handled later
     } else if (node->mNumMeshes == 1) {
         // connect to child mesh, which should have been written previously
-        connections.emplace_back(
-            "C", "OO", mesh_uids[node->mMeshes[0]], node_uid
-        );
+        // TODO double check this line
+        connections.emplace_back("C", "OO", mesh_uids[node], node_uid);
         // also connect to the material for the child mesh
         connections.emplace_back(
             "C", "OO",
@@ -2670,6 +2744,16 @@ void FBXExporter::WriteModelNodes(
         na.Dump(outstream, binary, 1);
         // and connect them
         connections.emplace_back("C", "OO", node_attribute_uid, node_uid);
+    } else if (node->mNumMeshes >= 1) {
+      connections.emplace_back("C", "OO", mesh_uids[node], node_uid);
+      for (size_t i = 0; i < node->mNumMeshes; i++) {
+        connections.emplace_back(
+          "C", "OO",
+          material_uids[mScene->mMeshes[node->mMeshes[i]]->mMaterialIndex],
+          node_uid
+        );
+      }
+      WriteModelNode(outstream, binary, node, node_uid, "Mesh", transform_chain);
     } else {
         const auto& lightIt = lights_uids.find(node->mName.C_Str());
         if(lightIt != lights_uids.end()) {
@@ -2686,34 +2770,20 @@ void FBXExporter::WriteModelNodes(
         }
     }
 
-    // if more than one child mesh, make nodes for each mesh
-    if (node->mNumMeshes > 1 || node == mScene->mRootNode) {
-        for (size_t i = 0; i < node->mNumMeshes; ++i) {
-            // make a new model node
-            int64_t new_node_uid = generate_uid();
-            // connect to parent node
-            connections.emplace_back("C", "OO", new_node_uid, node_uid);
-            // connect to child mesh, which should have been written previously
-            connections.emplace_back(
-                "C", "OO", mesh_uids[node->mMeshes[i]], new_node_uid
-            );
-            // also connect to the material for the child mesh
-            connections.emplace_back(
-                "C", "OO",
-                material_uids[
-                    mScene->mMeshes[node->mMeshes[i]]->mMaterialIndex
-                ],
-                new_node_uid
-            );
-
-            aiNode new_node;
-            // take name from mesh name, if it exists
-            new_node.mName = mScene->mMeshes[node->mMeshes[i]]->mName;
-            // write model node
-            WriteModelNode(
-                outstream, binary, &new_node, new_node_uid, "Mesh", std::vector<std::pair<std::string,aiVector3D>>()
-            );
-        }
+    if (node == mScene->mRootNode && node->mNumMeshes > 0) {
+      int64_t new_node_uid = generate_uid();
+      connections.emplace_back("C", "OO", new_node_uid, node_uid);
+      connections.emplace_back("C", "OO", mesh_uids[node], new_node_uid);
+      for (size_t i = 0; i < node->mNumMeshes; ++i) {
+        connections.emplace_back(
+          "C", "OO",
+          material_uids[mScene->mMeshes[node->mMeshes[i]]->mMaterialIndex],
+          new_node_uid
+        );
+      }
+      aiNode new_node;
+      new_node.mName = mScene->mMeshes[0]->mName;
+      WriteModelNode(outstream, binary, &new_node, new_node_uid, "Mesh", {});
     }
 
     // now recurse into children
diff --git a/code/AssetLib/FBX/FBXExporter.h b/code/AssetLib/FBX/FBXExporter.h
index 659f9368a..697a1a1e4 100644
--- a/code/AssetLib/FBX/FBXExporter.h
+++ b/code/AssetLib/FBX/FBXExporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -51,7 +51,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FBXCommon.h" // FBX::TransformInheritance
 
 #include <assimp/types.h>
-//#include <assimp/material.h>
 #include <assimp/StreamWriter.h> // StreamWriterLE
 #include <assimp/Exceptional.h> // DeadlyExportError
 
@@ -91,7 +90,8 @@ namespace Assimp {
 
         std::vector<FBX::Node> connections; // connection storage
 
-        std::vector<int64_t> mesh_uids;
+        std::map<const aiNode*, int64_t> mesh_uids;
+        std::vector<int64_t> blendshape_uids;
         std::vector<int64_t> material_uids;
         std::map<const aiNode*,int64_t> node_uids;
         std::map<std::string,int64_t> lights_uids;
diff --git a/code/AssetLib/FBX/FBXImportSettings.h b/code/AssetLib/FBX/FBXImportSettings.h
index 698901180..71e08bc2d 100644
--- a/code/AssetLib/FBX/FBXImportSettings.h
+++ b/code/AssetLib/FBX/FBXImportSettings.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -156,6 +156,9 @@ struct ImportSettings {
     /** Set to true to perform a conversion from cm to meter after the import
     */
     bool convertToMeters;
+
+    // Set to true to ignore the axis configuration in the file
+    bool ignoreUpDirection = false;
 };
 
 } // namespace FBX
diff --git a/code/AssetLib/FBX/FBXImporter.cpp b/code/AssetLib/FBX/FBXImporter.cpp
index afd4b11c1..d27e6997a 100644
--- a/code/AssetLib/FBX/FBXImporter.cpp
+++ b/code/AssetLib/FBX/FBXImporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -117,6 +117,7 @@ void FBXImporter::SetupProperties(const Importer *pImp) {
     mSettings.useLegacyEmbeddedTextureNaming = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_EMBEDDED_TEXTURES_LEGACY_NAMING, false);
     mSettings.removeEmptyBones = pImp->GetPropertyBool(AI_CONFIG_IMPORT_REMOVE_EMPTY_BONES, true);
     mSettings.convertToMeters = pImp->GetPropertyBool(AI_CONFIG_FBX_CONVERT_TO_M, false);
+    mSettings.ignoreUpDirection = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_IGNORE_UP_DIRECTION, false);
     mSettings.useSkeleton = pImp->GetPropertyBool(AI_CONFIG_FBX_USE_SKELETON_BONE_CONTAINER, false);
 }
 
diff --git a/code/AssetLib/FBX/FBXImporter.h b/code/AssetLib/FBX/FBXImporter.h
index d12b45969..467a7cf68 100644
--- a/code/AssetLib/FBX/FBXImporter.h
+++ b/code/AssetLib/FBX/FBXImporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/FBX/FBXMaterial.cpp b/code/AssetLib/FBX/FBXMaterial.cpp
index bcb9bc42a..dee468dca 100644
--- a/code/AssetLib/FBX/FBXMaterial.cpp
+++ b/code/AssetLib/FBX/FBXMaterial.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -134,10 +134,6 @@ Material::Material(uint64_t id, const Element& element, const Document& doc, con
     }
 }
 
-
-// ------------------------------------------------------------------------------------------------
-Material::~Material() = default;
-
 // ------------------------------------------------------------------------------------------------
 Texture::Texture(uint64_t id, const Element& element, const Document& doc, const std::string& name) :
         Object(id,element,name),
diff --git a/code/AssetLib/FBX/FBXMeshGeometry.cpp b/code/AssetLib/FBX/FBXMeshGeometry.cpp
index 8c6499a91..ef1f53ad1 100644
--- a/code/AssetLib/FBX/FBXMeshGeometry.cpp
+++ b/code/AssetLib/FBX/FBXMeshGeometry.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -644,10 +644,12 @@ void MeshGeometry::ReadVertexDataMaterials(std::vector<int>& materials_out, cons
         return;
     }
 
-    // materials are handled separately. First of all, they are assigned per-face
-    // and not per polyvert. Secondly, ReferenceInformationType=IndexToDirect
-    // has a slightly different meaning for materials.
-    ParseVectorDataArray(materials_out,GetRequiredElement(source,"Materials"));
+    if (source["Materials"]) {
+        // materials are handled separately. First of all, they are assigned per-face
+        // and not per polyvert. Secondly, ReferenceInformationType=IndexToDirect
+        // has a slightly different meaning for materials.
+        ParseVectorDataArray(materials_out, GetRequiredElement(source, "Materials"));
+    }
 
     if (MappingInformationType == "AllSame") {
         // easy - same material for all faces
@@ -683,11 +685,14 @@ ShapeGeometry::ShapeGeometry(uint64_t id, const Element& element, const std::str
         DOMError("failed to read Geometry object (class: Shape), no data scope found");
     }
     const Element& Indexes = GetRequiredElement(*sc, "Indexes", &element);
-    const Element& Normals = GetRequiredElement(*sc, "Normals", &element);
     const Element& Vertices = GetRequiredElement(*sc, "Vertices", &element);
     ParseVectorDataArray(m_indices, Indexes);
     ParseVectorDataArray(m_vertices, Vertices);
-    ParseVectorDataArray(m_normals, Normals);
+
+    if ((*sc)["Normals"]) {
+        const Element& Normals = GetRequiredElement(*sc, "Normals", &element);
+        ParseVectorDataArray(m_normals, Normals);
+    }
 }
 
 // ------------------------------------------------------------------------------------------------
diff --git a/code/AssetLib/FBX/FBXMeshGeometry.h b/code/AssetLib/FBX/FBXMeshGeometry.h
index 3d67ec567..d4f67c8bb 100644
--- a/code/AssetLib/FBX/FBXMeshGeometry.h
+++ b/code/AssetLib/FBX/FBXMeshGeometry.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2023, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/FBX/FBXModel.cpp b/code/AssetLib/FBX/FBXModel.cpp
index d731d2e29..af6768f39 100644
--- a/code/AssetLib/FBX/FBXModel.cpp
+++ b/code/AssetLib/FBX/FBXModel.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/FBX/FBXNodeAttribute.cpp b/code/AssetLib/FBX/FBXNodeAttribute.cpp
index 34fcdcf77..7dec8debd 100644
--- a/code/AssetLib/FBX/FBXNodeAttribute.cpp
+++ b/code/AssetLib/FBX/FBXNodeAttribute.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/FBX/FBXParser.cpp b/code/AssetLib/FBX/FBXParser.cpp
index 7baa7ed39..5bdd937b9 100644
--- a/code/AssetLib/FBX/FBXParser.cpp
+++ b/code/AssetLib/FBX/FBXParser.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/FBX/FBXParser.h b/code/AssetLib/FBX/FBXParser.h
index 5f231738d..c82a1213e 100644
--- a/code/AssetLib/FBX/FBXParser.h
+++ b/code/AssetLib/FBX/FBXParser.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -63,7 +63,6 @@ class Scope;
 class Parser;
 class Element;
 
-// XXX should use C++11's unique_ptr - but assimp's need to keep working with 03
 using ScopeList = std::vector<Scope*>;
 using ElementMap = std::fbx_unordered_multimap< std::string, Element*>;
 using ElementCollection = std::pair<ElementMap::const_iterator,ElementMap::const_iterator>;
@@ -83,10 +82,9 @@ using ElementCollection = std::pair<ElementMap::const_iterator,ElementMap::const
  *  @endverbatim
  *
  *  As can be seen in this sample, elements can contain nested #Scope
- *  as their trailing member.  
+ *  as their trailing member.
 **/
-class Element
-{
+class Element {
 public:
     Element(const Token& key_token, Parser& parser);
     ~Element();
@@ -135,7 +133,7 @@ public:
 		const char* elementNameCStr = elementName.c_str();
 		for (auto element = elements.begin(); element != elements.end(); ++element)
 		{
-			if (!ASSIMP_strincmp(element->first.c_str(), elementNameCStr, MAXLEN)) {
+            if (!ASSIMP_strincmp(element->first.c_str(), elementNameCStr, AI_MAXLEN)) {
 				return element->second;
 			}
 		}
diff --git a/code/AssetLib/FBX/FBXProperties.cpp b/code/AssetLib/FBX/FBXProperties.cpp
index 1c050617d..2b648109c 100644
--- a/code/AssetLib/FBX/FBXProperties.cpp
+++ b/code/AssetLib/FBX/FBXProperties.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -57,15 +56,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace Assimp {
 namespace FBX {
 
-    using namespace Util;
+using namespace Util;
 
 // ------------------------------------------------------------------------------------------------
-    Property::Property() = default;
 
-    // ------------------------------------------------------------------------------------------------
-    Property::~Property() = default;
-
-    namespace {
+namespace {
 
     void checkTokenCount(const TokenList &tok, unsigned int expectedCount) {
         ai_assert(expectedCount >= 2);
@@ -146,9 +141,9 @@ Property* ReadTypedProperty(const Element& element)
 
 // ------------------------------------------------------------------------------------------------
 // peek into an element and check if it contains a FBX property, if so return its name.
-std::string PeekPropertyName(const Element& element)
-{
+std::string PeekPropertyName(const Element& element) {
     ai_assert(element.KeyToken().StringContents() == "P");
+
     const TokenList& tok = element.Tokens();
     if(tok.size() < 4) {
         return std::string();
@@ -160,13 +155,6 @@ std::string PeekPropertyName(const Element& element)
 } //! anon
 
 
-// ------------------------------------------------------------------------------------------------
-PropertyTable::PropertyTable()
-: templateProps()
-, element()
-{
-}
-
 // ------------------------------------------------------------------------------------------------
 PropertyTable::PropertyTable(const Element &element, std::shared_ptr<const PropertyTable> templateProps) :
         templateProps(std::move(templateProps)), element(&element) {
@@ -243,7 +231,6 @@ DirectPropertyMap PropertyTable::GetUnparsedProperties() const
 
         // Read the element's value.
         // Wrap the naked pointer (since the call site is required to acquire ownership)
-        // std::unique_ptr from C++11 would be preferred both as a wrapper and a return value.
         std::shared_ptr<Property> prop = std::shared_ptr<Property>(ReadTypedProperty(*currentElement.second));
 
         // Element could not be read. Skip it.
diff --git a/code/AssetLib/FBX/FBXProperties.h b/code/AssetLib/FBX/FBXProperties.h
index 18816117a..fa03026a3 100644
--- a/code/AssetLib/FBX/FBXProperties.h
+++ b/code/AssetLib/FBX/FBXProperties.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -56,34 +55,33 @@ namespace FBX {
 // Forward declarations
 class Element;
 
-/** Represents a dynamic property. Type info added by deriving classes,
- *  see #TypedProperty.
- Example:
- @verbatim
-   P: "ShininessExponent", "double", "Number", "",0.5
- @endvebatim
-*/
+/**
+ * Represents a dynamic property. Type info added by deriving classes,
+ * see #TypedProperty.
+ * Example:
+ *
+ * @verbatim
+ *  P: "ShininessExponent", "double", "Number", "",0.5
+ * @endvebatim
+ */
 class Property {
-protected:
-    Property();
 
 public:
-    virtual ~Property();
+    virtual ~Property() = default;
 
-public:
     template <typename T>
     const T* As() const {
         return dynamic_cast<const T*>(this);
     }
+
+protected:
+    Property() = default;
 };
 
 template<typename T>
 class TypedProperty : public Property {
 public:
-    explicit TypedProperty(const T& value)
-    : value(value) {
-        // empty
-    }
+    explicit TypedProperty(const T& value) : value(value) {}
 
     const T& Value() const {
         return value;
@@ -93,10 +91,9 @@ private:
     T value;
 };
 
-
-typedef std::fbx_unordered_map<std::string,std::shared_ptr<Property> > DirectPropertyMap;
-typedef std::fbx_unordered_map<std::string,const Property*>            PropertyMap;
-typedef std::fbx_unordered_map<std::string,const Element*>             LazyPropertyMap;
+using DirectPropertyMap = std::fbx_unordered_map<std::string,std::shared_ptr<Property> >;
+using PropertyMap = std::fbx_unordered_map<std::string,const Property*>;
+using LazyPropertyMap = std::fbx_unordered_map<std::string,const Element*>;
 
 /**
  *  Represents a property table as can be found in the newer FBX files (Properties60, Properties70)
@@ -104,7 +101,7 @@ typedef std::fbx_unordered_map<std::string,const Element*>             LazyPrope
 class PropertyTable {
 public:
     // in-memory property table with no source element
-    PropertyTable();
+    PropertyTable() : element() {}
     PropertyTable(const Element& element, std::shared_ptr<const PropertyTable> templateProps);
     ~PropertyTable();
 
@@ -130,8 +127,7 @@ private:
 
 // ------------------------------------------------------------------------------------------------
 template <typename T>
-inline
-T PropertyGet(const PropertyTable& in, const std::string& name, const T& defaultValue) {
+inline T PropertyGet(const PropertyTable& in, const std::string& name, const T& defaultValue) {
     const Property* const prop = in.Get(name);
     if( nullptr == prop) {
         return defaultValue;
@@ -148,8 +144,7 @@ T PropertyGet(const PropertyTable& in, const std::string& name, const T& default
 
 // ------------------------------------------------------------------------------------------------
 template <typename T>
-inline
-T PropertyGet(const PropertyTable& in, const std::string& name, bool& result, bool useTemplate=false ) {
+inline T PropertyGet(const PropertyTable& in, const std::string& name, bool& result, bool useTemplate=false ) {
     const Property* prop = in.Get(name);
     if( nullptr == prop) {
         if ( ! useTemplate ) {
diff --git a/code/AssetLib/FBX/FBXTokenizer.cpp b/code/AssetLib/FBX/FBXTokenizer.cpp
index 45d5e7750..3b3d69e40 100644
--- a/code/AssetLib/FBX/FBXTokenizer.cpp
+++ b/code/AssetLib/FBX/FBXTokenizer.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/FBX/FBXTokenizer.h b/code/AssetLib/FBX/FBXTokenizer.h
index 05a0725bd..8c5e546a0 100644
--- a/code/AssetLib/FBX/FBXTokenizer.h
+++ b/code/AssetLib/FBX/FBXTokenizer.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/FBX/FBXUtil.cpp b/code/AssetLib/FBX/FBXUtil.cpp
index e2903c536..354becac0 100644
--- a/code/AssetLib/FBX/FBXUtil.cpp
+++ b/code/AssetLib/FBX/FBXUtil.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/FBX/FBXUtil.h b/code/AssetLib/FBX/FBXUtil.h
index 4674a5054..311c89964 100644
--- a/code/AssetLib/FBX/FBXUtil.h
+++ b/code/AssetLib/FBX/FBXUtil.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -53,10 +52,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace Assimp {
 namespace FBX {
 
-
 namespace Util {
 
-
 /** helper for std::for_each to delete all heap-allocated items in a container */
 template<typename T>
 struct delete_fun
@@ -88,7 +85,6 @@ const char* TokenTypeString(TokenType t);
  *  @return A string of the following format: " (offset 0x{offset}) "*/
 std::string GetOffsetText(size_t offset);
 
-
 /** Format log/error messages using a given line location in the source file.
  *
  *  @param line Line index, 1-based
@@ -96,7 +92,6 @@ std::string GetOffsetText(size_t offset);
  *  @return A string of the following format: " (line {line}, col {column}) "*/
 std::string GetLineAndColumnText(unsigned int line, unsigned int column);
 
-
 /** Format log/error messages using a given cursor token.
  *
  *  @param tok Token where parsing/processing stopped
diff --git a/code/AssetLib/HMP/HMPFileData.h b/code/AssetLib/HMP/HMPFileData.h
index b297136ba..9fbe2b715 100644
--- a/code/AssetLib/HMP/HMPFileData.h
+++ b/code/AssetLib/HMP/HMPFileData.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -43,13 +42,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //! @file Data structures for the 3D Game Studio Heightmap format (HMP)
 //!
 
-namespace Assimp    {
-namespace HMP   {
+namespace Assimp {
+namespace HMP {
 
 #include <assimp/Compiler/pushpack1.h>
 #include <stdint.h>
 
-// to make it easier for us, we test the magic word against both "endianesses"
+// to make it easier for us, we test the magic word against both "endiannesses"
 #define AI_HMP_MAGIC_NUMBER_BE_4    AI_MAKE_MAGIC("HMP4")
 #define AI_HMP_MAGIC_NUMBER_LE_4    AI_MAKE_MAGIC("4PMH")
 
diff --git a/code/AssetLib/HMP/HMPLoader.cpp b/code/AssetLib/HMP/HMPLoader.cpp
index 5ccb2b474..26558edab 100644
--- a/code/AssetLib/HMP/HMPLoader.cpp
+++ b/code/AssetLib/HMP/HMPLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_HMP_IMPORTER
 
 // internal headers
-#include "AssetLib/HMP/HMPLoader.h"
+#include "HMPLoader.h"
 #include "AssetLib/MD2/MD2FileData.h"
 
 #include <assimp/StringUtils.h>
@@ -81,7 +81,7 @@ HMPImporter::~HMPImporter() = default;
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool HMPImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    static const uint32_t tokens[] = {
+    static constexpr uint32_t tokens[] = {
         AI_HMP_MAGIC_NUMBER_LE_4,
         AI_HMP_MAGIC_NUMBER_LE_5,
         AI_HMP_MAGIC_NUMBER_LE_7
@@ -163,8 +163,14 @@ void HMPImporter::ValidateHeader_HMP457() {
                                 "120 bytes, this file is smaller)");
     }
 
+    if (!std::isfinite(pcHeader->ftrisize_x) || !std::isfinite(pcHeader->ftrisize_y))
+        throw DeadlyImportError("Size of triangles in either x or y direction is not finite");
+
     if (!pcHeader->ftrisize_x || !pcHeader->ftrisize_y)
-        throw DeadlyImportError("Size of triangles in either  x or y direction is zero");
+        throw DeadlyImportError("Size of triangles in either x or y direction is zero");
+
+    if (!std::isfinite(pcHeader->fnumverts_x))
+        throw DeadlyImportError("Number of triangles in x direction is not finite");
 
     if (pcHeader->fnumverts_x < 1.0f || (pcHeader->numverts / pcHeader->fnumverts_x) < 1.0f)
         throw DeadlyImportError("Number of triangles in either x or y direction is zero");
diff --git a/code/AssetLib/HMP/HMPLoader.h b/code/AssetLib/HMP/HMPLoader.h
index 4d5f5f22f..adad9963e 100644
--- a/code/AssetLib/HMP/HMPLoader.h
+++ b/code/AssetLib/HMP/HMPLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/BaseImporter.h>
 
 // internal headers
-#include "AssetLib/HMP/HMPFileData.h"
+#include "HMPFileData.h"
 #include "AssetLib/MDL/MDLLoader.h"
 
 namespace Assimp {
diff --git a/code/AssetLib/HMP/HalfLifeFileData.h b/code/AssetLib/HMP/HalfLifeFileData.h
index f47862b7a..c3e890f74 100644
--- a/code/AssetLib/HMP/HalfLifeFileData.h
+++ b/code/AssetLib/HMP/HalfLifeFileData.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -53,8 +52,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/Compiler/pushpack1.h>
 
-namespace Assimp    {
-namespace MDL   {
+namespace Assimp {
+namespace MDL {
 
 // magic bytes used in Half Life 2 MDL models
 #define AI_MDL_MAGIC_NUMBER_BE_HL2a AI_MAKE_MAGIC("IDST")
diff --git a/code/AssetLib/IFC/IFCBoolean.cpp b/code/AssetLib/IFC/IFCBoolean.cpp
index f4d53990e..77128ac80 100644
--- a/code/AssetLib/IFC/IFCBoolean.cpp
+++ b/code/AssetLib/IFC/IFCBoolean.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
 
-#include "AssetLib/IFC/IFCUtil.h"
+#include "IFCUtil.h"
 #include "Common/PolyTools.h"
 #include "PostProcessing/ProcessHelper.h"
 
@@ -669,7 +669,7 @@ void ProcessPolygonalBoundedBooleanHalfSpaceDifference(const Schema_2x3::IfcPoly
 }
 
 // ------------------------------------------------------------------------------------------------
-void ProcessBooleanExtrudedAreaSolidDifference(const Schema_2x3::IfcExtrudedAreaSolid *as, 
+void ProcessBooleanExtrudedAreaSolidDifference(const Schema_2x3::IfcExtrudedAreaSolid *as,
         TempMesh &result,
         const TempMesh &first_operand,
         ConversionData &conv) {
diff --git a/code/AssetLib/IFC/IFCCurve.cpp b/code/AssetLib/IFC/IFCCurve.cpp
index 44165befc..35446a3fd 100644
--- a/code/AssetLib/IFC/IFCCurve.cpp
+++ b/code/AssetLib/IFC/IFCCurve.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -102,10 +102,10 @@ class Circle : public Conic {
 public:
     // --------------------------------------------------
     Circle(const Schema_2x3::IfcCircle& entity, ConversionData& conv) : Conic(entity,conv) , entity(entity) {}
-    
+
     // --------------------------------------------------
     ~Circle() override = default;
-    
+
     // --------------------------------------------------
     IfcVector3 Eval(IfcFloat u) const override {
         u = -conv.angle_scale * u;
diff --git a/code/AssetLib/IFC/IFCGeometry.cpp b/code/AssetLib/IFC/IFCGeometry.cpp
index 83afd2b59..d3666d5e7 100644
--- a/code/AssetLib/IFC/IFCGeometry.cpp
+++ b/code/AssetLib/IFC/IFCGeometry.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -127,7 +127,7 @@ void ProcessPolygonBoundaries(TempMesh& result, const TempMesh& inmesh, size_t m
             }
         }
     }
-	
+
     if (outer_polygon_it == end) {
 		return;
 	}
@@ -234,7 +234,7 @@ void ProcessRevolvedAreaSolid(const Schema_2x3::IfcRevolvedAreaSolid& solid, Tem
         return;
     }
 
-    const unsigned int cnt_segments = 
+    const unsigned int cnt_segments =
         std::max(2u,static_cast<unsigned int>(conv.settings.cylindricalTessellation * std::fabs(max_angle)/AI_MATH_HALF_PI_F));
     const IfcFloat delta = max_angle/cnt_segments;
 
@@ -294,8 +294,8 @@ void ProcessRevolvedAreaSolid(const Schema_2x3::IfcRevolvedAreaSolid& solid, Tem
 }
 
 // ------------------------------------------------------------------------------------------------
-void ProcessSweptDiskSolid(const Schema_2x3::IfcSweptDiskSolid &solid, 
-        TempMesh& result, 
+void ProcessSweptDiskSolid(const Schema_2x3::IfcSweptDiskSolid &solid,
+        TempMesh& result,
         ConversionData& conv) {
     const Curve* const curve = Curve::Convert(*solid.Directrix, conv);
     if(!curve) {
@@ -687,9 +687,9 @@ void ProcessExtrudedArea(const Schema_2x3::IfcExtrudedAreaSolid& solid, const Te
 }
 
 // ------------------------------------------------------------------------------------------------
-void ProcessExtrudedAreaSolid(const Schema_2x3::IfcExtrudedAreaSolid& solid, 
+void ProcessExtrudedAreaSolid(const Schema_2x3::IfcExtrudedAreaSolid& solid,
         TempMesh& result,
-        ConversionData& conv, 
+        ConversionData& conv,
         bool collect_openings) {
     TempMesh meshout;
 
@@ -728,7 +728,7 @@ void ProcessExtrudedAreaSolid(const Schema_2x3::IfcExtrudedAreaSolid& solid,
 }
 
 // ------------------------------------------------------------------------------------------------
-void ProcessSweptAreaSolid(const Schema_2x3::IfcSweptAreaSolid& swept, 
+void ProcessSweptAreaSolid(const Schema_2x3::IfcSweptAreaSolid& swept,
         TempMesh& meshout,
         ConversionData& conv) {
     if(const Schema_2x3::IfcExtrudedAreaSolid* const solid = swept.ToPtr<Schema_2x3::IfcExtrudedAreaSolid>()) {
@@ -741,8 +741,8 @@ void ProcessSweptAreaSolid(const Schema_2x3::IfcSweptAreaSolid& swept,
 }
 
 // ------------------------------------------------------------------------------------------------
-bool ProcessGeometricItem(const Schema_2x3::IfcRepresentationItem& geo, 
-        unsigned int matid, 
+bool ProcessGeometricItem(const Schema_2x3::IfcRepresentationItem& geo,
+        unsigned int matid,
         std::set<unsigned int>& mesh_indices,
         ConversionData& conv) {
     bool fix_orientation = false;
@@ -841,7 +841,7 @@ void AssignAddedMeshes(std::set<unsigned int>& mesh_indices,aiNode* nd, Conversi
 
 // ------------------------------------------------------------------------------------------------
 bool TryQueryMeshCache(const Schema_2x3::IfcRepresentationItem& item,
-        std::set<unsigned int>& mesh_indices, 
+        std::set<unsigned int>& mesh_indices,
         unsigned int mat_index,
         ConversionData& conv) {
     ConversionData::MeshCacheIndex idx(&item, mat_index);
@@ -855,7 +855,7 @@ bool TryQueryMeshCache(const Schema_2x3::IfcRepresentationItem& item,
 
 // ------------------------------------------------------------------------------------------------
 void PopulateMeshCache(const Schema_2x3::IfcRepresentationItem& item,
-        const std::set<unsigned int>& mesh_indices, 
+        const std::set<unsigned int>& mesh_indices,
         unsigned int mat_index,
         ConversionData& conv) {
     ConversionData::MeshCacheIndex idx(&item, mat_index);
@@ -863,7 +863,7 @@ void PopulateMeshCache(const Schema_2x3::IfcRepresentationItem& item,
 }
 
 // ------------------------------------------------------------------------------------------------
-bool ProcessRepresentationItem(const Schema_2x3::IfcRepresentationItem& item, 
+bool ProcessRepresentationItem(const Schema_2x3::IfcRepresentationItem& item,
         unsigned int matid,
         std::set<unsigned int>& mesh_indices,
         ConversionData& conv) {
diff --git a/code/AssetLib/IFC/IFCLoader.cpp b/code/AssetLib/IFC/IFCLoader.cpp
index c919d9982..373752609 100644
--- a/code/AssetLib/IFC/IFCLoader.cpp
+++ b/code/AssetLib/IFC/IFCLoader.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -220,7 +220,7 @@ void IFCImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     std::unique_ptr<STEP::DB> db(STEP::ReadFileHeader(std::move(stream)));
     const STEP::HeaderInfo &head = static_cast<const STEP::DB &>(*db).GetHeader();
 
-    if (!head.fileSchema.size() || head.fileSchema.substr(0, 3) != "IFC") {
+    if (!head.fileSchema.size() || head.fileSchema.substr(0, 4) != "IFC2") {
         ThrowException("Unrecognized file schema: " + head.fileSchema);
     }
 
@@ -245,11 +245,11 @@ void IFCImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 
     // tell the reader for which types we need to simulate STEPs reverse indices
     static const char *const inverse_indices_to_track[] = {
-        "ifcrelcontainedinspatialstructure", 
-        "ifcrelaggregates", 
-        "ifcrelvoidselement", 
-        "ifcreldefinesbyproperties", 
-        "ifcpropertyset", 
+        "ifcrelcontainedinspatialstructure",
+        "ifcrelaggregates",
+        "ifcrelvoidselement",
+        "ifcreldefinesbyproperties",
+        "ifcpropertyset",
         "ifcstyleditem"
     };
 
@@ -352,6 +352,11 @@ void ConvertUnit(const ::Assimp::STEP::EXPRESS::DataType &dt, ConversionData &co
 
 // ------------------------------------------------------------------------------------------------
 void SetUnits(ConversionData &conv) {
+    if (conv.proj.UnitsInContext == nullptr) {
+        IFCImporter::LogError("Skipping conversion data, nullptr.");
+        return;
+    }
+
     // see if we can determine the coordinate space used to express.
     for (size_t i = 0; i < conv.proj.UnitsInContext->Units.size(); ++i) {
         ConvertUnit(*conv.proj.UnitsInContext->Units[i], conv);
diff --git a/code/AssetLib/IFC/IFCLoader.h b/code/AssetLib/IFC/IFCLoader.h
index 9651b633a..e4e3b4103 100644
--- a/code/AssetLib/IFC/IFCLoader.h
+++ b/code/AssetLib/IFC/IFCLoader.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/IFC/IFCMaterial.cpp b/code/AssetLib/IFC/IFCMaterial.cpp
index 0b7b83e7c..f3e9ee5de 100644
--- a/code/AssetLib/IFC/IFCMaterial.cpp
+++ b/code/AssetLib/IFC/IFCMaterial.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/IFC/IFCOpenings.cpp b/code/AssetLib/IFC/IFCOpenings.cpp
index c47446dda..068ef400f 100644
--- a/code/AssetLib/IFC/IFCOpenings.cpp
+++ b/code/AssetLib/IFC/IFCOpenings.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -69,7 +69,7 @@ AI_FORCE_INLINE ulong64 to_int64(IfcFloat p) {
 
 AI_FORCE_INLINE IfcFloat from_int64(ulong64 p) {
     return (static_cast<IfcFloat>((p)) / max_ulong64);
-} 
+}
 
 AI_FORCE_INLINE void fillRectangle(const IfcVector2& pmin, const IfcVector2& pmax, std::vector<IfcVector2>& out) {
     out.emplace_back(pmin.x, pmin.y);
@@ -176,7 +176,7 @@ struct ProjectedWindowContour {
     SkipList skiplist;
     bool is_rectangular;
 
-    ProjectedWindowContour(const Contour& contour, const BoundingBox& bb, bool is_rectangular) 
+    ProjectedWindowContour(const Contour& contour, const BoundingBox& bb, bool is_rectangular)
             : contour(contour), bb(bb) , is_rectangular(is_rectangular) {}
 
     ~ProjectedWindowContour() = default;
@@ -215,7 +215,7 @@ static bool IsDuplicateVertex(const IfcVector2& vv, const std::vector<IfcVector2
 }
 
 // ------------------------------------------------------------------------------------------------
-void ExtractVerticesFromClipper(const ClipperLib::Path& poly, std::vector<IfcVector2>& temp_contour, 
+void ExtractVerticesFromClipper(const ClipperLib::Path& poly, std::vector<IfcVector2>& temp_contour,
         bool filter_duplicates = false) {
     temp_contour.clear();
     for(const ClipperLib::IntPoint& point : poly) {
@@ -362,7 +362,7 @@ void InsertWindowContours(const ContourVector& contours, const std::vector<TempO
 }
 
 // ------------------------------------------------------------------------------------------------
-void MergeWindowContours (const std::vector<IfcVector2>& a, const std::vector<IfcVector2>& b, 
+void MergeWindowContours (const std::vector<IfcVector2>& a, const std::vector<IfcVector2>& b,
         ClipperLib::Paths& out) {
     out.clear();
 
@@ -988,16 +988,16 @@ void Quadrify(const ContourVector& contours, TempMesh& curmesh) {
 }
 
 // ------------------------------------------------------------------------------------------------
-IfcMatrix4 ProjectOntoPlane(std::vector<IfcVector2>& out_contour, 
+IfcMatrix4 ProjectOntoPlane(std::vector<IfcVector2>& out_contour,
         const TempMesh& in_mesh,
-        bool &ok, 
+        bool &ok,
         IfcVector3& nor_out) {
     const std::vector<IfcVector3>& in_verts = in_mesh.mVerts;
     if (in_verts.empty()){
         ok = false;
         return IfcMatrix4();
     }
-    
+
     ok = true;
     IfcMatrix4 m = IfcMatrix4(DerivePlaneCoordinateSpace(in_mesh, ok, nor_out));
     if(!ok) {
diff --git a/code/AssetLib/IFC/IFCProfile.cpp b/code/AssetLib/IFC/IFCProfile.cpp
index 0e4670560..599e6584d 100644
--- a/code/AssetLib/IFC/IFCProfile.cpp
+++ b/code/AssetLib/IFC/IFCProfile.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -50,8 +50,8 @@ namespace Assimp {
 namespace IFC {
 
 // ------------------------------------------------------------------------------------------------
-void ProcessPolyLine(const Schema_2x3::IfcPolyline& def, 
-        TempMesh& meshout, 
+void ProcessPolyLine(const Schema_2x3::IfcPolyline& def,
+        TempMesh& meshout,
         ConversionData& /*conv*/) {
     // this won't produce a valid mesh, it just spits out a list of vertices
     IfcVector3 t;
@@ -63,8 +63,8 @@ void ProcessPolyLine(const Schema_2x3::IfcPolyline& def,
 }
 
 // ------------------------------------------------------------------------------------------------
-bool ProcessCurve(const Schema_2x3::IfcCurve& curve,  
-        TempMesh& meshout, 
+bool ProcessCurve(const Schema_2x3::IfcCurve& curve,
+        TempMesh& meshout,
         ConversionData& conv) {
     std::unique_ptr<const Curve> cv(Curve::Convert(curve,conv));
     if (!cv) {
@@ -90,22 +90,22 @@ bool ProcessCurve(const Schema_2x3::IfcCurve& curve,
 }
 
 // ------------------------------------------------------------------------------------------------
-void ProcessClosedProfile(const Schema_2x3::IfcArbitraryClosedProfileDef& def, 
-        TempMesh& meshout, 
+void ProcessClosedProfile(const Schema_2x3::IfcArbitraryClosedProfileDef& def,
+        TempMesh& meshout,
         ConversionData& conv) {
     ProcessCurve(def.OuterCurve,meshout,conv);
 }
 
 // ------------------------------------------------------------------------------------------------
-void ProcessOpenProfile(const Schema_2x3::IfcArbitraryOpenProfileDef& def, 
-        TempMesh& meshout, 
+void ProcessOpenProfile(const Schema_2x3::IfcArbitraryOpenProfileDef& def,
+        TempMesh& meshout,
         ConversionData& conv) {
     ProcessCurve(def.Curve,meshout,conv);
 }
 
 // ------------------------------------------------------------------------------------------------
-void ProcessParametrizedProfile(const Schema_2x3::IfcParameterizedProfileDef& def, 
-        TempMesh& meshout, 
+void ProcessParametrizedProfile(const Schema_2x3::IfcParameterizedProfileDef& def,
+        TempMesh& meshout,
         ConversionData& conv) {
     if(const Schema_2x3::IfcRectangleProfileDef* const cprofile = def.ToPtr<Schema_2x3::IfcRectangleProfileDef>()) {
         const IfcFloat x = cprofile->XDim*0.5f, y = cprofile->YDim*0.5f;
diff --git a/code/AssetLib/IFC/IFCReaderGen1_2x3.cpp b/code/AssetLib/IFC/IFCReaderGen1_2x3.cpp
index 73e3c91d8..c625f1daf 100644
--- a/code/AssetLib/IFC/IFCReaderGen1_2x3.cpp
+++ b/code/AssetLib/IFC/IFCReaderGen1_2x3.cpp
@@ -2725,6 +2725,10 @@ template <> size_t GenericFill<IfcSpatialStructureElement>(const DB& db, const L
     do { // convert the 'CompositionType' argument
         std::shared_ptr<const DataType> arg = params[base++];
         if (dynamic_cast<const ISDERIVED*>(&*arg)) { in->ObjectHelper<Assimp::IFC::Schema_2x3::IfcSpatialStructureElement,2>::aux_is_derived[1]=true; break; }
+        if (dynamic_cast<const UNSET *>(&*arg)) {
+            // Consider assigning the default value as in->CompositionType = "ELEMENT".
+            break;
+        }
         try { GenericConvert( in->CompositionType, arg, db ); break; }
         catch (const TypeError& t) { throw TypeError(t.what() + std::string(" - expected argument 8 to IfcSpatialStructureElement to be a `IfcElementCompositionEnum`")); }
     } while (false);
diff --git a/code/AssetLib/IFC/IFCUtil.cpp b/code/AssetLib/IFC/IFCUtil.cpp
index 27f3141c8..bf24d4fff 100644
--- a/code/AssetLib/IFC/IFCUtil.cpp
+++ b/code/AssetLib/IFC/IFCUtil.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
 
-#include "AssetLib/IFC/IFCUtil.h"
+#include "IFCUtil.h"
 #include "Common/PolyTools.h"
 #include "Geometry/GeometryUtils.h"
 #include "PostProcessing/ProcessHelper.h"
@@ -375,7 +375,7 @@ void TempMesh::RemoveAdjacentDuplicates() {
         ArrayBounds(&*base, cnt ,vmin,vmax);
 
         const IfcFloat epsilon = (vmax-vmin).SquareLength() / static_cast<IfcFloat>(1e9);
-        
+
         // drop any identical, adjacent vertices. this pass will collect the dropouts
         // of the previous pass as a side-effect.
         FuzzyVectorCompare fz(epsilon);
@@ -461,7 +461,7 @@ void ConvertColor(aiColor4D& out, const Schema_2x3::IfcColourRgb& in) {
 }
 
 // ------------------------------------------------------------------------------------------------
-void ConvertColor(aiColor4D& out, 
+void ConvertColor(aiColor4D& out,
         const Schema_2x3::IfcColourOrFactor& in,
         ConversionData& conv,
         const aiColor4D* base) {
diff --git a/code/AssetLib/IFC/IFCUtil.h b/code/AssetLib/IFC/IFCUtil.h
index f9063ce22..d5f076bf4 100644
--- a/code/AssetLib/IFC/IFCUtil.h
+++ b/code/AssetLib/IFC/IFCUtil.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -47,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_IFCUTIL_H
 #define INCLUDED_IFCUTIL_H
 
-#include "AssetLib/IFC/IFCReaderGen_2x3.h"
-#include "AssetLib/IFC/IFCLoader.h"
+#include "IFCReaderGen_2x3.h"
+#include "IFCLoader.h"
 #include "AssetLib/Step/STEPFile.h"
 
 #include <assimp/mesh.h>
diff --git a/code/AssetLib/Irr/IRRLoader.cpp b/code/AssetLib/Irr/IRRLoader.cpp
index 99e053892..3b345990e 100644
--- a/code/AssetLib/Irr/IRRLoader.cpp
+++ b/code/AssetLib/Irr/IRRLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "assimp/StringComparison.h"
 #ifndef ASSIMP_BUILD_NO_IRR_IMPORTER
 
-#include "AssetLib/Irr/IRRLoader.h"
+#include "IRRLoader.h"
 #include "Common/Importer.h"
 
 #include <assimp/GenericProperty.h>
@@ -168,7 +168,7 @@ void IRRImporter::BuildSkybox(std::vector<aiMesh *> &meshes, std::vector<aiMater
         aiMaterial *out = (aiMaterial *)(*(materials.end() - (6 - i)));
 
         aiString s;
-        s.length = ::ai_snprintf(s.data, MAXLEN, "SkyboxSide_%u", i);
+        s.length = ::ai_snprintf(s.data, AI_MAXLEN, "SkyboxSide_%u", i);
         out->AddProperty(&s, AI_MATKEY_NAME);
 
         int shading = aiShadingMode_NoShading;
@@ -316,7 +316,7 @@ void IRRImporter::ComputeAnimations(Node *root, aiNode *real, std::vector<aiNode
         if (cur != total - 1) {
             // Build a new name - a prefix instead of a suffix because it is
             // easier to check against
-            anim->mNodeName.length = ::ai_snprintf(anim->mNodeName.data, MAXLEN,
+            anim->mNodeName.length = ::ai_snprintf(anim->mNodeName.data, AI_MAXLEN,
                     "$INST_DUMMY_%i_%s", total - 1,
                     (root->name.length() ? root->name.c_str() : ""));
 
@@ -1234,7 +1234,10 @@ void IRRImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     // Parse the XML
     // Find the scene root from document root.
     const pugi::xml_node &sceneRoot = documentRoot.child("irr_scene");
-    if (!sceneRoot) throw new DeadlyImportError("IRR: <irr_scene> not found in file");
+    if (!sceneRoot) {
+        delete root;
+        throw new DeadlyImportError("IRR: <irr_scene> not found in file");
+    }
     for (pugi::xml_node &child : sceneRoot.children()) {
         // XML elements are either nodes, animators, attributes, or materials
         if (!ASSIMP_stricmp(child.name(), "node")) {
diff --git a/code/AssetLib/Irr/IRRLoader.h b/code/AssetLib/Irr/IRRLoader.h
index 72ad5d35e..170534f84 100644
--- a/code/AssetLib/Irr/IRRLoader.h
+++ b/code/AssetLib/Irr/IRRLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_IRRLOADER_H_INCLUDED
 #define AI_IRRLOADER_H_INCLUDED
 
-#include "AssetLib/Irr/IRRShared.h"
+#include "IRRShared.h"
 #include "Common/Importer.h"
 
 #include <assimp/SceneCombiner.h>
diff --git a/code/AssetLib/Irr/IRRMeshLoader.cpp b/code/AssetLib/Irr/IRRMeshLoader.cpp
index b35a95c12..c2b0ea711 100644
--- a/code/AssetLib/Irr/IRRMeshLoader.cpp
+++ b/code/AssetLib/Irr/IRRMeshLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -69,14 +69,6 @@ static constexpr aiImporterDesc desc = {
     "xml irrmesh"
 };
 
-// ------------------------------------------------------------------------------------------------
-// Constructor to be privately used by Importer
-IRRMeshImporter::IRRMeshImporter() = default;
-
-// ------------------------------------------------------------------------------------------------
-// Destructor, private as well
-IRRMeshImporter::~IRRMeshImporter() = default;
-
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool IRRMeshImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
@@ -116,8 +108,9 @@ void IRRMeshImporter::InternReadFile(const std::string &pFile,
     std::unique_ptr<IOStream> file(pIOHandler->Open(pFile));
 
     // Check whether we can read from the file
-    if (file == nullptr)
+    if (file == nullptr) {
         throw DeadlyImportError("Failed to open IRRMESH file ", pFile);
+    }
 
     // Construct the irrXML parser
     XmlParser parser;
@@ -148,13 +141,11 @@ void IRRMeshImporter::InternReadFile(const std::string &pFile,
     // int vertexFormat = 0; // 0 = normal; 1 = 2 tcoords, 2 = tangents
     bool useColors = false;
 
-    /*
-    ** irrmesh files have a top level <mesh> owning multiple <buffer> nodes.
-    ** Each <buffer> contains <material>, <vertices>, and <indices>
-    ** <material> tags here directly owns the material data specs
-    ** <vertices> are a vertex per line, contains position, UV1 coords, maybe UV2, normal, tangent, bitangent
-    ** <boundingbox> is ignored, I think assimp recalculates those?
-    */
+    // irrmesh files have a top level <mesh> owning multiple <buffer> nodes.
+    // Each <buffer> contains <material>, <vertices>, and <indices>
+    // <material> tags here directly owns the material data specs
+    // <vertices> are a vertex per line, contains position, UV1 coords, maybe UV2, normal, tangent, bitangent
+    // <boundingbox> is ignored, I think assimp recalculates those?
 
     // Parse the XML file
     pugi::xml_node const &meshNode = root.child("mesh");
@@ -201,7 +192,6 @@ void IRRMeshImporter::InternReadFile(const std::string &pFile,
                 // This is possible ... remove the mesh from the list and skip further reading
                 ASSIMP_LOG_WARN("IRRMESH: Found mesh with zero vertices");
                 releaseMaterial(&curMat);
-                // releaseMesh(&curMesh);
                 continue; // Bail out early
             };
 
@@ -250,7 +240,9 @@ void IRRMeshImporter::InternReadFile(const std::string &pFile,
             };
 
             // We know what format buffer is, collect numbers
-            ParseBufferVertices(verticesNode.text().get(), vertexFormat,
+            std::string v = verticesNode.text().get();
+            const char *end = v.c_str() + v.size();
+            ParseBufferVertices(v.c_str(), end, vertexFormat,
                     curVertices, curNormals,
                     curTangents, curBitangents,
                     curUVs, curUV2s, curColors, useColors);
@@ -329,8 +321,10 @@ void IRRMeshImporter::InternReadFile(const std::string &pFile,
 
             // NOTE this might explode for UTF-16 and wchars
             const char *sz = indicesNode.text().get();
+            const char *end = sz + std::strlen(sz);
+
             // For each index loop over aiMesh faces
-            while (SkipSpacesAndLineEnd(&sz)) {
+            while (SkipSpacesAndLineEnd(&sz, end)) {
                 if (curFace >= faceEnd) {
                     ASSIMP_LOG_ERROR("IRRMESH: Too many indices");
                     break;
@@ -354,12 +348,18 @@ void IRRMeshImporter::InternReadFile(const std::string &pFile,
 
                 // Copy over data to aiMesh
                 *pcV++ = curVertices[idx];
-                if (pcN) *pcN++ = curNormals[idx];
-                if (pcT) *pcT++ = curTangents[idx];
-                if (pcB) *pcB++ = curBitangents[idx];
-                if (pcC0) *pcC0++ = curColors[idx];
-                if (pcT0) *pcT0++ = curUVs[idx];
-                if (pcT1) *pcT1++ = curUV2s[idx];
+                if (pcN)
+                    *pcN++ = curNormals[idx];
+                if (pcT)
+                    *pcT++ = curTangents[idx];
+                if (pcB)
+                    *pcB++ = curBitangents[idx];
+                if (pcC0)
+                    *pcC0++ = curColors[idx];
+                if (pcT0)
+                    *pcT0++ = curUVs[idx];
+                if (pcT1)
+                    *pcT1++ = curUV2s[idx];
 
                 // start new face
                 if (++curIdx == 3) {
@@ -368,8 +368,9 @@ void IRRMeshImporter::InternReadFile(const std::string &pFile,
                 }
             }
             // We should be at the end of mFaces
-            if (curFace != faceEnd)
+            if (curFace != faceEnd) {
                 ASSIMP_LOG_ERROR("IRRMESH: Not enough indices");
+            }
         }
 
         // Finish processing the mesh - do some small material workarounds
@@ -379,7 +380,6 @@ void IRRMeshImporter::InternReadFile(const std::string &pFile,
             aiMaterial *mat = (aiMaterial *)curMat;
             mat->AddProperty(&curColors[0].a, 1, AI_MATKEY_OPACITY);
         }
-        // textMeaning = 2;
 
         // end of previous buffer. A material and a mesh should be there
         if (!curMat || !curMesh) {
@@ -421,37 +421,37 @@ void IRRMeshImporter::InternReadFile(const std::string &pFile,
     };
 }
 
-void IRRMeshImporter::ParseBufferVertices(const char *sz, VertexFormat vertexFormat,
+void IRRMeshImporter::ParseBufferVertices(const char *sz, const char *end, VertexFormat vertexFormat,
         std::vector<aiVector3D> &vertices, std::vector<aiVector3D> &normals,
         std::vector<aiVector3D> &tangents, std::vector<aiVector3D> &bitangents,
         std::vector<aiVector3D> &UVs, std::vector<aiVector3D> &UV2s,
         std::vector<aiColor4D> &colors, bool &useColors) {
     // read vertices
     do {
-        SkipSpacesAndLineEnd(&sz);
+        SkipSpacesAndLineEnd(&sz, end);
         aiVector3D temp;
         aiColor4D c;
 
         // Read the vertex position
         sz = fast_atoreal_move<float>(sz, (float &)temp.x);
-        SkipSpaces(&sz);
+        SkipSpaces(&sz, end);
 
         sz = fast_atoreal_move<float>(sz, (float &)temp.y);
-        SkipSpaces(&sz);
+        SkipSpaces(&sz, end);
 
         sz = fast_atoreal_move<float>(sz, (float &)temp.z);
-        SkipSpaces(&sz);
+        SkipSpaces(&sz, end);
         vertices.push_back(temp);
 
         // Read the vertex normals
         sz = fast_atoreal_move<float>(sz, (float &)temp.x);
-        SkipSpaces(&sz);
+        SkipSpaces(&sz, end);
 
         sz = fast_atoreal_move<float>(sz, (float &)temp.y);
-        SkipSpaces(&sz);
+        SkipSpaces(&sz, end);
 
         sz = fast_atoreal_move<float>(sz, (float &)temp.z);
-        SkipSpaces(&sz);
+        SkipSpaces(&sz, end);
         normals.push_back(temp);
 
         // read the vertex colors
@@ -463,14 +463,14 @@ void IRRMeshImporter::ParseBufferVertices(const char *sz, VertexFormat vertexFor
             useColors = true;
 
         colors.push_back(c);
-        SkipSpaces(&sz);
+        SkipSpaces(&sz, end);
 
         // read the first UV coordinate set
         sz = fast_atoreal_move<float>(sz, (float &)temp.x);
-        SkipSpaces(&sz);
+        SkipSpaces(&sz, end);
 
         sz = fast_atoreal_move<float>(sz, (float &)temp.y);
-        SkipSpaces(&sz);
+        SkipSpaces(&sz, end);
         temp.z = 0.f;
         temp.y = 1.f - temp.y; // DX to OGL
         UVs.push_back(temp);
@@ -480,7 +480,7 @@ void IRRMeshImporter::ParseBufferVertices(const char *sz, VertexFormat vertexFor
         // read the (optional) second UV coordinate set
         if (vertexFormat == VertexFormat::t2coord) {
             sz = fast_atoreal_move<float>(sz, (float &)temp.x);
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, end);
 
             sz = fast_atoreal_move<float>(sz, (float &)temp.y);
             temp.y = 1.f - temp.y; // DX to OGL
@@ -490,33 +490,32 @@ void IRRMeshImporter::ParseBufferVertices(const char *sz, VertexFormat vertexFor
         else if (vertexFormat == VertexFormat::tangent) {
             // tangents
             sz = fast_atoreal_move<float>(sz, (float &)temp.x);
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, end);
 
             sz = fast_atoreal_move<float>(sz, (float &)temp.z);
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, end);
 
             sz = fast_atoreal_move<float>(sz, (float &)temp.y);
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, end);
             temp.y *= -1.0f;
             tangents.push_back(temp);
 
             // bitangents
             sz = fast_atoreal_move<float>(sz, (float &)temp.x);
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, end);
 
             sz = fast_atoreal_move<float>(sz, (float &)temp.z);
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, end);
 
             sz = fast_atoreal_move<float>(sz, (float &)temp.y);
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, end);
             temp.y *= -1.0f;
             bitangents.push_back(temp);
         }
-    } while (SkipLine(&sz));
-    /* IMPORTANT: We assume that each vertex is specified in one
-    line. So we can skip the rest of the line - unknown vertex
-    elements are ignored.
-    */
+    } while (SkipLine(&sz, end));
+    // IMPORTANT: We assume that each vertex is specified in one
+    // line. So we can skip the rest of the line - unknown vertex
+    // elements are ignored.
 }
 
 #endif // !! ASSIMP_BUILD_NO_IRRMESH_IMPORTER
diff --git a/code/AssetLib/Irr/IRRMeshLoader.h b/code/AssetLib/Irr/IRRMeshLoader.h
index 620e40dba..df760fe9e 100644
--- a/code/AssetLib/Irr/IRRMeshLoader.h
+++ b/code/AssetLib/Irr/IRRMeshLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -62,8 +62,11 @@ namespace Assimp {
  */
 class IRRMeshImporter : public BaseImporter, public IrrlichtBase {
 public:
-    IRRMeshImporter();
-    ~IRRMeshImporter() override;
+    /// @brief The class constructor.
+    IRRMeshImporter() = default;
+
+    /// @brief The class destructor.
+    ~IRRMeshImporter() override = default;
 
     // -------------------------------------------------------------------
     /** Returns whether the class can handle the format of the given file.
@@ -93,7 +96,7 @@ private:
         tangent = 2, // "tangents" - standard + tangents and bitangents
     };
 
-    void ParseBufferVertices(const char *sz, VertexFormat vertexFormat,
+    void ParseBufferVertices(const char *sz, const char *end, VertexFormat vertexFormat,
             std::vector<aiVector3D> &vertices, std::vector<aiVector3D> &normals,
             std::vector<aiVector3D> &tangents, std::vector<aiVector3D> &bitangents,
             std::vector<aiVector3D> &UVs, std::vector<aiVector3D> &UV2s,
diff --git a/code/AssetLib/Irr/IRRShared.cpp b/code/AssetLib/Irr/IRRShared.cpp
index a47aeccba..85ce432a4 100644
--- a/code/AssetLib/Irr/IRRShared.cpp
+++ b/code/AssetLib/Irr/IRRShared.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -135,21 +135,23 @@ void IrrlichtBase::ReadVectorProperty(VectorProperty &out, pugi::xml_node& vecto
         } else if (!ASSIMP_stricmp(attrib.name(), "value")) {
             // three floats, separated with commas
             const char *ptr = attrib.value();
+            size_t len = std::strlen(ptr);
+            const char *end = ptr + len;
 
-            SkipSpaces(&ptr);
+            SkipSpaces(&ptr, end);
             ptr = fast_atoreal_move<float>(ptr, (float &)out.value.x);
-            SkipSpaces(&ptr);
+            SkipSpaces(&ptr, end);
             if (',' != *ptr) {
                 ASSIMP_LOG_ERROR("IRR(MESH): Expected comma in vector definition");
             } else {
-                SkipSpaces(ptr + 1, &ptr);
+                SkipSpaces(ptr + 1, &ptr, end);
             }
             ptr = fast_atoreal_move<float>(ptr, (float &)out.value.y);
-            SkipSpaces(&ptr);
+            SkipSpaces(&ptr, end);
             if (',' != *ptr) {
                 ASSIMP_LOG_ERROR("IRR(MESH): Expected comma in vector definition");
             } else {
-                SkipSpaces(ptr + 1, &ptr);
+                SkipSpaces(ptr + 1, &ptr, end);
             }
             ptr = fast_atoreal_move<float>(ptr, (float &)out.value.z);
         }
diff --git a/code/AssetLib/LWO/LWOAnimation.cpp b/code/AssetLib/LWO/LWOAnimation.cpp
index 8dda4586f..f6cfd6a85 100644
--- a/code/AssetLib/LWO/LWOAnimation.cpp
+++ b/code/AssetLib/LWO/LWOAnimation.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -212,7 +212,7 @@ void AnimResolver::UpdateAnimRangeSetup() {
             unsigned int tt = 1;
             for (const double tmp = delta * (num + 1); cur_minus <= tmp; cur_minus += delta, ++tt) {
                 m = (delta == tmp ? (*it).keys.begin() : n - (old_size + 1));
-                for (; m != n; --n) {
+                for (; m < n; --n) {
                     (*n).time -= cur_minus;
 
                     // offset repeat? add delta offset to key value
diff --git a/code/AssetLib/LWO/LWOAnimation.h b/code/AssetLib/LWO/LWOAnimation.h
index 1e419d461..e4f73b562 100644
--- a/code/AssetLib/LWO/LWOAnimation.h
+++ b/code/AssetLib/LWO/LWOAnimation.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/LWO/LWOBLoader.cpp b/code/AssetLib/LWO/LWOBLoader.cpp
index 4a9792b79..975d80051 100644
--- a/code/AssetLib/LWO/LWOBLoader.cpp
+++ b/code/AssetLib/LWO/LWOBLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
@@ -78,7 +78,7 @@ void LWOImporter::LoadLWOBFile() {
                     else
                         LoadLWOBPolygons(head.length);
                 } break;
-                
+
             case AI_LWO_SRFS: // list of tags
                 {
                     if (!mTags->empty())
@@ -152,7 +152,7 @@ void LWOImporter::CountVertsAndFacesLWOB(unsigned int& verts, unsigned int& face
 }
 
 // ------------------------------------------------------------------------------------------------
-void LWOImporter::CopyFaceIndicesLWOB(FaceList::iterator& it,
+void LWOImporter::CopyFaceIndicesLWOB(FaceList::iterator &it,
     LE_NCONST uint16_t*& cursor,
     const uint16_t* const end,
     unsigned int max) {
diff --git a/code/AssetLib/LWO/LWOFileData.h b/code/AssetLib/LWO/LWOFileData.h
index 656dd4529..ce039dca6 100644
--- a/code/AssetLib/LWO/LWOFileData.h
+++ b/code/AssetLib/LWO/LWOFileData.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/LWO/LWOLoader.cpp b/code/AssetLib/LWO/LWOLoader.cpp
index 7e93b65f8..5843dfc68 100644
--- a/code/AssetLib/LWO/LWOLoader.cpp
+++ b/code/AssetLib/LWO/LWOLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_LWO_IMPORTER
 
 // internal headers
-#include "AssetLib/LWO/LWOLoader.h"
+#include "LWOLoader.h"
 #include "PostProcessing/ConvertToLHProcess.h"
 #include "PostProcessing/ProcessHelper.h"
 #include "Geometry/GeometryUtils.h"
@@ -104,7 +104,7 @@ LWOImporter::~LWOImporter() = default;
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool LWOImporter::CanRead(const std::string &file, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    static const uint32_t tokens[] = {
+    static constexpr uint32_t tokens[] = {
         AI_LWO_FOURCC_LWOB,
         AI_LWO_FOURCC_LWO2,
         AI_LWO_FOURCC_LXOB
@@ -527,6 +527,7 @@ void LWOImporter::ComputeNormals(aiMesh *mesh, const std::vector<unsigned int> &
                         continue;
                     vNormals += v;
                 }
+                mesh->mNormals[idx] = vNormals.Normalize();
             }
         }
     }
@@ -547,6 +548,7 @@ void LWOImporter::ComputeNormals(aiMesh *mesh, const std::vector<unsigned int> &
                     const aiVector3D &v = faceNormals[*a];
                     vNormals += v;
                 }
+                vNormals.Normalize();
                 for (std::vector<unsigned int>::const_iterator a = poResult.begin(); a != poResult.end(); ++a) {
                     mesh->mNormals[*a] = vNormals;
                     vertexDone[*a] = true;
diff --git a/code/AssetLib/LWO/LWOLoader.h b/code/AssetLib/LWO/LWOLoader.h
index 9e116a3cc..f03d41dab 100644
--- a/code/AssetLib/LWO/LWOLoader.h
+++ b/code/AssetLib/LWO/LWOLoader.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/LWO/LWOMaterial.cpp b/code/AssetLib/LWO/LWOMaterial.cpp
index 8d83dfb67..34f1dd152 100644
--- a/code/AssetLib/LWO/LWOMaterial.cpp
+++ b/code/AssetLib/LWO/LWOMaterial.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/code/AssetLib/LWS/LWSLoader.cpp b/code/AssetLib/LWS/LWSLoader.cpp
index dec834495..44465dd85 100644
--- a/code/AssetLib/LWS/LWSLoader.cpp
+++ b/code/AssetLib/LWS/LWSLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_LWS_IMPORTER
 
-#include "AssetLib/LWS/LWSLoader.h"
+#include "LWSLoader.h"
 #include "Common/Importer.h"
 #include "PostProcessing/ConvertToLHProcess.h"
 
@@ -78,14 +78,22 @@ static constexpr aiImporterDesc desc = {
 
 // ------------------------------------------------------------------------------------------------
 // Recursive parsing of LWS files
-void LWS::Element::Parse(const char *&buffer) {
-    for (; SkipSpacesAndLineEnd(&buffer); SkipLine(&buffer)) {
+namespace {
+    constexpr int MAX_DEPTH = 1000; // Define the maximum depth allowed
+}
+
+void LWS::Element::Parse(const char *&buffer, const char *end, int depth) {
+    if (depth > MAX_DEPTH) {
+        throw std::runtime_error("Maximum recursion depth exceeded in LWS::Element::Parse");
+    }
+
+    for (; SkipSpacesAndLineEnd(&buffer, end); SkipLine(&buffer, end)) {
 
         // begin of a new element with children
         bool sub = false;
         if (*buffer == '{') {
             ++buffer;
-            SkipSpaces(&buffer);
+            SkipSpaces(&buffer, end);
             sub = true;
         } else if (*buffer == '}')
             return;
@@ -98,16 +106,15 @@ void LWS::Element::Parse(const char *&buffer) {
         while (!IsSpaceOrNewLine(*buffer))
             ++buffer;
         children.back().tokens[0] = std::string(cur, (size_t)(buffer - cur));
-        SkipSpaces(&buffer);
+        SkipSpaces(&buffer, end);
 
         if (children.back().tokens[0] == "Plugin") {
             ASSIMP_LOG_VERBOSE_DEBUG("LWS: Skipping over plugin-specific data");
 
             // strange stuff inside Plugin/Endplugin blocks. Needn't
             // follow LWS syntax, so we skip over it
-            for (; SkipSpacesAndLineEnd(&buffer); SkipLine(&buffer)) {
+            for (; SkipSpacesAndLineEnd(&buffer, end); SkipLine(&buffer, end)) {
                 if (!::strncmp(buffer, "EndPlugin", 9)) {
-                    //SkipLine(&buffer);
                     break;
                 }
             }
@@ -122,7 +129,7 @@ void LWS::Element::Parse(const char *&buffer) {
 
         // parse more elements recursively
         if (sub) {
-            children.back().Parse(buffer);
+            children.back().Parse(buffer, end, depth + 1);
         }
     }
 }
@@ -142,7 +149,7 @@ LWSImporter::LWSImporter() :
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool LWSImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    static const uint32_t tokens[] = {
+    static constexpr uint32_t tokens[] = {
         AI_MAKE_MAGIC("LWSC"),
         AI_MAKE_MAGIC("LWMO")
     };
@@ -155,6 +162,8 @@ const aiImporterDesc *LWSImporter::GetInfo() const {
     return &desc;
 }
 
+static constexpr int MagicHackNo = 150392;
+
 // ------------------------------------------------------------------------------------------------
 // Setup configuration properties
 void LWSImporter::SetupProperties(const Importer *pImp) {
@@ -163,11 +172,11 @@ void LWSImporter::SetupProperties(const Importer *pImp) {
 
     // AI_CONFIG_IMPORT_LWS_ANIM_START
     first = pImp->GetPropertyInteger(AI_CONFIG_IMPORT_LWS_ANIM_START,
-            150392 /* magic hack */);
+            MagicHackNo /* magic hack */);
 
     // AI_CONFIG_IMPORT_LWS_ANIM_END
     last = pImp->GetPropertyInteger(AI_CONFIG_IMPORT_LWS_ANIM_END,
-            150392 /* magic hack */);
+            MagicHackNo /* magic hack */);
 
     if (last < first) {
         std::swap(last, first);
@@ -191,15 +200,16 @@ void LWSImporter::ReadEnvelope(const LWS::Element &dad, LWO::Envelope &fill) {
 
     for (++it; it != dad.children.end(); ++it) {
         const char *c = (*it).tokens[1].c_str();
+        const char *end = c + (*it).tokens[1].size();
 
         if ((*it).tokens[0] == "Key") {
             fill.keys.emplace_back();
             LWO::Key &key = fill.keys.back();
 
             float f;
-            SkipSpaces(&c);
+            SkipSpaces(&c, end);
             c = fast_atoreal_move<float>(c, key.value);
-            SkipSpaces(&c);
+            SkipSpaces(&c, end);
             c = fast_atoreal_move<float>(c, f);
 
             key.time = f;
@@ -231,13 +241,13 @@ void LWSImporter::ReadEnvelope(const LWS::Element &dad, LWO::Envelope &fill) {
                     ASSIMP_LOG_ERROR("LWS: Unknown span type");
             }
             for (unsigned int i = 0; i < num; ++i) {
-                SkipSpaces(&c);
+                SkipSpaces(&c, end);
                 c = fast_atoreal_move<float>(c, key.params[i]);
             }
         } else if ((*it).tokens[0] == "Behaviors") {
-            SkipSpaces(&c);
+            SkipSpaces(&c, end);
             fill.pre = (LWO::PrePostBehaviour)strtoul10(c, &c);
-            SkipSpaces(&c);
+            SkipSpaces(&c, end);
             fill.post = (LWO::PrePostBehaviour)strtoul10(c, &c);
         }
     }
@@ -245,47 +255,45 @@ void LWSImporter::ReadEnvelope(const LWS::Element &dad, LWO::Envelope &fill) {
 
 // ------------------------------------------------------------------------------------------------
 // Read animation channels in the old LightWave animation format
-void LWSImporter::ReadEnvelope_Old(
-        std::list<LWS::Element>::const_iterator &it,
-        const std::list<LWS::Element>::const_iterator &end,
-        LWS::NodeDesc &nodes,
-        unsigned int /*version*/) {
-    unsigned int num, sub_num;
-    if (++it == end) goto unexpected_end;
+void LWSImporter::ReadEnvelope_Old(std::list<LWS::Element>::const_iterator &it,const std::list<LWS::Element>::const_iterator &endIt,
+        LWS::NodeDesc &nodes, unsigned int) {
+    if (++it == endIt) {
+        ASSIMP_LOG_ERROR("LWS: Encountered unexpected end of file while parsing object motion");
+        return;
+    }
 
-    num = strtoul10((*it).tokens[0].c_str());
+    const unsigned int num = strtoul10((*it).tokens[0].c_str());
     for (unsigned int i = 0; i < num; ++i) {
-
         nodes.channels.emplace_back();
         LWO::Envelope &envl = nodes.channels.back();
 
         envl.index = i;
         envl.type = (LWO::EnvelopeType)(i + 1);
 
-        if (++it == end) {
-            goto unexpected_end;
+        if (++it == endIt) {
+            ASSIMP_LOG_ERROR("LWS: Encountered unexpected end of file while parsing object motion");
+            return;
         }
-        sub_num = strtoul10((*it).tokens[0].c_str());
 
+        const unsigned int sub_num = strtoul10((*it).tokens[0].c_str());
         for (unsigned int n = 0; n < sub_num; ++n) {
-
-            if (++it == end) goto unexpected_end;
+            if (++it == endIt) {
+                ASSIMP_LOG_ERROR("LWS: Encountered unexpected end of file while parsing object motion");
+                return;
+            }
 
             // parse value and time, skip the rest for the moment.
             LWO::Key key;
             const char *c = fast_atoreal_move<float>((*it).tokens[0].c_str(), key.value);
-            SkipSpaces(&c);
+            const char *end = c + (*it).tokens[0].size();
+            SkipSpaces(&c, end);
             float f;
             fast_atoreal_move<float>((*it).tokens[0].c_str(), f);
             key.time = f;
 
-            envl.keys.push_back(key);
+            envl.keys.emplace_back(key);
         }
     }
-    return;
-
-unexpected_end:
-    ASSIMP_LOG_ERROR("LWS: Encountered unexpected end of file while parsing object motion");
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -296,7 +304,6 @@ void LWSImporter::SetupNodeName(aiNode *nd, LWS::NodeDesc &src) {
     // the name depends on the type. We break LWS's strange naming convention
     // and return human-readable, but still machine-parsable and unique, strings.
     if (src.type == LWS::NodeDesc::OBJECT) {
-
         if (src.path.length()) {
             std::string::size_type s = src.path.find_last_of("\\/");
             if (s == std::string::npos) {
@@ -306,14 +313,14 @@ void LWSImporter::SetupNodeName(aiNode *nd, LWS::NodeDesc &src) {
             }
             std::string::size_type t = src.path.substr(s).find_last_of('.');
 
-            nd->mName.length = ::ai_snprintf(nd->mName.data, MAXLEN, "%s_(%08X)", src.path.substr(s).substr(0, t).c_str(), combined);
-            if (nd->mName.length > MAXLEN) {
-                nd->mName.length = MAXLEN;
+            nd->mName.length = ::ai_snprintf(nd->mName.data, AI_MAXLEN, "%s_(%08X)", src.path.substr(s).substr(0, t).c_str(), combined);
+            if (nd->mName.length > AI_MAXLEN) {
+                nd->mName.length = AI_MAXLEN;
             }
             return;
         }
     }
-    nd->mName.length = ::ai_snprintf(nd->mName.data, MAXLEN, "%s_(%08X)", src.name, combined);
+    nd->mName.length = ::ai_snprintf(nd->mName.data, AI_MAXLEN, "%s_(%08X)", src.name, combined);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -501,7 +508,8 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     // Parse the file structure
     LWS::Element root;
     const char *dummy = &mBuffer[0];
-    root.Parse(dummy);
+    const char *dummyEnd = dummy + mBuffer.size();
+    root.Parse(dummy, dummyEnd);
 
     // Construct a Batch-importer to read more files recursively
     BatchLoader batch(pIOHandler);
@@ -540,6 +548,7 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     // Now read all elements in a very straightforward manner
     for (; it != root.children.end(); ++it) {
         const char *c = (*it).tokens[1].c_str();
+        const char *end = c + (*it).tokens[1].size();
 
         // 'FirstFrame': begin of animation slice
         if ((*it).tokens[0] == "FirstFrame") {
@@ -567,15 +576,24 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
             LWS::NodeDesc d;
             d.type = LWS::NodeDesc::OBJECT;
             if (version >= 4) { // handle LWSC 4 explicit ID
-                SkipSpaces(&c);
+                SkipSpaces(&c, end);
                 d.number = strtoul16(c, &c) & AI_LWS_MASK;
             } else {
                 d.number = cur_object++;
             }
 
             // and add the file to the import list
-            SkipSpaces(&c);
+            SkipSpaces(&c, end);
             std::string path = FindLWOFile(c);
+
+            if (path.empty()) {
+                throw DeadlyImportError("LWS: Invalid LoadObjectLayer: empty path.");
+            }
+
+            if (path == pFile) {
+                throw DeadlyImportError("LWS: Invalid LoadObjectLayer: self reference.");
+            }
+
             d.path = path;
             d.id = batch.AddLoadRequest(path, 0, &props);
 
@@ -588,11 +606,20 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 
             if (version >= 4) { // handle LWSC 4 explicit ID
                 d.number = strtoul16(c, &c) & AI_LWS_MASK;
-                SkipSpaces(&c);
+                SkipSpaces(&c, end);
             } else {
                 d.number = cur_object++;
             }
             std::string path = FindLWOFile(c);
+
+            if (path.empty()) {
+                throw DeadlyImportError("LWS: Invalid LoadObject: empty path.");
+            }
+
+            if (path == pFile) {
+                throw DeadlyImportError("LWS: Invalid LoadObject: self reference.");
+            }
+
             d.id = batch.AddLoadRequest(path, 0, nullptr);
 
             d.path = path;
@@ -604,7 +631,7 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
             d.type = LWS::NodeDesc::OBJECT;
             if (version >= 4) { // handle LWSC 4 explicit ID
                 d.number = strtoul16(c, &c) & AI_LWS_MASK;
-                SkipSpaces(&c);
+                SkipSpaces(&c, end);
             } else {
                 d.number = cur_object++;
             }
@@ -668,26 +695,25 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
                     // two ints per envelope
                     LWO::Envelope &env = *envelopeIt;
                     env.pre = (LWO::PrePostBehaviour)strtoul10(c, &c);
-                    SkipSpaces(&c);
+                    SkipSpaces(&c, end);
                     env.post = (LWO::PrePostBehaviour)strtoul10(c, &c);
-                    SkipSpaces(&c);
+                    SkipSpaces(&c, end);
                 }
             }
         }
         // 'ParentItem': specifies the parent of the current element
         else if ((*it).tokens[0] == "ParentItem") {
-            if (nodes.empty())
+            if (nodes.empty()) {
                 ASSIMP_LOG_ERROR("LWS: Unexpected keyword: \'ParentItem\'");
-
-            else
+            } else {
                 nodes.back().parent = strtoul16(c, &c);
+            }
         }
         // 'ParentObject': deprecated one for older formats
         else if (version < 3 && (*it).tokens[0] == "ParentObject") {
-            if (nodes.empty())
+            if (nodes.empty()) {
                 ASSIMP_LOG_ERROR("LWS: Unexpected keyword: \'ParentObject\'");
-
-            else {
+            } else {
                 nodes.back().parent = strtoul10(c, &c) | (1u << 28u);
             }
         }
@@ -700,19 +726,20 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 
             if (version >= 4) { // handle LWSC 4 explicit ID
                 d.number = strtoul16(c, &c) & AI_LWS_MASK;
-            } else
+            } else {
                 d.number = cur_camera++;
+            }
             nodes.push_back(d);
 
             num_camera++;
         }
         // 'CameraName': set name of currently active camera
         else if ((*it).tokens[0] == "CameraName") {
-            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::CAMERA)
+            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::CAMERA) {
                 ASSIMP_LOG_ERROR("LWS: Unexpected keyword: \'CameraName\'");
-
-            else
+            } else {
                 nodes.back().name = c;
+            }
         }
         // 'AddLight': add a light to the scenegraph
         else if ((*it).tokens[0] == "AddLight") {
@@ -723,19 +750,20 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 
             if (version >= 4) { // handle LWSC 4 explicit ID
                 d.number = strtoul16(c, &c) & AI_LWS_MASK;
-            } else
+            } else {
                 d.number = cur_light++;
+            }
             nodes.push_back(d);
 
             num_light++;
         }
         // 'LightName': set name of currently active light
         else if ((*it).tokens[0] == "LightName") {
-            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT)
+            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT) {
                 ASSIMP_LOG_ERROR("LWS: Unexpected keyword: \'LightName\'");
-
-            else
+            } else {
                 nodes.back().name = c;
+            }
         }
         // 'LightIntensity': set intensity of currently active light
         else if ((*it).tokens[0] == "LightIntensity" || (*it).tokens[0] == "LgtIntensity") {
@@ -753,62 +781,58 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
         }
         // 'LightType': set type of currently active light
         else if ((*it).tokens[0] == "LightType") {
-            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT)
+            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT) {
                 ASSIMP_LOG_ERROR("LWS: Unexpected keyword: \'LightType\'");
-
-            else
+            } else {
                 nodes.back().lightType = strtoul10(c);
-
+            }
         }
         // 'LightFalloffType': set falloff type of currently active light
         else if ((*it).tokens[0] == "LightFalloffType") {
-            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT)
+            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT) {
                 ASSIMP_LOG_ERROR("LWS: Unexpected keyword: \'LightFalloffType\'");
-            else
+            } else {
                 nodes.back().lightFalloffType = strtoul10(c);
-
+            }
         }
         // 'LightConeAngle': set cone angle of currently active light
         else if ((*it).tokens[0] == "LightConeAngle") {
-            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT)
+            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT) {
                 ASSIMP_LOG_ERROR("LWS: Unexpected keyword: \'LightConeAngle\'");
-
-            else
+            } else {
                 nodes.back().lightConeAngle = fast_atof(c);
-
+            }
         }
         // 'LightEdgeAngle': set area where we're smoothing from min to max intensity
         else if ((*it).tokens[0] == "LightEdgeAngle") {
-            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT)
+            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT) {
                 ASSIMP_LOG_ERROR("LWS: Unexpected keyword: \'LightEdgeAngle\'");
-
-            else
+            } else {
                 nodes.back().lightEdgeAngle = fast_atof(c);
-
+            }
         }
         // 'LightColor': set color of currently active light
         else if ((*it).tokens[0] == "LightColor") {
-            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT)
+            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT) {
                 ASSIMP_LOG_ERROR("LWS: Unexpected keyword: \'LightColor\'");
-
-            else {
+            } else {
                 c = fast_atoreal_move<float>(c, (float &)nodes.back().lightColor.r);
-                SkipSpaces(&c);
+                SkipSpaces(&c, end);
                 c = fast_atoreal_move<float>(c, (float &)nodes.back().lightColor.g);
-                SkipSpaces(&c);
+                SkipSpaces(&c, end);
                 c = fast_atoreal_move<float>(c, (float &)nodes.back().lightColor.b);
             }
         }
 
         // 'PivotPosition': position of local transformation origin
         else if ((*it).tokens[0] == "PivotPosition" || (*it).tokens[0] == "PivotPoint") {
-            if (nodes.empty())
+            if (nodes.empty()) {
                 ASSIMP_LOG_ERROR("LWS: Unexpected keyword: \'PivotPosition\'");
-            else {
+            } else {
                 c = fast_atoreal_move<float>(c, (float &)nodes.back().pivotPos.x);
-                SkipSpaces(&c);
+                SkipSpaces(&c, end);
                 c = fast_atoreal_move<float>(c, (float &)nodes.back().pivotPos.y);
-                SkipSpaces(&c);
+                SkipSpaces(&c, end);
                 c = fast_atoreal_move<float>(c, (float &)nodes.back().pivotPos.z);
                 // Mark pivotPos as set
                 nodes.back().isPivotSet = true;
@@ -818,7 +842,6 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 
     // resolve parenting
     for (std::list<LWS::NodeDesc>::iterator ndIt = nodes.begin(); ndIt != nodes.end(); ++ndIt) {
-
         // check whether there is another node which calls us a parent
         for (std::list<LWS::NodeDesc>::iterator dit = nodes.begin(); dit != nodes.end(); ++dit) {
             if (dit != ndIt && *ndIt == (*dit).parent) {
@@ -854,7 +877,7 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     aiNode *nd = master->mRootNode = new aiNode();
 
     // allocate storage for cameras&lights
-    if (num_camera) {
+    if (num_camera > 0u) {
         master->mCameras = new aiCamera *[master->mNumCameras = num_camera];
     }
     aiCamera **cams = master->mCameras;
diff --git a/code/AssetLib/LWS/LWSLoader.h b/code/AssetLib/LWS/LWSLoader.h
index 4e92ef0d5..1b87f44ad 100644
--- a/code/AssetLib/LWS/LWSLoader.h
+++ b/code/AssetLib/LWS/LWSLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -76,7 +76,7 @@ public:
     std::list<Element> children;
 
     //! Recursive parsing function
-    void Parse(const char *&buffer);
+    void Parse(const char *&buffer, const char *end, int depth = 0);
 };
 
 #define AI_LWS_MASK (0xffffffff >> 4u)
diff --git a/code/AssetLib/M3D/M3DExporter.cpp b/code/AssetLib/M3D/M3DExporter.cpp
index cf87b6221..dbde30417 100644
--- a/code/AssetLib/M3D/M3DExporter.cpp
+++ b/code/AssetLib/M3D/M3DExporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 Copyright (c) 2019 bzt
 
 All rights reserved.
diff --git a/code/AssetLib/M3D/M3DExporter.h b/code/AssetLib/M3D/M3DExporter.h
index d77743f56..c22c817bd 100644
--- a/code/AssetLib/M3D/M3DExporter.h
+++ b/code/AssetLib/M3D/M3DExporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 Copyright (c) 2019 bzt
 
 All rights reserved.
diff --git a/code/AssetLib/M3D/M3DImporter.cpp b/code/AssetLib/M3D/M3DImporter.cpp
index 71f416139..18f006a42 100644
--- a/code/AssetLib/M3D/M3DImporter.cpp
+++ b/code/AssetLib/M3D/M3DImporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 Copyright (c) 2019 bzt
 
 All rights reserved.
diff --git a/code/AssetLib/M3D/M3DImporter.h b/code/AssetLib/M3D/M3DImporter.h
index 9ca8f9211..360805825 100644
--- a/code/AssetLib/M3D/M3DImporter.h
+++ b/code/AssetLib/M3D/M3DImporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 Copyright (c) 2019 bzt
 
 All rights reserved.
diff --git a/code/AssetLib/M3D/M3DMaterials.h b/code/AssetLib/M3D/M3DMaterials.h
index a1b0fd742..cd20e3ee4 100644
--- a/code/AssetLib/M3D/M3DMaterials.h
+++ b/code/AssetLib/M3D/M3DMaterials.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 Copyright (c) 2019 bzt
 
 All rights reserved.
diff --git a/code/AssetLib/M3D/M3DWrapper.cpp b/code/AssetLib/M3D/M3DWrapper.cpp
index 05087d592..5c0d7e09f 100644
--- a/code/AssetLib/M3D/M3DWrapper.cpp
+++ b/code/AssetLib/M3D/M3DWrapper.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 Copyright (c) 2019 bzt
 
 All rights reserved.
diff --git a/code/AssetLib/M3D/M3DWrapper.h b/code/AssetLib/M3D/M3DWrapper.h
index 880aca996..124d038e6 100644
--- a/code/AssetLib/M3D/M3DWrapper.h
+++ b/code/AssetLib/M3D/M3DWrapper.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 Copyright (c) 2019 bzt
 
 All rights reserved.
diff --git a/code/AssetLib/MD2/MD2FileData.h b/code/AssetLib/MD2/MD2FileData.h
index 3bce8feee..8effb5632 100644
--- a/code/AssetLib/MD2/MD2FileData.h
+++ b/code/AssetLib/MD2/MD2FileData.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -52,10 +51,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/Compiler/pushpack1.h>
 
-namespace Assimp    {
-namespace MD2   {
+namespace Assimp {
+namespace MD2 {
 
-// to make it easier for us, we test the magic word against both "endianesses"
+// to make it easier for us, we test the magic word against both "endiannesses"
 #define AI_MD2_MAGIC_NUMBER_BE  AI_MAKE_MAGIC("IDP2")
 #define AI_MD2_MAGIC_NUMBER_LE  AI_MAKE_MAGIC("2PDI")
 
diff --git a/code/AssetLib/MD2/MD2Loader.cpp b/code/AssetLib/MD2/MD2Loader.cpp
index 596d26414..942bc6177 100644
--- a/code/AssetLib/MD2/MD2Loader.cpp
+++ b/code/AssetLib/MD2/MD2Loader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -101,7 +101,7 @@ MD2Importer::MD2Importer()
 // Returns whether the class can handle the format of the given file.
 bool MD2Importer::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool /*checkSig*/) const
 {
-    static const uint32_t tokens[] = { AI_MD2_MAGIC_NUMBER_LE };
+    static constexpr uint32_t tokens[] = { AI_MD2_MAGIC_NUMBER_LE };
     return CheckMagicToken(pIOHandler,pFile,tokens,AI_COUNT_OF(tokens));
 }
 
@@ -319,16 +319,22 @@ void MD2Importer::InternReadFile( const std::string& pFile,
         clr.b = clr.g = clr.r = 0.05f;
         pcHelper->AddProperty<aiColor3D>(&clr, 1,AI_MATKEY_COLOR_AMBIENT);
 
-        if (pcSkins->name[0])
+        const ai_uint32 MaxNameLength = AI_MAXLEN - 1; // one byte reserved for \0
+        ai_uint32 iLen = static_cast<ai_uint32>(::strlen(pcSkins->name));
+        bool nameTooLong = iLen > MaxNameLength;
+
+        if (pcSkins->name[0] && !nameTooLong)
         {
             aiString szString;
-            const ai_uint32 iLen = (ai_uint32) ::strlen(pcSkins->name);
-            ::memcpy(szString.data,pcSkins->name,iLen);
+            ::memcpy(szString.data, pcSkins->name, iLen);
             szString.data[iLen] = '\0';
             szString.length = iLen;
 
             pcHelper->AddProperty(&szString,AI_MATKEY_TEXTURE_DIFFUSE(0));
         }
+        else if (nameTooLong) {
+            ASSIMP_LOG_WARN("Texture file name is too long. It will be skipped.");
+        }
         else{
             ASSIMP_LOG_WARN("Texture file name has zero length. It will be skipped.");
         }
diff --git a/code/AssetLib/MD2/MD2Loader.h b/code/AssetLib/MD2/MD2Loader.h
index bab026ea0..19a2a12c2 100644
--- a/code/AssetLib/MD2/MD2Loader.h
+++ b/code/AssetLib/MD2/MD2Loader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MD2/MD2NormalTable.h b/code/AssetLib/MD2/MD2NormalTable.h
index 1837939e8..066d4bd05 100644
--- a/code/AssetLib/MD2/MD2NormalTable.h
+++ b/code/AssetLib/MD2/MD2NormalTable.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MD3/MD3FileData.h b/code/AssetLib/MD3/MD3FileData.h
index 01475e679..65a4d3845 100644
--- a/code/AssetLib/MD3/MD3FileData.h
+++ b/code/AssetLib/MD3/MD3FileData.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -60,9 +59,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/Compiler/pushpack1.h>
 
 namespace Assimp {
-namespace MD3   {
+namespace MD3 {
 
-// to make it easier for us, we test the magic word against both "endianesses"
+// to make it easier for us, we test the magic word against both "endiannesses"
 #define AI_MD3_MAGIC_NUMBER_BE  AI_MAKE_MAGIC("IDP3")
 #define AI_MD3_MAGIC_NUMBER_LE  AI_MAKE_MAGIC("3PDI")
 
diff --git a/code/AssetLib/MD3/MD3Loader.cpp b/code/AssetLib/MD3/MD3Loader.cpp
index e743889e3..0a5fc933c 100644
--- a/code/AssetLib/MD3/MD3Loader.cpp
+++ b/code/AssetLib/MD3/MD3Loader.cpp
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -52,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_MD3_IMPORTER
 
-#include "AssetLib/MD3/MD3Loader.h"
+#include "MD3Loader.h"
 #include "Common/Importer.h"
 
 #include <assimp/GenericProperty.h>
@@ -123,12 +121,12 @@ bool Q3Shader::LoadShader(ShaderData &fill, const std::string &pFile, IOSystem *
     // remove comments from it (C++ style)
     CommentRemover::RemoveLineComments("//", &_buff[0]);
     const char *buff = &_buff[0];
-
+    const char *end = buff + _buff.size();
     Q3Shader::ShaderDataBlock *curData = nullptr;
     Q3Shader::ShaderMapBlock *curMap = nullptr;
 
     // read line per line
-    for (; SkipSpacesAndLineEnd(&buff); SkipLine(&buff)) {
+    for (; SkipSpacesAndLineEnd(&buff, end); SkipLine(&buff, end)) {
 
         if (*buff == '{') {
             ++buff;
@@ -140,21 +138,21 @@ bool Q3Shader::LoadShader(ShaderData &fill, const std::string &pFile, IOSystem *
             }
 
             // read this data section
-            for (; SkipSpacesAndLineEnd(&buff); SkipLine(&buff)) {
+            for (; SkipSpacesAndLineEnd(&buff, end); SkipLine(&buff, end)) {
                 if (*buff == '{') {
                     ++buff;
                     // add new map section
                     curData->maps.emplace_back();
                     curMap = &curData->maps.back();
 
-                    for (; SkipSpacesAndLineEnd(&buff); SkipLine(&buff)) {
+                    for (; SkipSpacesAndLineEnd(&buff, end); SkipLine(&buff, end)) {
                         // 'map' - Specifies texture file name
                         if (TokenMatchI(buff, "map", 3) || TokenMatchI(buff, "clampmap", 8)) {
-                            curMap->name = GetNextToken(buff);
+                            curMap->name = GetNextToken(buff, end);
                         }
                         // 'blendfunc' - Alpha blending mode
                         else if (TokenMatchI(buff, "blendfunc", 9)) {
-                            const std::string blend_src = GetNextToken(buff);
+                            const std::string blend_src = GetNextToken(buff, end);
                             if (blend_src == "add") {
                                 curMap->blend_src = Q3Shader::BLEND_GL_ONE;
                                 curMap->blend_dest = Q3Shader::BLEND_GL_ONE;
@@ -166,12 +164,12 @@ bool Q3Shader::LoadShader(ShaderData &fill, const std::string &pFile, IOSystem *
                                 curMap->blend_dest = Q3Shader::BLEND_GL_ONE_MINUS_SRC_ALPHA;
                             } else {
                                 curMap->blend_src = StringToBlendFunc(blend_src);
-                                curMap->blend_dest = StringToBlendFunc(GetNextToken(buff));
+                                curMap->blend_dest = StringToBlendFunc(GetNextToken(buff, end));
                             }
                         }
                         // 'alphafunc' - Alpha testing mode
                         else if (TokenMatchI(buff, "alphafunc", 9)) {
-                            const std::string at = GetNextToken(buff);
+                            const std::string at = GetNextToken(buff, end);
                             if (at == "GT0") {
                                 curMap->alpha_test = Q3Shader::AT_GT0;
                             } else if (at == "LT128") {
@@ -186,7 +184,6 @@ bool Q3Shader::LoadShader(ShaderData &fill, const std::string &pFile, IOSystem *
                             break;
                         }
                     }
-
                 } else if (*buff == '}') {
                     ++buff;
                     curData = nullptr;
@@ -195,7 +192,7 @@ bool Q3Shader::LoadShader(ShaderData &fill, const std::string &pFile, IOSystem *
 
                 // 'cull' specifies culling behaviour for the model
                 else if (TokenMatchI(buff, "cull", 4)) {
-                    SkipSpaces(&buff);
+                    SkipSpaces(&buff, end);
                     if (!ASSIMP_strincmp(buff, "back", 4)) { // render face's backside, does not function in Q3 engine (bug)
                         curData->cull = Q3Shader::CULL_CCW;
                     } else if (!ASSIMP_strincmp(buff, "front", 5)) { // is not valid keyword in Q3, but occurs in shaders
@@ -213,9 +210,10 @@ bool Q3Shader::LoadShader(ShaderData &fill, const std::string &pFile, IOSystem *
             curData = &fill.blocks.back();
 
             // get the name of this section
-            curData->name = GetNextToken(buff);
+            curData->name = GetNextToken(buff, end);
         }
     }
+
     return true;
 }
 
@@ -232,6 +230,7 @@ bool Q3Shader::LoadSkin(SkinData &fill, const std::string &pFile, IOSystem *io)
     const size_t s = file->FileSize();
     std::vector<char> _buff(s + 1);
     const char *buff = &_buff[0];
+    const char *end = buff + _buff.size();
     file->Read(&_buff[0], s, 1);
     _buff[s] = 0;
 
@@ -240,10 +239,10 @@ bool Q3Shader::LoadSkin(SkinData &fill, const std::string &pFile, IOSystem *io)
 
     // read token by token and fill output table
     for (; *buff;) {
-        SkipSpacesAndLineEnd(&buff);
+        SkipSpacesAndLineEnd(&buff, end);
 
         // get first identifier
-        std::string ss = GetNextToken(buff);
+        std::string ss = GetNextToken(buff, end);
 
         // ignore tokens starting with tag_
         if (!::strncmp(&ss[0], "tag_", std::min((size_t)4, ss.length())))
@@ -253,8 +252,9 @@ bool Q3Shader::LoadSkin(SkinData &fill, const std::string &pFile, IOSystem *io)
         SkinData::TextureEntry &entry = fill.textures.back();
 
         entry.first = ss;
-        entry.second = GetNextToken(buff);
+        entry.second = GetNextToken(buff, end);
     }
+
     return true;
 }
 
@@ -293,7 +293,7 @@ void Q3Shader::ConvertShaderToMaterial(aiMaterial *out, const ShaderDataBlock &s
         //  - in any case: set it as diffuse texture
         //
         // If the texture is using 'filter' blending
-        //  - take as lightmap
+        //  - take as light-map
         //
         // Textures with alpha funcs
         //  - aiTextureFlags_UseAlpha is set (otherwise aiTextureFlags_NoAlpha is explicitly set)
@@ -350,7 +350,7 @@ MD3Importer::~MD3Importer() = default;
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool MD3Importer::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    static const uint32_t tokens[] = { AI_MD3_MAGIC_NUMBER_LE };
+    static constexpr uint32_t tokens[] = { AI_MD3_MAGIC_NUMBER_LE };
     return CheckMagicToken(pIOHandler, pFile, tokens, AI_COUNT_OF(tokens));
 }
 
@@ -722,6 +722,7 @@ void MD3Importer::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     std::vector<unsigned char> mBuffer2(fileSize);
     file->Read(&mBuffer2[0], 1, fileSize);
     mBuffer = &mBuffer2[0];
+    const unsigned char* bufferEnd = mBuffer + fileSize;
 
     pcHeader = (BE_NCONST MD3::Header *)mBuffer;
 
@@ -747,9 +748,15 @@ void MD3Importer::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 
     // Navigate to the list of surfaces
     BE_NCONST MD3::Surface *pcSurfaces = (BE_NCONST MD3::Surface *)(mBuffer + pcHeader->OFS_SURFACES);
+    if ((const unsigned char*)pcSurfaces + sizeof(MD3::Surface) * pcHeader->NUM_SURFACES > bufferEnd) {
+        throw DeadlyImportError("MD3 surface headers are outside the file");
+    }
 
     // Navigate to the list of tags
     BE_NCONST MD3::Tag *pcTags = (BE_NCONST MD3::Tag *)(mBuffer + pcHeader->OFS_TAGS);
+    if ((const unsigned char*)pcTags + sizeof(MD3::Tag) * pcHeader->NUM_TAGS > bufferEnd) {
+        throw DeadlyImportError("MD3 tags are outside the file");
+    }
 
     // Allocate output storage
     pScene->mNumMeshes = pcHeader->NUM_SURFACES;
@@ -1024,6 +1031,10 @@ void MD3Importer::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 
         for (unsigned int i = 0; i < pcHeader->NUM_TAGS; ++i, ++pcTags) {
             aiNode *nd = pScene->mRootNode->mChildren[i] = new aiNode();
+            if ((const unsigned char*)pcTags + sizeof(MD3::Tag) > bufferEnd) {
+                throw DeadlyImportError("MD3 tag is outside the file");
+            }
+
             nd->mName.Set((const char *)pcTags->NAME);
             nd->mParent = pScene->mRootNode;
 
diff --git a/code/AssetLib/MD3/MD3Loader.h b/code/AssetLib/MD3/MD3Loader.h
index d911bb1da..0b934878e 100644
--- a/code/AssetLib/MD3/MD3Loader.h
+++ b/code/AssetLib/MD3/MD3Loader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MD5/MD5Loader.cpp b/code/AssetLib/MD5/MD5Loader.cpp
index 697e758fb..6df27f6b4 100644
--- a/code/AssetLib/MD5/MD5Loader.cpp
+++ b/code/AssetLib/MD5/MD5Loader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -210,7 +210,7 @@ void MD5Importer::MakeDataUnique(MD5::MeshDesc &meshSrc) {
     const unsigned int guess = (unsigned int)(fWeightsPerVert * iNewNum);
     meshSrc.mWeights.reserve(guess + (guess >> 3)); // + 12.5% as buffer
 
-    for (FaceList::const_iterator iter = meshSrc.mFaces.begin(), iterEnd = meshSrc.mFaces.end(); iter != iterEnd; ++iter) {
+    for (FaceArray::const_iterator iter = meshSrc.mFaces.begin(), iterEnd = meshSrc.mFaces.end(); iter != iterEnd; ++iter) {
         const aiFace &face = *iter;
         for (unsigned int i = 0; i < 3; ++i) {
             if (face.mIndices[0] >= meshSrc.mVertices.size()) {
@@ -231,7 +231,7 @@ void MD5Importer::MakeDataUnique(MD5::MeshDesc &meshSrc) {
 
 // ------------------------------------------------------------------------------------------------
 // Recursive node graph construction from a MD5MESH
-void MD5Importer::AttachChilds_Mesh(int iParentID, aiNode *piParent, BoneList &bones) {
+void MD5Importer::AttachChilds_Mesh(int iParentID, aiNode *piParent, BoneArray &bones) {
     ai_assert(nullptr != piParent);
     ai_assert(!piParent->mNumChildren);
 
@@ -282,7 +282,7 @@ void MD5Importer::AttachChilds_Mesh(int iParentID, aiNode *piParent, BoneList &b
 
 // ------------------------------------------------------------------------------------------------
 // Recursive node graph construction from a MD5ANIM
-void MD5Importer::AttachChilds_Anim(int iParentID, aiNode *piParent, AnimBoneList &bones, const aiNodeAnim **node_anims) {
+void MD5Importer::AttachChilds_Anim(int iParentID, aiNode *piParent, AnimBoneArray &bones, const aiNodeAnim **node_anims) {
     ai_assert(nullptr != piParent);
     ai_assert(!piParent->mNumChildren);
 
@@ -402,7 +402,7 @@ void MD5Importer::LoadMD5MeshFile() {
 
         // copy texture coordinates
         aiVector3D *pv = mesh->mTextureCoords[0];
-        for (MD5::VertexList::const_iterator iter = meshSrc.mVertices.begin(); iter != meshSrc.mVertices.end(); ++iter, ++pv) {
+        for (MD5::VertexArray::const_iterator iter = meshSrc.mVertices.begin(); iter != meshSrc.mVertices.end(); ++iter, ++pv) {
             pv->x = (*iter).mUV.x;
             pv->y = 1.0f - (*iter).mUV.y; // D3D to OpenGL
             pv->z = 0.0f;
@@ -412,7 +412,7 @@ void MD5Importer::LoadMD5MeshFile() {
         unsigned int *piCount = new unsigned int[meshParser.mJoints.size()];
         ::memset(piCount, 0, sizeof(unsigned int) * meshParser.mJoints.size());
 
-        for (MD5::VertexList::const_iterator iter = meshSrc.mVertices.begin(); iter != meshSrc.mVertices.end(); ++iter, ++pv) {
+        for (MD5::VertexArray::const_iterator iter = meshSrc.mVertices.begin(); iter != meshSrc.mVertices.end(); ++iter, ++pv) {
             for (unsigned int jub = (*iter).mFirstWeight, w = jub; w < jub + (*iter).mNumWeights; ++w) {
                 MD5::WeightDesc &weightDesc = meshSrc.mWeights[w];
                 /* FIX for some invalid exporters */
@@ -447,7 +447,7 @@ void MD5Importer::LoadMD5MeshFile() {
             }
 
             pv = mesh->mVertices;
-            for (MD5::VertexList::const_iterator iter = meshSrc.mVertices.begin(); iter != meshSrc.mVertices.end(); ++iter, ++pv) {
+            for (MD5::VertexArray::const_iterator iter = meshSrc.mVertices.begin(); iter != meshSrc.mVertices.end(); ++iter, ++pv) {
                 // compute the final vertex position from all single weights
                 *pv = aiVector3D();
 
@@ -585,14 +585,14 @@ void MD5Importer::LoadMD5AnimFile() {
         // 1 tick == 1 frame
         anim->mTicksPerSecond = animParser.fFrameRate;
 
-        for (FrameList::const_iterator iter = animParser.mFrames.begin(), iterEnd = animParser.mFrames.end(); iter != iterEnd; ++iter) {
+        for (FrameArray::const_iterator iter = animParser.mFrames.begin(), iterEnd = animParser.mFrames.end(); iter != iterEnd; ++iter) {
             double dTime = (double)(*iter).iIndex;
             aiNodeAnim **pcAnimNode = anim->mChannels;
             if (!(*iter).mValues.empty() || iter == animParser.mFrames.begin()) /* be sure we have at least one frame */
             {
                 // now process all values in there ... read all joints
                 MD5::BaseFrameDesc *pcBaseFrame = &animParser.mBaseFrames[0];
-                for (AnimBoneList::const_iterator iter2 = animParser.mAnimatedBones.begin(); iter2 != animParser.mAnimatedBones.end(); ++iter2,
+                for (AnimBoneArray::const_iterator iter2 = animParser.mAnimatedBones.begin(); iter2 != animParser.mAnimatedBones.end(); ++iter2,
                                                   ++pcAnimNode, ++pcBaseFrame) {
                     if ((*iter2).iFirstKeyIndex >= (*iter).mValues.size()) {
 
@@ -707,7 +707,7 @@ void MD5Importer::LoadMD5CameraFile() {
     for (std::vector<unsigned int>::const_iterator it = cuts.begin(); it != cuts.end() - 1; ++it) {
 
         aiAnimation *anim = *tmp++ = new aiAnimation();
-        anim->mName.length = ::ai_snprintf(anim->mName.data, MAXLEN, "anim%u_from_%u_to_%u", (unsigned int)(it - cuts.begin()), (*it), *(it + 1));
+        anim->mName.length = ::ai_snprintf(anim->mName.data, AI_MAXLEN, "anim%u_from_%u_to_%u", (unsigned int)(it - cuts.begin()), (*it), *(it + 1));
 
         anim->mTicksPerSecond = cameraParser.fFrameRate;
         anim->mChannels = new aiNodeAnim *[anim->mNumChannels = 1];
diff --git a/code/AssetLib/MD5/MD5Loader.h b/code/AssetLib/MD5/MD5Loader.h
index c213c04e6..1f182ff52 100644
--- a/code/AssetLib/MD5/MD5Loader.h
+++ b/code/AssetLib/MD5/MD5Loader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -118,7 +118,7 @@ protected:
      *  @param node_anims Generated node animations
     */
     void AttachChilds_Anim(int iParentID, aiNode *piParent,
-            AnimBoneList &bones, const aiNodeAnim **node_anims);
+            AnimBoneArray &bones, const aiNodeAnim **node_anims);
 
     // -------------------------------------------------------------------
     /** Construct node hierarchy from a given MD5MESH
@@ -126,7 +126,7 @@ protected:
      *  @param piParent Parent node to attach to
      *  @param bones Input bones
     */
-    void AttachChilds_Mesh(int iParentID, aiNode *piParent, BoneList &bones);
+    void AttachChilds_Mesh(int iParentID, aiNode *piParent, BoneArray &bones);
 
     // -------------------------------------------------------------------
     /** Build unique vertex buffers from a given MD5ANIM
diff --git a/code/AssetLib/MD5/MD5Parser.cpp b/code/AssetLib/MD5/MD5Parser.cpp
index 8da30e28f..03b40448c 100644
--- a/code/AssetLib/MD5/MD5Parser.cpp
+++ b/code/AssetLib/MD5/MD5Parser.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2023, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 // internal headers
-#include "AssetLib/MD5/MD5Loader.h"
+#include "MD5Loader.h"
 #include "Material/MaterialSystem.h"
 
 #include <assimp/ParsingUtils.h>
@@ -115,15 +115,19 @@ void MD5Parser::ParseHeader() {
         ReportError("MD5 version tag is unknown (10 is expected)");
     }
     SkipLine();
+
+    // print the command line options to the console
+    char *sz = buffer;
+    while (buffer < bufferEnd) {
+        if (IsLineEnd(*buffer++)) {
+            break;
+        }
+    }
+
     if (buffer == bufferEnd) {
         return;
     }
 
-    // print the command line options to the console
-    // FIX: can break the log length limit, so we need to be careful
-    char *sz = buffer;
-    while (!IsLineEnd(*buffer++));
-    
     ASSIMP_LOG_INFO(std::string(sz, std::min((uintptr_t)MAX_LOG_MESSAGE_LENGTH, (uintptr_t)(buffer - sz))));
     SkipSpacesAndLineEnd();
 }
@@ -138,14 +142,16 @@ bool MD5Parser::ParseSection(Section &out) {
     char *sz = buffer;
     while (!IsSpaceOrNewLine(*buffer)) {
         ++buffer;
-        if (buffer == bufferEnd)
+        if (buffer == bufferEnd) {
             return false;
+	    }
     }
     out.mName = std::string(sz, (uintptr_t)(buffer - sz));
     while (IsSpace(*buffer)) {
         ++buffer;
-        if (buffer == bufferEnd)
+        if (buffer == bufferEnd) {
             return false;
+	    }
     }
 
     bool running = true;
@@ -153,14 +159,16 @@ bool MD5Parser::ParseSection(Section &out) {
         if ('{' == *buffer) {
             // it is a normal section so read all lines
             ++buffer;
-            if (buffer == bufferEnd)
+            if (buffer == bufferEnd) {
                 return false;
+	        }
             bool run = true;
             while (run) {
                 while (IsSpaceOrNewLine(*buffer)) {
                     ++buffer;
-                    if (buffer == bufferEnd)
+                    if (buffer == bufferEnd) {
                         return false;
+		            }
                 }
                 if ('\0' == *buffer) {
                     return false; // seems this was the last section
@@ -175,18 +183,21 @@ bool MD5Parser::ParseSection(Section &out) {
 
                 elem.iLineNumber = lineNumber;
                 elem.szStart = buffer;
+                elem.end = bufferEnd;
 
                 // terminate the line with zero
                 while (!IsLineEnd(*buffer)) {
                     ++buffer;
-                    if (buffer == bufferEnd)
+                    if (buffer == bufferEnd) {
                         return false;
+		            }
                 }
                 if (*buffer) {
                     ++lineNumber;
                     *buffer++ = '\0';
-                    if (buffer == bufferEnd)
+                    if (buffer == bufferEnd) {
                         return false;
+		            }
                 }
             }
             break;
@@ -194,89 +205,117 @@ bool MD5Parser::ParseSection(Section &out) {
             // it is an element at global scope. Parse its value and go on
             sz = buffer;
             while (!IsSpaceOrNewLine(*buffer++)) {
-                if (buffer == bufferEnd)
+                if (buffer == bufferEnd) {
                     return false;
+		        }
             }
             out.mGlobalValue = std::string(sz, (uintptr_t)(buffer - sz));
             continue;
         }
         break;
     }
-    if (buffer == bufferEnd)
+    if (buffer == bufferEnd) {
         return false;
+    }
     while (IsSpaceOrNewLine(*buffer)) {
+        if (buffer == bufferEnd) {
+            break;
+	    }
         ++buffer;
-        if (buffer == bufferEnd)
-            return false;
     }
     return '\0' != *buffer;
 }
 
-// ------------------------------------------------------------------------------------------------
-// Some dirty macros just because they're so funny and easy to debug
-
 // skip all spaces ... handle EOL correctly
-#define AI_MD5_SKIP_SPACES() \
-    if (!SkipSpaces(&sz))    \
-        MD5Parser::ReportWarning("Unexpected end of line", elem.iLineNumber);
+inline void AI_MD5_SKIP_SPACES(const char **sz, const char *bufferEnd, int linenumber) {
+    if (!SkipSpaces(sz, bufferEnd)) {
+        MD5Parser::ReportWarning("Unexpected end of line", linenumber);
+    }
+}
 
 // read a triple float in brackets: (1.0 1.0 1.0)
-#define AI_MD5_READ_TRIPLE(vec)                                                         \
-    AI_MD5_SKIP_SPACES();                                                               \
-    if ('(' != *sz++)                                                                   \
-        MD5Parser::ReportWarning("Unexpected token: ( was expected", elem.iLineNumber); \
-    AI_MD5_SKIP_SPACES();                                                               \
-    sz = fast_atoreal_move<float>(sz, (float &)vec.x);                                  \
-    AI_MD5_SKIP_SPACES();                                                               \
-    sz = fast_atoreal_move<float>(sz, (float &)vec.y);                                  \
-    AI_MD5_SKIP_SPACES();                                                               \
-    sz = fast_atoreal_move<float>(sz, (float &)vec.z);                                  \
-    AI_MD5_SKIP_SPACES();                                                               \
-    if (')' != *sz++)                                                                   \
-        MD5Parser::ReportWarning("Unexpected token: ) was expected", elem.iLineNumber);
+inline void AI_MD5_READ_TRIPLE(aiVector3D &vec, const char **sz, const char *bufferEnd, int linenumber) {
+    AI_MD5_SKIP_SPACES(sz, bufferEnd, linenumber);
+    if ('(' != **sz) {
+        MD5Parser::ReportWarning("Unexpected token: ( was expected", linenumber);
+        if (*sz == bufferEnd)
+            return;
+        ++*sz;
+    }
+    if (*sz == bufferEnd)
+        return;
+    ++*sz;
+    AI_MD5_SKIP_SPACES(sz, bufferEnd, linenumber);
+    *sz = fast_atoreal_move<float>(*sz, (float &)vec.x);
+    AI_MD5_SKIP_SPACES(sz, bufferEnd, linenumber);
+    *sz = fast_atoreal_move<float>(*sz, (float &)vec.y);
+    AI_MD5_SKIP_SPACES(sz, bufferEnd, linenumber);
+    *sz = fast_atoreal_move<float>(*sz, (float &)vec.z);
+    AI_MD5_SKIP_SPACES(sz, bufferEnd, linenumber);
+    if (')' != **sz) {
+        MD5Parser::ReportWarning("Unexpected token: ) was expected", linenumber);
+    }
+    if (*sz == bufferEnd)
+        return;
+    ++*sz;
+}
 
 // parse a string, enclosed in quotation marks or not
-#define AI_MD5_PARSE_STRING(out)                                                   \
-    bool bQuota = (*sz == '\"');                                                   \
-    const char *szStart = sz;                                                      \
-    while (!IsSpaceOrNewLine(*sz))                                                 \
-        ++sz;                                                                      \
-    const char *szEnd = sz;                                                        \
-    if (bQuota) {                                                                  \
-        szStart++;                                                                 \
-        if ('\"' != *(szEnd -= 1)) {                                               \
-            MD5Parser::ReportWarning("Expected closing quotation marks in string", \
-                    elem.iLineNumber);                                             \
-            continue;                                                              \
-        }                                                                          \
-    }                                                                              \
-    out.length = (size_t)(szEnd - szStart);                                        \
-    ::memcpy(out.data, szStart, out.length);                                       \
+inline bool AI_MD5_PARSE_STRING(const char **sz, const char *bufferEnd, aiString &out, int linenumber) {
+    bool bQuota = (**sz == '\"');
+    const char *szStart = *sz;
+    while (!IsSpaceOrNewLine(**sz)) {
+        ++*sz;
+        if (*sz == bufferEnd) break;
+    }
+    const char *szEnd = *sz;
+    if (bQuota) {
+        szStart++;
+        if ('\"' != *(szEnd -= 1)) {
+            MD5Parser::ReportWarning("Expected closing quotation marks in string", linenumber);
+            ++*sz;
+        }
+    }
+    out.length = (ai_uint32)(szEnd - szStart);
+    if (out.length >= AI_MAXLEN)
+        out.length = AI_MAXLEN - 1;
+    ::memcpy(out.data, szStart, out.length);
     out.data[out.length] = '\0';
 
+    return true;
+}
+
 // parse a string, enclosed in quotation marks
-#define AI_MD5_PARSE_STRING_IN_QUOTATION(out)          \
-    out.length = 0;                                    \
-    while ('\"' != *sz && '\0' != *sz)                 \
-        ++sz;                                          \
-    if ('\0' != *sz) {                                 \
-        const char *szStart = ++sz;                    \
-        while ('\"' != *sz && '\0' != *sz)             \
-            ++sz;                                      \
-        if ('\0' != *sz) {                             \
-            const char *szEnd = (sz++);                \
-            out.length = (ai_uint32)(szEnd - szStart); \
-            ::memcpy(out.data, szStart, out.length);   \
-        }                                              \
-    }                                                  \
+inline void AI_MD5_PARSE_STRING_IN_QUOTATION(const char **sz, const char *bufferEnd, aiString &out) {
+    out.length = 0u;
+    while (('\"' != **sz && '\0' != **sz) && *sz != bufferEnd) {
+        ++*sz;
+    }
+    if ('\0' != **sz) {
+        const char *szStart = ++(*sz);
+
+        while (('\"' != **sz && '\0' != **sz) && *sz != bufferEnd) {
+            ++*sz;
+        }
+        if ('\0' != **sz) {
+            const char *szEnd = *sz;
+            ++*sz;
+            out.length = (ai_uint32)(szEnd - szStart);
+            if (out.length >= AI_MAXLEN)
+                out.length = AI_MAXLEN - 1;
+            ::memcpy(out.data, szStart, out.length);
+        }
+    }
     out.data[out.length] = '\0';
+}
+
 // ------------------------------------------------------------------------------------------------
 // .MD5MESH parsing function
-MD5MeshParser::MD5MeshParser(SectionList &mSections) {
+MD5MeshParser::MD5MeshParser(SectionArray &mSections) {
     ASSIMP_LOG_DEBUG("MD5MeshParser begin");
 
     // now parse all sections
-    for (SectionList::const_iterator iter = mSections.begin(), iterEnd = mSections.end(); iter != iterEnd; ++iter) {
+    for (SectionArray::const_iterator iter = mSections.begin(), iterEnd = mSections.end(); iter != iterEnd; ++iter) {
         if ((*iter).mName == "numMeshes") {
             mMeshes.reserve(::strtoul10((*iter).mGlobalValue.c_str()));
         } else if ((*iter).mName == "numJoints") {
@@ -288,14 +327,15 @@ MD5MeshParser::MD5MeshParser(SectionList &mSections) {
                 BoneDesc &desc = mJoints.back();
 
                 const char *sz = elem.szStart;
-                AI_MD5_PARSE_STRING_IN_QUOTATION(desc.mName);
-                AI_MD5_SKIP_SPACES();
+                AI_MD5_PARSE_STRING_IN_QUOTATION(&sz, elem.end, desc.mName);
+
+                AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
 
                 // negative values, at least -1, is allowed here
                 desc.mParentIndex = (int)strtol10(sz, &sz);
 
-                AI_MD5_READ_TRIPLE(desc.mPositionXYZ);
-                AI_MD5_READ_TRIPLE(desc.mRotationQuat); // normalized quaternion, so w is not there
+                AI_MD5_READ_TRIPLE(desc.mPositionXYZ, &sz, elem.end, elem.iLineNumber);
+                AI_MD5_READ_TRIPLE(desc.mRotationQuat, &sz, elem.end, elem.iLineNumber); // normalized quaternion, so w is not there
             }
         } else if ((*iter).mName == "mesh") {
             mMeshes.emplace_back();
@@ -306,52 +346,52 @@ MD5MeshParser::MD5MeshParser(SectionList &mSections) {
 
                 // shader attribute
                 if (TokenMatch(sz, "shader", 6)) {
-                    AI_MD5_SKIP_SPACES();
-                    AI_MD5_PARSE_STRING_IN_QUOTATION(desc.mShader);
+                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
+                    AI_MD5_PARSE_STRING_IN_QUOTATION(&sz, elem.end, desc.mShader);
                 }
                 // numverts attribute
                 else if (TokenMatch(sz, "numverts", 8)) {
-                    AI_MD5_SKIP_SPACES();
+                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                     desc.mVertices.resize(strtoul10(sz));
                 }
                 // numtris attribute
                 else if (TokenMatch(sz, "numtris", 7)) {
-                    AI_MD5_SKIP_SPACES();
+                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                     desc.mFaces.resize(strtoul10(sz));
                 }
                 // numweights attribute
                 else if (TokenMatch(sz, "numweights", 10)) {
-                    AI_MD5_SKIP_SPACES();
+                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                     desc.mWeights.resize(strtoul10(sz));
                 }
                 // vert attribute
                 // "vert 0 ( 0.394531 0.513672 ) 0 1"
                 else if (TokenMatch(sz, "vert", 4)) {
-                    AI_MD5_SKIP_SPACES();
+                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                     const unsigned int idx = ::strtoul10(sz, &sz);
-                    AI_MD5_SKIP_SPACES();
+                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                     if (idx >= desc.mVertices.size())
                         desc.mVertices.resize(idx + 1);
 
                     VertexDesc &vert = desc.mVertices[idx];
                     if ('(' != *sz++)
                         MD5Parser::ReportWarning("Unexpected token: ( was expected", elem.iLineNumber);
-                    AI_MD5_SKIP_SPACES();
+                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                     sz = fast_atoreal_move<float>(sz, (float &)vert.mUV.x);
-                    AI_MD5_SKIP_SPACES();
+                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                     sz = fast_atoreal_move<float>(sz, (float &)vert.mUV.y);
-                    AI_MD5_SKIP_SPACES();
+                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                     if (')' != *sz++)
                         MD5Parser::ReportWarning("Unexpected token: ) was expected", elem.iLineNumber);
-                    AI_MD5_SKIP_SPACES();
+                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                     vert.mFirstWeight = ::strtoul10(sz, &sz);
-                    AI_MD5_SKIP_SPACES();
+                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                     vert.mNumWeights = ::strtoul10(sz, &sz);
                 }
                 // tri attribute
                 // "tri 0 15 13 12"
                 else if (TokenMatch(sz, "tri", 3)) {
-                    AI_MD5_SKIP_SPACES();
+                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                     const unsigned int idx = strtoul10(sz, &sz);
                     if (idx >= desc.mFaces.size())
                         desc.mFaces.resize(idx + 1);
@@ -359,24 +399,24 @@ MD5MeshParser::MD5MeshParser(SectionList &mSections) {
                     aiFace &face = desc.mFaces[idx];
                     face.mIndices = new unsigned int[face.mNumIndices = 3];
                     for (unsigned int i = 0; i < 3; ++i) {
-                        AI_MD5_SKIP_SPACES();
+                        AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                         face.mIndices[i] = strtoul10(sz, &sz);
                     }
                 }
                 // weight attribute
                 // "weight 362 5 0.500000 ( -3.553583 11.893474 9.719339 )"
                 else if (TokenMatch(sz, "weight", 6)) {
-                    AI_MD5_SKIP_SPACES();
+                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                     const unsigned int idx = strtoul10(sz, &sz);
-                    AI_MD5_SKIP_SPACES();
+                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                     if (idx >= desc.mWeights.size())
                         desc.mWeights.resize(idx + 1);
 
                     WeightDesc &weight = desc.mWeights[idx];
                     weight.mBone = strtoul10(sz, &sz);
-                    AI_MD5_SKIP_SPACES();
+                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                     sz = fast_atoreal_move<float>(sz, weight.mWeight);
-                    AI_MD5_READ_TRIPLE(weight.vOffsetPosition);
+                    AI_MD5_READ_TRIPLE(weight.vOffsetPosition, &sz, elem.end, elem.iLineNumber);
                 }
             }
         }
@@ -386,12 +426,12 @@ MD5MeshParser::MD5MeshParser(SectionList &mSections) {
 
 // ------------------------------------------------------------------------------------------------
 // .MD5ANIM parsing function
-MD5AnimParser::MD5AnimParser(SectionList &mSections) {
+MD5AnimParser::MD5AnimParser(SectionArray &mSections) {
     ASSIMP_LOG_DEBUG("MD5AnimParser begin");
 
     fFrameRate = 24.0f;
     mNumAnimatedComponents = UINT_MAX;
-    for (SectionList::const_iterator iter = mSections.begin(), iterEnd = mSections.end(); iter != iterEnd; ++iter) {
+    for (SectionArray::const_iterator iter = mSections.begin(), iterEnd = mSections.end(); iter != iterEnd; ++iter) {
         if ((*iter).mName == "hierarchy") {
             // "sheath" 0 63 6
             for (const auto &elem : (*iter).mElements) {
@@ -399,18 +439,18 @@ MD5AnimParser::MD5AnimParser(SectionList &mSections) {
                 AnimBoneDesc &desc = mAnimatedBones.back();
 
                 const char *sz = elem.szStart;
-                AI_MD5_PARSE_STRING_IN_QUOTATION(desc.mName);
-                AI_MD5_SKIP_SPACES();
+                AI_MD5_PARSE_STRING_IN_QUOTATION(&sz, elem.end, desc.mName);
+                AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
 
                 // parent index - negative values are allowed (at least -1)
                 desc.mParentIndex = ::strtol10(sz, &sz);
 
                 // flags (highest is 2^6-1)
-                AI_MD5_SKIP_SPACES();
+                AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                 if (63 < (desc.iFlags = ::strtoul10(sz, &sz))) {
                     MD5Parser::ReportWarning("Invalid flag combination in hierarchy section", elem.iLineNumber);
                 }
-                AI_MD5_SKIP_SPACES();
+                AI_MD5_SKIP_SPACES(&  sz, elem.end, elem.iLineNumber);
 
                 // index of the first animation keyframe component for this joint
                 desc.iFirstKeyIndex = ::strtoul10(sz, &sz);
@@ -423,8 +463,8 @@ MD5AnimParser::MD5AnimParser(SectionList &mSections) {
                 mBaseFrames.emplace_back();
                 BaseFrameDesc &desc = mBaseFrames.back();
 
-                AI_MD5_READ_TRIPLE(desc.vPositionXYZ);
-                AI_MD5_READ_TRIPLE(desc.vRotationQuat);
+                AI_MD5_READ_TRIPLE(desc.vPositionXYZ, &sz, elem.end, elem.iLineNumber);
+                AI_MD5_READ_TRIPLE(desc.vRotationQuat, &sz, elem.end, elem.iLineNumber);
             }
         } else if ((*iter).mName == "frame") {
             if (!(*iter).mGlobalValue.length()) {
@@ -444,7 +484,7 @@ MD5AnimParser::MD5AnimParser(SectionList &mSections) {
             // now read all elements (continuous list of floats)
             for (const auto &elem : (*iter).mElements) {
                 const char *sz = elem.szStart;
-                while (SkipSpacesAndLineEnd(&sz)) {
+                while (SkipSpacesAndLineEnd(&sz, elem.end)) {
                     float f;
                     sz = fast_atoreal_move<float>(sz, f);
                     desc.mValues.push_back(f);
@@ -471,11 +511,11 @@ MD5AnimParser::MD5AnimParser(SectionList &mSections) {
 
 // ------------------------------------------------------------------------------------------------
 // .MD5CAMERA parsing function
-MD5CameraParser::MD5CameraParser(SectionList &mSections) {
+MD5CameraParser::MD5CameraParser(SectionArray &mSections) {
     ASSIMP_LOG_DEBUG("MD5CameraParser begin");
     fFrameRate = 24.0f;
 
-    for (SectionList::const_iterator iter = mSections.begin(), iterEnd = mSections.end(); iter != iterEnd; ++iter) {
+    for (SectionArray::const_iterator iter = mSections.begin(), iterEnd = mSections.end(); iter != iterEnd; ++iter) {
         if ((*iter).mName == "numFrames") {
             frames.reserve(strtoul10((*iter).mGlobalValue.c_str()));
         } else if ((*iter).mName == "frameRate") {
@@ -492,9 +532,9 @@ MD5CameraParser::MD5CameraParser(SectionList &mSections) {
 
                 frames.emplace_back();
                 CameraAnimFrameDesc &cur = frames.back();
-                AI_MD5_READ_TRIPLE(cur.vPositionXYZ);
-                AI_MD5_READ_TRIPLE(cur.vRotationQuat);
-                AI_MD5_SKIP_SPACES();
+                AI_MD5_READ_TRIPLE(cur.vPositionXYZ, &sz, elem.end, elem.iLineNumber);
+                AI_MD5_READ_TRIPLE(cur.vRotationQuat, &sz, elem.end, elem.iLineNumber);
+                AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                 cur.fFOV = fast_atof(sz);
             }
         }
diff --git a/code/AssetLib/MD5/MD5Parser.h b/code/AssetLib/MD5/MD5Parser.h
index 9b29fbe85..cead5f0b6 100644
--- a/code/AssetLib/MD5/MD5Parser.h
+++ b/code/AssetLib/MD5/MD5Parser.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2023, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -68,12 +68,14 @@ struct Element {
     //! Elements are terminated with \0
     char* szStart;
 
+    const char *end;
+
     //! Original line number (can be used in error messages
     //! if a parsing error occurs)
     unsigned int iLineNumber;
 };
 
-using ElementList = std::vector<Element>;
+using ElementArray = std::vector<Element>;
 
 // ---------------------------------------------------------------------------
 /** Represents a section of a MD5 file (such as the mesh or the joints section)
@@ -86,7 +88,7 @@ struct Section {
     unsigned int iLineNumber;
 
     //! List of all elements which have been parsed in this section.
-    ElementList mElements;
+    ElementArray mElements;
 
     //! Name of the section
     std::string mName;
@@ -96,7 +98,7 @@ struct Section {
     std::string mGlobalValue;
 };
 
-using SectionList = std::vector<Section>;
+using SectionArray = std::vector<Section>;
 
 // ---------------------------------------------------------------------------
 /** Basic information about a joint
@@ -132,7 +134,7 @@ struct BoneDesc : BaseJointDescription {
     unsigned int mMap;
 };
 
-using BoneList = std::vector<BoneDesc>;
+using BoneArray = std::vector<BoneDesc>;
 
 // ---------------------------------------------------------------------------
 /** Represents a bone (joint) descriptor in a MD5Anim file
@@ -145,7 +147,7 @@ struct AnimBoneDesc : BaseJointDescription {
     unsigned int iFirstKeyIndex;
 };
 
-using AnimBoneList = std::vector< AnimBoneDesc >;
+using AnimBoneArray = std::vector< AnimBoneDesc >;
 
 // ---------------------------------------------------------------------------
 /** Represents a base frame descriptor in a MD5Anim file
@@ -155,7 +157,7 @@ struct BaseFrameDesc {
     aiVector3D vRotationQuat;
 };
 
-using BaseFrameList = std::vector<BaseFrameDesc>;
+using BaseFrameArray = std::vector<BaseFrameDesc>;
 
 // ---------------------------------------------------------------------------
 /** Represents a camera animation frame in a MDCamera file
@@ -164,7 +166,7 @@ struct CameraAnimFrameDesc : BaseFrameDesc {
     float fFOV;
 };
 
-using CameraFrameList = std::vector<CameraAnimFrameDesc>;
+using CameraFrameArray = std::vector<CameraAnimFrameDesc>;
 
 // ---------------------------------------------------------------------------
 /** Represents a frame descriptor in a MD5Anim file
@@ -177,7 +179,7 @@ struct FrameDesc {
     std::vector< float > mValues;
 };
 
-using FrameList = std::vector<FrameDesc>;
+using FrameArray = std::vector<FrameDesc>;
 
 // ---------------------------------------------------------------------------
 /** Represents a vertex  descriptor in a MD5 file
@@ -199,7 +201,7 @@ struct VertexDesc {
     unsigned int mNumWeights;
 };
 
-using VertexList = std::vector<VertexDesc>;
+using VertexArray = std::vector<VertexDesc>;
 
 // ---------------------------------------------------------------------------
 /** Represents a vertex weight descriptor in a MD5 file
@@ -216,27 +218,27 @@ struct WeightDesc {
     aiVector3D vOffsetPosition;
 };
 
-using WeightList = std::vector<WeightDesc>;
-using FaceList   = std::vector<aiFace>;
+using WeightArray = std::vector<WeightDesc>;
+using FaceArray   = std::vector<aiFace>;
 
 // ---------------------------------------------------------------------------
 /** Represents a mesh in a MD5 file
 */
 struct MeshDesc {
     //! Weights of the mesh
-    WeightList mWeights;
+    WeightArray mWeights;
 
     //! Vertices of the mesh
-    VertexList mVertices;
+    VertexArray mVertices;
 
     //! Faces of the mesh
-    FaceList mFaces;
+    FaceArray mFaces;
 
     //! Name of the shader (=texture) to be assigned to the mesh
     aiString mShader;
 };
 
-using MeshList = std::vector<MeshDesc>;
+using MeshArray = std::vector<MeshDesc>;
 
 // ---------------------------------------------------------------------------
 // Convert a quaternion to its usual representation
@@ -269,13 +271,13 @@ public:
      *
      *  @param mSections List of file sections (output of MD5Parser)
      */
-    explicit MD5MeshParser(SectionList& mSections);
+    explicit MD5MeshParser(SectionArray& mSections);
 
     //! List of all meshes
-    MeshList mMeshes;
+    MeshArray mMeshes;
 
     //! List of all joints
-    BoneList mJoints;
+    BoneArray mJoints;
 };
 
 // remove this flag if you need to the bounding box data
@@ -292,20 +294,20 @@ public:
      *
      *  @param mSections List of file sections (output of MD5Parser)
      */
-    explicit MD5AnimParser(SectionList& mSections);
+    explicit MD5AnimParser(SectionArray& mSections);
 
 
     //! Output frame rate
     float fFrameRate;
 
     //! List of animation bones
-    AnimBoneList mAnimatedBones;
+    AnimBoneArray mAnimatedBones;
 
     //! List of base frames
-    BaseFrameList mBaseFrames;
+    BaseFrameArray mBaseFrames;
 
     //! List of animation frames
-    FrameList mFrames;
+    FrameArray mFrames;
 
     //! Number of animated components
     unsigned int mNumAnimatedComponents;
@@ -322,7 +324,7 @@ public:
      *
      *  @param mSections List of file sections (output of MD5Parser)
      */
-    explicit MD5CameraParser(SectionList& mSections);
+    explicit MD5CameraParser(SectionArray& mSections);
 
     //! Output frame rate
     float fFrameRate;
@@ -331,7 +333,7 @@ public:
     std::vector<unsigned int> cuts;
 
     //! Frames
-    CameraFrameList frames;
+    CameraFrameArray frames;
 };
 
 // ---------------------------------------------------------------------------
@@ -375,7 +377,7 @@ public:
     void ReportWarning (const char* warn);
 
     //! List of all sections which have been read
-    SectionList mSections;
+    SectionArray mSections;
 
 private:
     bool ParseSection(Section& out);
@@ -388,7 +390,7 @@ private:
 
 private:
     char* buffer;
-    char* bufferEnd;
+    const char* bufferEnd;
     unsigned int fileSize;
     unsigned int lineNumber;
 };
@@ -406,7 +408,7 @@ inline void MD5Parser::ReportError(const char* error) {
 // -------------------------------------------------------------------
 inline bool MD5Parser::SkipLine(const char* in, const char** out) {
     ++lineNumber;
-    return Assimp::SkipLine(in ,out);
+    return Assimp::SkipLine(in, out, bufferEnd);
 }
 
 // -------------------------------------------------------------------
@@ -420,7 +422,7 @@ inline bool MD5Parser::SkipSpacesAndLineEnd( const char* in, const char** out) {
         *out = in;
         return false;
     }
-    
+
     bool bHad = false, running = true;
     while (running) {
         if( *in == '\r' || *in == '\n') {
@@ -450,7 +452,7 @@ inline bool MD5Parser::SkipSpacesAndLineEnd() {
 
 // -------------------------------------------------------------------
 inline bool MD5Parser::SkipSpaces() {
-    return Assimp::SkipSpaces((const char**)&buffer);
+    return Assimp::SkipSpaces((const char**)&buffer, bufferEnd);
 }
 
 } // namespace Assimp
diff --git a/code/AssetLib/MDC/MDCFileData.h b/code/AssetLib/MDC/MDCFileData.h
index 36c589e91..6715cd14b 100644
--- a/code/AssetLib/MDC/MDCFileData.h
+++ b/code/AssetLib/MDC/MDCFileData.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -61,7 +60,7 @@ http://themdcfile.planetwolfenstein.gamespy.com/MDC_File_Format.pdf
 namespace Assimp {
 namespace MDC {
 
-// to make it easier for us, we test the magic word against both "endianesses"
+// to make it easier for us, we test the magic word against both "endiannesses"
 #define AI_MDC_MAGIC_NUMBER_BE  AI_MAKE_MAGIC("CPDI")
 #define AI_MDC_MAGIC_NUMBER_LE  AI_MAKE_MAGIC("IDPC")
 
diff --git a/code/AssetLib/MDC/MDCLoader.cpp b/code/AssetLib/MDC/MDCLoader.cpp
index 87247adec..abb063d4f 100644
--- a/code/AssetLib/MDC/MDCLoader.cpp
+++ b/code/AssetLib/MDC/MDCLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -44,9 +44,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_MDC_IMPORTER
 
 // internal headers
-#include "AssetLib/MDC/MDCLoader.h"
+#include "MDCLoader.h"
 #include "AssetLib/MD3/MD3FileData.h"
-#include "AssetLib/MDC/MDCNormalTable.h" // shouldn't be included by other units
+#include "MDCNormalTable.h" // shouldn't be included by other units
 
 #include <assimp/importerdesc.h>
 #include <assimp/scene.h>
@@ -106,7 +106,7 @@ MDCImporter::MDCImporter() :
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool MDCImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    static const uint32_t tokens[] = { AI_MDC_MAGIC_NUMBER_LE };
+    static constexpr uint32_t tokens[] = { AI_MDC_MAGIC_NUMBER_LE };
     return CheckMagicToken(pIOHandler, pFile, tokens, AI_COUNT_OF(tokens));
 }
 
diff --git a/code/AssetLib/MDC/MDCLoader.h b/code/AssetLib/MDC/MDCLoader.h
index a1f8d9fc9..97eae44ce 100644
--- a/code/AssetLib/MDC/MDCLoader.h
+++ b/code/AssetLib/MDC/MDCLoader.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MDL/HalfLife/HL1FileData.h b/code/AssetLib/MDL/HalfLife/HL1FileData.h
index 28b1b2822..d2c00150d 100644
--- a/code/AssetLib/MDL/HalfLife/HL1FileData.h
+++ b/code/AssetLib/MDL/HalfLife/HL1FileData.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MDL/HalfLife/HL1ImportDefinitions.h b/code/AssetLib/MDL/HalfLife/HL1ImportDefinitions.h
index d412aeede..b2e859269 100644
--- a/code/AssetLib/MDL/HalfLife/HL1ImportDefinitions.h
+++ b/code/AssetLib/MDL/HalfLife/HL1ImportDefinitions.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MDL/HalfLife/HL1ImportSettings.h b/code/AssetLib/MDL/HalfLife/HL1ImportSettings.h
index 340ba2da5..2eb5488e4 100644
--- a/code/AssetLib/MDL/HalfLife/HL1ImportSettings.h
+++ b/code/AssetLib/MDL/HalfLife/HL1ImportSettings.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -63,7 +63,8 @@ struct HL1ImportSettings {
         read_bone_controllers(false),
         read_hitboxes(false),
         read_textures(false),
-        read_misc_global_info(false) {
+        read_misc_global_info(false),
+        transform_coord_system(true) {
     }
 
     bool read_animations;
@@ -76,6 +77,7 @@ struct HL1ImportSettings {
     bool read_hitboxes;
     bool read_textures;
     bool read_misc_global_info;
+    bool transform_coord_system;
 };
 
 } // namespace HalfLife
diff --git a/code/AssetLib/MDL/HalfLife/HL1MDLLoader.cpp b/code/AssetLib/MDL/HalfLife/HL1MDLLoader.cpp
index a8141fcc1..7288ba799 100644
--- a/code/AssetLib/MDL/HalfLife/HL1MDLLoader.cpp
+++ b/code/AssetLib/MDL/HalfLife/HL1MDLLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MDL/HalfLife/HL1MDLLoader.h b/code/AssetLib/MDL/HalfLife/HL1MDLLoader.h
index 286b6e64c..42eee486d 100644
--- a/code/AssetLib/MDL/HalfLife/HL1MDLLoader.h
+++ b/code/AssetLib/MDL/HalfLife/HL1MDLLoader.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MDL/HalfLife/HL1MeshTrivert.h b/code/AssetLib/MDL/HalfLife/HL1MeshTrivert.h
index 4ef8a13ce..76c1a7f20 100644
--- a/code/AssetLib/MDL/HalfLife/HL1MeshTrivert.h
+++ b/code/AssetLib/MDL/HalfLife/HL1MeshTrivert.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MDL/HalfLife/HalfLifeMDLBaseHeader.h b/code/AssetLib/MDL/HalfLife/HalfLifeMDLBaseHeader.h
index c7808c401..98c438945 100644
--- a/code/AssetLib/MDL/HalfLife/HalfLifeMDLBaseHeader.h
+++ b/code/AssetLib/MDL/HalfLife/HalfLifeMDLBaseHeader.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MDL/HalfLife/LogFunctions.h b/code/AssetLib/MDL/HalfLife/LogFunctions.h
index 003774dc1..90022ce2e 100644
--- a/code/AssetLib/MDL/HalfLife/LogFunctions.h
+++ b/code/AssetLib/MDL/HalfLife/LogFunctions.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MDL/HalfLife/UniqueNameGenerator.cpp b/code/AssetLib/MDL/HalfLife/UniqueNameGenerator.cpp
index 3cca8c558..59030c071 100644
--- a/code/AssetLib/MDL/HalfLife/UniqueNameGenerator.cpp
+++ b/code/AssetLib/MDL/HalfLife/UniqueNameGenerator.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MDL/HalfLife/UniqueNameGenerator.h b/code/AssetLib/MDL/HalfLife/UniqueNameGenerator.h
index 73b6f9e74..53c55f643 100644
--- a/code/AssetLib/MDL/HalfLife/UniqueNameGenerator.h
+++ b/code/AssetLib/MDL/HalfLife/UniqueNameGenerator.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MDL/MDLDefaultColorMap.h b/code/AssetLib/MDL/MDLDefaultColorMap.h
index 2eecac2dc..9fc7c4abf 100644
--- a/code/AssetLib/MDL/MDLDefaultColorMap.h
+++ b/code/AssetLib/MDL/MDLDefaultColorMap.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MDL/MDLFileData.h b/code/AssetLib/MDL/MDLFileData.h
index 7ec2afe9a..83356935c 100644
--- a/code/AssetLib/MDL/MDLFileData.h
+++ b/code/AssetLib/MDL/MDLFileData.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -63,11 +62,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct aiMaterial;
 
-namespace Assimp    {
-namespace MDL   {
+namespace Assimp {
+namespace MDL {
 
 // -------------------------------------------------------------------------------------
-// to make it easier for us, we test the magic word against both "endianesses"
+// to make it easier for us, we test the magic word against both "endiannesses"
 
 // magic bytes used in Quake 1 MDL meshes
 #define AI_MDL_MAGIC_NUMBER_BE  AI_MAKE_MAGIC("IDPO")
@@ -603,7 +602,7 @@ struct Vertex_MDL7
     union {
         uint8_t norm162index;
         float norm[3];
-    };
+    } PACK_STRUCT;
 } PACK_STRUCT;
 
 // -------------------------------------------------------------------------------------
@@ -876,7 +875,7 @@ struct IntSharedData_MDL7 {
         : apcOutBones(),
         iNum()
     {
-        abNeedMaterials.reserve(10);
+        abNeedMaterials.reserve(12);
     }
 
     //! Destruction: properly delete all allocated resources
diff --git a/code/AssetLib/MDL/MDLLoader.cpp b/code/AssetLib/MDL/MDLLoader.cpp
index 2b14fe980..9839bf41c 100644
--- a/code/AssetLib/MDL/MDLLoader.cpp
+++ b/code/AssetLib/MDL/MDLLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -48,10 +48,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_MDL_IMPORTER
 
-#include "AssetLib/MDL/MDLLoader.h"
+#include "MDLLoader.h"
 #include "AssetLib/MD2/MD2FileData.h"
-#include "AssetLib/MDL/HalfLife/HL1MDLLoader.h"
-#include "AssetLib/MDL/MDLDefaultColorMap.h"
+#include "HalfLife/HL1MDLLoader.h"
+#include "MDLDefaultColorMap.h"
 
 #include <assimp/StringUtils.h>
 #include <assimp/importerdesc.h>
@@ -99,7 +99,7 @@ MDLImporter::MDLImporter() :
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool MDLImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    static const uint32_t tokens[] = {
+    static constexpr uint32_t tokens[] = {
         AI_MDL_MAGIC_NUMBER_LE_HL2a,
         AI_MDL_MAGIC_NUMBER_LE_HL2b,
         AI_MDL_MAGIC_NUMBER_LE_GS7,
@@ -138,6 +138,7 @@ void MDLImporter::SetupProperties(const Importer *pImp) {
     mHL1ImportSettings.read_bone_controllers = pImp->GetPropertyBool(AI_CONFIG_IMPORT_MDL_HL1_READ_BONE_CONTROLLERS, true);
     mHL1ImportSettings.read_hitboxes = pImp->GetPropertyBool(AI_CONFIG_IMPORT_MDL_HL1_READ_HITBOXES, true);
     mHL1ImportSettings.read_misc_global_info = pImp->GetPropertyBool(AI_CONFIG_IMPORT_MDL_HL1_READ_MISC_GLOBAL_INFO, true);
+    mHL1ImportSettings.transform_coord_system = pImp->GetPropertyBool(AI_CONFIG_IMPORT_MDL_HL1_TRANSFORM_COORD_SYSTEM);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -146,6 +147,20 @@ const aiImporterDesc *MDLImporter::GetInfo() const {
     return &desc;
 }
 
+// ------------------------------------------------------------------------------------------------
+static void transformCoordinateSystem(const aiScene *pScene) {
+    if (pScene == nullptr) {
+        return;
+    }
+
+    pScene->mRootNode->mTransformation = aiMatrix4x4(
+        0.f, -1.f, 0.f, 0.f,
+        0.f, 0.f, 1.f, 0.f,
+        -1.f, 0.f, 0.f, 0.f,
+        0.f, 0.f, 0.f, 1.f
+    );
+}
+
 // ------------------------------------------------------------------------------------------------
 // Imports the given file into the given scene structure.
 void MDLImporter::InternReadFile(const std::string &pFile,
@@ -246,18 +261,16 @@ void MDLImporter::InternReadFile(const std::string &pFile,
                                     ". Magic word (", ai_str_toprintable((const char *)&iMagicWord, sizeof(iMagicWord)), ") is not known");
         }
 
-        if (is_half_life){
+        if (is_half_life && mHL1ImportSettings.transform_coord_system) {
             // Now rotate the whole scene 90 degrees around the z and x axes to convert to internal coordinate system
-            pScene->mRootNode->mTransformation = aiMatrix4x4(
-                    0.f, -1.f, 0.f, 0.f,
-                    0.f, 0.f, 1.f, 0.f,
-                    -1.f, 0.f, 0.f, 0.f,
-                    0.f, 0.f, 0.f, 1.f);
-        }
-        else {
+            transformCoordinateSystem(pScene);
+        } else {
             // Now rotate the whole scene 90 degrees around the x axis to convert to internal coordinate system
-            pScene->mRootNode->mTransformation = aiMatrix4x4(1.f, 0.f, 0.f, 0.f,
-                    0.f, 0.f, 1.f, 0.f, 0.f, -1.f, 0.f, 0.f, 0.f, 0.f, 0.f, 1.f);
+            pScene->mRootNode->mTransformation = aiMatrix4x4(
+                1.f,  0.f, 0.f, 0.f,
+                0.f,  0.f, 1.f, 0.f,
+                0.f, -1.f, 0.f, 0.f,
+                0.f,  0.f, 0.f, 1.f);
         }
 
         DeleteBufferAndCleanup();
@@ -312,13 +325,13 @@ void MDLImporter::SizeCheck(const void *szPos, const char *szFile, unsigned int
 // Validate a quake file header
 void MDLImporter::ValidateHeader_Quake1(const MDL::Header *pcHeader) {
     // some values may not be nullptr
-    if (!pcHeader->num_frames)
+    if (pcHeader->num_frames <= 0)
         throw DeadlyImportError("[Quake 1 MDL] There are no frames in the file");
 
-    if (!pcHeader->num_verts)
+    if (pcHeader->num_verts <= 0)
         throw DeadlyImportError("[Quake 1 MDL] There are no vertices in the file");
 
-    if (!pcHeader->num_tris)
+    if (pcHeader->num_tris <= 0)
         throw DeadlyImportError("[Quake 1 MDL] There are no triangles in the file");
 
     // check whether the maxima are exceeded ...however, this applies for Quake 1 MDLs only
@@ -407,7 +420,7 @@ void MDLImporter::InternReadFile_Quake1() {
                 }
                 // go to the end of the skin section / the beginning of the next skin
                 bool overflow = false;
-                if (pcHeader->skinwidth != 0 || pcHeader->skinheight != 0) {
+                if (pcHeader->skinwidth != 0 && pcHeader->skinheight != 0) {
                     if ((pcHeader->skinheight > INT_MAX / pcHeader->skinwidth) || (pcHeader->skinwidth > INT_MAX / pcHeader->skinheight)){
                         overflow = true;
                     }
@@ -962,7 +975,7 @@ void MDLImporter::CalcAbsBoneMatrices_3DGS_MDL7(MDL::IntBone_MDL7 **apcOutBones)
 
                 if (AI_MDL7_BONE_STRUCT_SIZE__NAME_IS_NOT_THERE == pcHeader->bone_stc_size) {
                     // no real name for our poor bone is specified :-(
-                    pcOutBone->mName.length = ai_snprintf(pcOutBone->mName.data, MAXLEN,
+                    pcOutBone->mName.length = ai_snprintf(pcOutBone->mName.data, AI_MAXLEN,
                             "UnnamedBone_%i", iBone);
                 } else {
                     // Make sure we won't run over the buffer's end if there is no
@@ -1567,7 +1580,7 @@ void MDLImporter::InternReadFile_3DGS_MDL7() {
             } else {
                 pcNode->mName.length = (ai_uint32)::strlen(szBuffer);
             }
-            ::strncpy(pcNode->mName.data, szBuffer, MAXLEN - 1);
+            ::strncpy(pcNode->mName.data, szBuffer, AI_MAXLEN - 1);
             ++p;
         }
     }
diff --git a/code/AssetLib/MDL/MDLLoader.h b/code/AssetLib/MDL/MDLLoader.h
index 333f7c8b1..18186f29c 100644
--- a/code/AssetLib/MDL/MDLLoader.h
+++ b/code/AssetLib/MDL/MDLLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/BaseImporter.h>
 #include "MDLFileData.h"
 #include "AssetLib/HMP/HalfLifeFileData.h"
-#include "AssetLib/MDL/HalfLife/HL1ImportSettings.h"
+#include "HalfLife/HL1ImportSettings.h"
 
 struct aiNode;
 struct aiTexture;
diff --git a/code/AssetLib/MDL/MDLMaterialLoader.cpp b/code/AssetLib/MDL/MDLMaterialLoader.cpp
index 3d39fa645..3c1fc0224 100644
--- a/code/AssetLib/MDL/MDLMaterialLoader.cpp
+++ b/code/AssetLib/MDL/MDLMaterialLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -123,9 +123,8 @@ aiColor4D MDLImporter::ReplaceTextureWithColor(const aiTexture *pcTexture) {
 // Read a texture from a MDL3 file
 void MDLImporter::CreateTextureARGB8_3DGS_MDL3(const unsigned char *szData) {
     const MDL::Header *pcHeader = (const MDL::Header *)mBuffer; //the endianness is already corrected in the InternReadFile_3DGS_MDL345 function
-
-    VALIDATE_FILE_SIZE(szData + pcHeader->skinwidth *
-                                        pcHeader->skinheight);
+    const size_t len = pcHeader->skinwidth * pcHeader->skinheight;
+    VALIDATE_FILE_SIZE(szData + len);
 
     // allocate a new texture object
     aiTexture *pcNew = new aiTexture();
@@ -210,6 +209,8 @@ void MDLImporter::CreateTexture_3DGS_MDL4(const unsigned char *szData,
     return;
 }
 
+static const uint32_t MaxTextureSize = 4096;
+
 // ------------------------------------------------------------------------------------------------
 // Load color data of a texture and convert it to our output format
 void MDLImporter::ParseTextureColorData(const unsigned char *szData,
@@ -220,6 +221,11 @@ void MDLImporter::ParseTextureColorData(const unsigned char *szData,
 
     // allocate storage for the texture image
     if (do_read) {
+        // check for max texture sizes
+        if (pcNew->mWidth > MaxTextureSize || pcNew->mHeight > MaxTextureSize) {
+            throw DeadlyImportError("Invalid MDL file. A texture is too big.");
+        }
+
         if(pcNew->mWidth != 0 && pcNew->mHeight > UINT_MAX/pcNew->mWidth) {
             throw DeadlyImportError("Invalid MDL file. A texture is too big.");
         }
@@ -495,7 +501,7 @@ void MDLImporter::ParseSkinLump_3DGS_MDL7(
 
         aiString szFile;
         const size_t iLen = strlen((const char *)szCurrent);
-        size_t iLen2 = iLen > (MAXLEN - 1) ? (MAXLEN - 1) : iLen;
+        size_t iLen2 = iLen > (AI_MAXLEN - 1) ? (AI_MAXLEN - 1) : iLen;
         memcpy(szFile.data, (const char *)szCurrent, iLen2);
         szFile.data[iLen2] = '\0';
         szFile.length = static_cast<ai_uint32>(iLen2);
@@ -611,7 +617,7 @@ void MDLImporter::ParseSkinLump_3DGS_MDL7(
         if (is_not_qnan(clrTexture.r)) {
             clrTemp.r *= clrTexture.a;
         }
-        pcMatOut->AddProperty<ai_real>(&clrTemp.r, 1, AI_MATKEY_OPACITY);
+        pcMatOut->AddProperty<float>(&clrTemp.r, 1, AI_MATKEY_OPACITY);
 
         // read phong power
         int iShadingMode = (int)aiShadingMode_Gouraud;
@@ -731,9 +737,12 @@ void MDLImporter::SkipSkinLump_3DGS_MDL7(
     // if an ASCII effect description (HLSL?) is contained in the file,
     // we can simply ignore it ...
     if (iType & AI_MDL7_SKINTYPE_MATERIAL_ASCDEF) {
-        int32_t iMe = *((int32_t *)szCurrent);
+        VALIDATE_FILE_SIZE(szCurrent + sizeof(int32_t));
+        int32_t iMe = 0;
+        ::memcpy(&iMe, szCurrent, sizeof(int32_t));
         AI_SWAP4(iMe);
         szCurrent += sizeof(char) * iMe + sizeof(int32_t);
+        VALIDATE_FILE_SIZE(szCurrent);
     }
     *szCurrentOut = szCurrent;
 }
diff --git a/code/AssetLib/MMD/MMDCpp14.h b/code/AssetLib/MMD/MMDCpp14.h
index 10d376829..88115eed6 100644
--- a/code/AssetLib/MMD/MMDCpp14.h
+++ b/code/AssetLib/MMD/MMDCpp14.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MMD/MMDImporter.cpp b/code/AssetLib/MMD/MMDImporter.cpp
index b96d45c98..38eea08fb 100644
--- a/code/AssetLib/MMD/MMDImporter.cpp
+++ b/code/AssetLib/MMD/MMDImporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -41,10 +41,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_MMD_IMPORTER
 
-#include "AssetLib/MMD/MMDImporter.h"
-#include "AssetLib/MMD/MMDPmdParser.h"
-#include "AssetLib/MMD/MMDPmxParser.h"
-#include "AssetLib/MMD/MMDVmdParser.h"
+#include "MMDImporter.h"
+#include "MMDPmdParser.h"
+#include "MMDPmxParser.h"
+#include "MMDVmdParser.h"
 #include "PostProcessing/ConvertToLHProcess.h"
 
 #include <assimp/DefaultIOSystem.h>
diff --git a/code/AssetLib/MMD/MMDImporter.h b/code/AssetLib/MMD/MMDImporter.h
index 1f584bf12..512809de6 100644
--- a/code/AssetLib/MMD/MMDImporter.h
+++ b/code/AssetLib/MMD/MMDImporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/code/AssetLib/MMD/MMDPmdParser.h b/code/AssetLib/MMD/MMDPmdParser.h
index 23aaac555..1a73aca87 100644
--- a/code/AssetLib/MMD/MMDPmdParser.h
+++ b/code/AssetLib/MMD/MMDPmdParser.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MMD/MMDPmxParser.cpp b/code/AssetLib/MMD/MMDPmxParser.cpp
index 6b04f02e9..73d6b6ced 100644
--- a/code/AssetLib/MMD/MMDPmxParser.cpp
+++ b/code/AssetLib/MMD/MMDPmxParser.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MMD/MMDPmxParser.h b/code/AssetLib/MMD/MMDPmxParser.h
index 424fc725a..6c9729d88 100644
--- a/code/AssetLib/MMD/MMDPmxParser.h
+++ b/code/AssetLib/MMD/MMDPmxParser.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MMD/MMDVmdParser.h b/code/AssetLib/MMD/MMDVmdParser.h
index d5c7dedff..7c4f47b16 100644
--- a/code/AssetLib/MMD/MMDVmdParser.h
+++ b/code/AssetLib/MMD/MMDVmdParser.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/MS3D/MS3DLoader.cpp b/code/AssetLib/MS3D/MS3DLoader.cpp
index e0f0f8b5a..7b42a2526 100644
--- a/code/AssetLib/MS3D/MS3DLoader.cpp
+++ b/code/AssetLib/MS3D/MS3DLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/code/AssetLib/MS3D/MS3DLoader.h b/code/AssetLib/MS3D/MS3DLoader.h
index 3e25f1f59..c70a57e77 100644
--- a/code/AssetLib/MS3D/MS3DLoader.h
+++ b/code/AssetLib/MS3D/MS3DLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/NDO/NDOLoader.cpp b/code/AssetLib/NDO/NDOLoader.cpp
index 405438dfc..77640b172 100644
--- a/code/AssetLib/NDO/NDOLoader.cpp
+++ b/code/AssetLib/NDO/NDOLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -91,6 +91,36 @@ void NDOImporter::SetupProperties(const Importer* /*pImp*/)
     // nothing to be done for the moment
 }
 
+// ------------------------------------------------------------------------------------------------
+// Helper function to process edges and vertices for a face
+void ProcessFaceEdgesAndVertices(const NDOImporter::Object& obj,
+    unsigned int start_edge, unsigned int key,
+    std::vector<aiVector3D>& vertices, std::vector<unsigned int>& indices)
+{
+    unsigned int cur_edge = start_edge;
+    do {
+        unsigned int next_edge, next_vert;
+        if (key == obj.edges[cur_edge].edge[3]) {
+            next_edge = obj.edges[cur_edge].edge[5];
+            next_vert = obj.edges[cur_edge].edge[1];
+        }
+        else {
+            next_edge = obj.edges[cur_edge].edge[4];
+            next_vert = obj.edges[cur_edge].edge[0];
+        }
+        indices.push_back( static_cast<unsigned int>(vertices.size()) );
+        if (next_vert < obj.vertices.size()) {
+            vertices.push_back(obj.vertices[ next_vert ].val);
+        }
+        else {
+            ASSIMP_LOG_WARN("NDOImporter: next_vert is out of bounds, skipping invalid access.");
+            break;
+        }
+
+        cur_edge = next_edge;
+    } while (cur_edge != start_edge);
+}
+
 // ------------------------------------------------------------------------------------------------
 // Imports the given file into the given scene structure.
 void NDOImporter::InternReadFile( const std::string& pFile,
@@ -262,26 +292,7 @@ void NDOImporter::InternReadFile( const std::string& pFile,
 
             aiFace& f = *faces++;
 
-            const unsigned int key = v.first;
-            unsigned int cur_edge = v.second;
-            while (true) {
-                unsigned int next_edge, next_vert;
-                if (key == obj.edges[cur_edge].edge[3]) {
-                    next_edge = obj.edges[cur_edge].edge[5];
-                    next_vert = obj.edges[cur_edge].edge[1];
-                }
-                else {
-                    next_edge = obj.edges[cur_edge].edge[4];
-                    next_vert = obj.edges[cur_edge].edge[0];
-                }
-                indices.push_back( static_cast<unsigned int>(vertices.size()) );
-                vertices.push_back(obj.vertices[ next_vert ].val);
-
-                cur_edge = next_edge;
-                if (cur_edge == v.second) {
-                    break;
-                }
-            }
+            ProcessFaceEdgesAndVertices(obj, v.second, v.first, vertices, indices);
 
             f.mIndices = new unsigned int[f.mNumIndices = static_cast<unsigned int>(indices.size())];
             std::copy(indices.begin(),indices.end(),f.mIndices);
diff --git a/code/AssetLib/NDO/NDOLoader.h b/code/AssetLib/NDO/NDOLoader.h
index c4f127851..8c9a2f4b4 100644
--- a/code/AssetLib/NDO/NDOLoader.h
+++ b/code/AssetLib/NDO/NDOLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -65,7 +65,7 @@ class Importer;
 */
 class NDOImporter : public BaseImporter {
 public:
-    NDOImporter() = default; 
+    NDOImporter() = default;
     ~NDOImporter() override = default;
 
     //! Represents a single edge
diff --git a/code/AssetLib/NFF/NFFLoader.cpp b/code/AssetLib/NFF/NFFLoader.cpp
index 78adc27bd..4aaaaa64f 100644
--- a/code/AssetLib/NFF/NFFLoader.cpp
+++ b/code/AssetLib/NFF/NFFLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -85,7 +85,7 @@ const aiImporterDesc *NFFImporter::GetInfo() const {
 
 // ------------------------------------------------------------------------------------------------
 #define AI_NFF_PARSE_FLOAT(f) \
-    SkipSpaces(&sz);          \
+    SkipSpaces(&sz, lineEnd);          \
     if (!IsLineEnd(*sz)) sz = fast_atoreal_move<ai_real>(sz, (ai_real &)f);
 
 // ------------------------------------------------------------------------------------------------
@@ -111,7 +111,7 @@ const aiImporterDesc *NFFImporter::GetInfo() const {
             ASSIMP_LOG_WARN("NFF2: Unexpected EOF, can't read next token"); \
             break;                                                          \
         }                                                                   \
-        SkipSpaces(line, &sz);                                              \
+        SkipSpaces(line, &sz, lineEnd);                                              \
     } while (IsLineEnd(*sz))
 
 // ------------------------------------------------------------------------------------------------
@@ -148,9 +148,9 @@ void NFFImporter::LoadNFF2MaterialTable(std::vector<ShadingInfo> &output,
 
     // No read the file line per line
     char line[4096];
-    const char *sz;
+    const char *sz, *lineEnd = &line[2095]+1;
     while (GetNextLine(buffer, line)) {
-        SkipSpaces(line, &sz);
+        SkipSpaces(line, &sz, lineEnd);
 
         // 'version' defines the version of the file format
         if (TokenMatch(sz, "version", 7)) {
@@ -198,18 +198,16 @@ void NFFImporter::LoadNFF2MaterialTable(std::vector<ShadingInfo> &output,
 
 // ------------------------------------------------------------------------------------------------
 // Imports the given file into the given scene structure.
-void NFFImporter::InternReadFile(const std::string &pFile,
-        aiScene *pScene, IOSystem *pIOHandler) {
-    std::unique_ptr<IOStream> file(pIOHandler->Open(pFile, "rb"));
-
-    // Check whether we can read from the file
-    if (!file)
-        throw DeadlyImportError("Failed to open NFF file ", pFile, ".");
+void NFFImporter::InternReadFile(const std::string &file, aiScene *pScene, IOSystem *pIOHandler) {
+    std::unique_ptr<IOStream> stream(pIOHandler->Open(file, "rb"));
+    if (!stream) {
+        throw DeadlyImportError("Failed to open NFF file ", file, ".");
+    }
 
     // allocate storage and copy the contents of the file to a memory buffer
     // (terminate it with zero)
     std::vector<char> mBuffer2;
-    TextFileToBuffer(file.get(), mBuffer2);
+    TextFileToBuffer(stream.get(), mBuffer2);
     const char *buffer = &mBuffer2[0];
 
     // mesh arrays - separate here to make the handling of the pointers below easier.
@@ -219,8 +217,10 @@ void NFFImporter::InternReadFile(const std::string &pFile,
     std::vector<MeshInfo> meshesLocked;
 
     char line[4096];
+    const char *lineEnd = &line[4096];
     const char *sz;
 
+
     // camera parameters
     aiVector3D camPos, camUp(0.f, 1.f, 0.f), camLookAt(0.f, 0.f, 1.f);
     ai_real angle = 45.f;
@@ -265,7 +265,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
         CommentRemover::RemoveLineComments("//", &mBuffer2[0]);
 
         while (GetNextLine(buffer, line)) {
-            SkipSpaces(line, &sz);
+            SkipSpaces(line, &sz, lineEnd);
             if (TokenMatch(sz, "version", 7)) {
                 ASSIMP_LOG_INFO("NFF (Sense8) file format: ", sz);
             } else if (TokenMatch(sz, "viewpos", 7)) {
@@ -295,7 +295,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
 
                     // material table - an external file
                     if (TokenMatch(sz, "mtable", 6)) {
-                        SkipSpaces(&sz);
+                        SkipSpaces(&sz, lineEnd);
                         sz3 = sz;
                         while (!IsSpaceOrNewLine(*sz))
                             ++sz;
@@ -316,12 +316,12 @@ void NFFImporter::InternReadFile(const std::string &pFile,
                             std::string::size_type sepPos;
                             if ((std::string::npos == (sepPos = path.find_last_of('\\')) || !sepPos) &&
                                     (std::string::npos == (sepPos = path.find_last_of('/')) || !sepPos)) {
-                                sepPos = pFile.find_last_of('\\');
+                                sepPos = file.find_last_of('\\');
                                 if (std::string::npos == sepPos) {
-                                    sepPos = pFile.find_last_of('/');
+                                    sepPos = file.find_last_of('/');
                                 }
                                 if (std::string::npos != sepPos) {
-                                    path = pFile.substr(0, sepPos + 1) + path;
+                                    path = file.substr(0, sepPos + 1) + path;
                                 }
                             }
                             LoadNFF2MaterialTable(materialTable, path, pIOHandler);
@@ -351,7 +351,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
 
                     // parse all other attributes in the line
                     while (true) {
-                        SkipSpaces(&sz);
+                        SkipSpaces(&sz, lineEnd);
                         if (IsLineEnd(*sz)) break;
 
                         // color definition
@@ -403,23 +403,20 @@ void NFFImporter::InternReadFile(const std::string &pFile,
                 tempIdx.reserve(10);
                 for (unsigned int i = 0; i < num; ++i) {
                     AI_NFF2_GET_NEXT_TOKEN();
-                    SkipSpaces(line, &sz);
+                    SkipSpaces(line, &sz, lineEnd);
                     unsigned int numIdx = strtoul10(sz, &sz);
 
                     // read all faces indices
                     if (numIdx) {
-                        // mesh.faces.push_back(numIdx);
-                        // tempIdx.erase(tempIdx.begin(),tempIdx.end());
                         tempIdx.resize(numIdx);
 
                         for (unsigned int a = 0; a < numIdx; ++a) {
-                            SkipSpaces(sz, &sz);
+                            SkipSpaces(sz, &sz, lineEnd);
                             unsigned int m = strtoul10(sz, &sz);
                             if (m >= (unsigned int)tempPositions.size()) {
                                 ASSIMP_LOG_ERROR("NFF2: Vertex index overflow");
                                 m = 0;
                             }
-                            // mesh.vertices.push_back (tempPositions[idx]);
                             tempIdx[a] = m;
                         }
                     }
@@ -432,7 +429,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
                     shader.color = aiColor3D(1.f, 1.f, 1.f);
                     aiColor4D c = aiColor4D(1.f, 1.f, 1.f, 1.f);
                     while (true) {
-                        SkipSpaces(sz, &sz);
+                        SkipSpaces(sz, &sz, lineEnd);
                         if (IsLineEnd(*sz)) break;
 
                         // per-polygon colors
@@ -510,7 +507,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
 
                         // Material ID?
                         else if (!materialTable.empty() && TokenMatch(sz, "matid", 5)) {
-                            SkipSpaces(&sz);
+                            SkipSpaces(&sz, lineEnd);
                             matIdx = strtoul10(sz, &sz);
                             if (matIdx >= materialTable.size()) {
                                 ASSIMP_LOG_ERROR("NFF2: Material index overflow.");
@@ -527,7 +524,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
                             shader.specular = mat.specular;
                             shader.shininess = mat.shininess;
                         } else
-                            SkipToken(sz);
+                            SkipToken(sz, lineEnd);
                     }
 
                     // search the list of all shaders we have for this object whether
@@ -549,9 +546,9 @@ void NFFImporter::InternReadFile(const std::string &pFile,
                         // We need to add a new mesh to the list. We assign
                         // an unique name to it to make sure the scene will
                         // pass the validation step for the moment.
-                        // TODO: fix naming of objects in the scenegraph later
+                        // TODO: fix naming of objects in the scene-graph later
                         if (objectName.length()) {
-                            ::strcpy(mesh->name, objectName.c_str());
+                            ::strncpy(mesh->name, objectName.c_str(), objectName.size());
                             ASSIMP_itoa10(&mesh->name[objectName.length()], 30, subMeshIdx++);
                         }
 
@@ -649,7 +646,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
                     sz = &line[1];
                     out = currentMesh;
                 }
-                SkipSpaces(sz, &sz);
+                SkipSpaces(sz, &sz, lineEnd);
                 unsigned int m = strtoul10(sz);
 
                 // ---- flip the face order
@@ -677,13 +674,13 @@ void NFFImporter::InternReadFile(const std::string &pFile,
                     }
                     if (out == currentMeshWithUVCoords) {
                         // FIX: in one test file this wraps over multiple lines
-                        SkipSpaces(&sz);
+                        SkipSpaces(&sz, lineEnd);
                         if (IsLineEnd(*sz)) {
                             GetNextLine(buffer, line);
                             sz = line;
                         }
                         AI_NFF_PARSE_FLOAT(v.x);
-                        SkipSpaces(&sz);
+                        SkipSpaces(&sz, lineEnd);
                         if (IsLineEnd(*sz)) {
                             GetNextLine(buffer, line);
                             sz = line;
@@ -717,7 +714,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
                 // if the next one is NOT a number we assume it is a texture file name
                 // this feature is used by some NFF files on the internet and it has
                 // been implemented as it can be really useful
-                SkipSpaces(&sz);
+                SkipSpaces(&sz, lineEnd);
                 if (!IsNumeric(*sz)) {
                     // TODO: Support full file names with spaces and quotation marks ...
                     const char *p = sz;
@@ -731,10 +728,8 @@ void NFFImporter::InternReadFile(const std::string &pFile,
                 } else {
                     AI_NFF_PARSE_FLOAT(s.ambient); // optional
                 }
-            }
-            // 'shader' - other way to specify a texture
-            else if (TokenMatch(sz, "shader", 6)) {
-                SkipSpaces(&sz);
+            } else if (TokenMatch(sz, "shader", 6)) { // 'shader' - other way to specify a texture
+                SkipSpaces(&sz, lineEnd);
                 const char *old = sz;
                 while (!IsSpaceOrNewLine(*sz))
                     ++sz;
@@ -889,7 +884,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
             }
             // 'tess' - tessellation
             else if (TokenMatch(sz, "tess", 4)) {
-                SkipSpaces(&sz);
+                SkipSpaces(&sz, lineEnd);
                 iTesselation = strtoul10(sz);
             }
             // 'from' - camera position
@@ -929,7 +924,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
             // '' - comment
             else if ('#' == line[0]) {
                 const char *space;
-                SkipSpaces(&line[1], &space);
+                SkipSpaces(&line[1], &space, lineEnd);
                 if (!IsLineEnd(*space)) {
                     ASSIMP_LOG_INFO(space);
                 }
diff --git a/code/AssetLib/NFF/NFFLoader.h b/code/AssetLib/NFF/NFFLoader.h
index b402aec84..0018474ba 100644
--- a/code/AssetLib/NFF/NFFLoader.h
+++ b/code/AssetLib/NFF/NFFLoader.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/OFF/OFFLoader.cpp b/code/AssetLib/OFF/OFFLoader.cpp
index ce8dfc2d4..432a5634e 100644
--- a/code/AssetLib/OFF/OFFLoader.cpp
+++ b/code/AssetLib/OFF/OFFLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -84,10 +84,10 @@ const aiImporterDesc *OFFImporter::GetInfo() const {
 
 // skip blank space, lines and comments
 static void NextToken(const char **car, const char *end) {
-    SkipSpacesAndLineEnd(car);
+    SkipSpacesAndLineEnd(car, end);
     while (*car < end && (**car == '#' || **car == '\n' || **car == '\r')) {
-        SkipLine(car);
-        SkipSpacesAndLineEnd(car);
+        SkipLine(car, end);
+        SkipSpacesAndLineEnd(car, end);
     }
 }
 
@@ -195,6 +195,7 @@ void OFFImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     char line[4096];
     buffer = car;
     const char *sz = car;
+    const char *lineEnd = &line[4096];
 
     // now read all vertex lines
     for (unsigned int i = 0; i < numVertices; ++i) {
@@ -210,13 +211,13 @@ void OFFImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 
         // stop at dimensions: this allows loading 1D or 2D coordinate vertices
         for (unsigned int dim = 0; dim < dimensions; ++dim) {
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, lineEnd);
             sz = fast_atoreal_move<ai_real>(sz, *vec[dim]);
         }
 
         // if has homogeneous coordinate, divide others by this one
         if (hasHomogenous) {
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, lineEnd);
             ai_real w = 1.;
             sz = fast_atoreal_move<ai_real>(sz, w);
             for (unsigned int dim = 0; dim < dimensions; ++dim) {
@@ -227,11 +228,11 @@ void OFFImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
         // read optional normals
         if (hasNormals) {
             aiVector3D &n = mesh->mNormals[i];
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, lineEnd);
             sz = fast_atoreal_move<ai_real>(sz, (ai_real &)n.x);
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, lineEnd);
             sz = fast_atoreal_move<ai_real>(sz, (ai_real &)n.y);
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, lineEnd);
             fast_atoreal_move<ai_real>(sz, (ai_real &)n.z);
         }
 
@@ -241,22 +242,22 @@ void OFFImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
         // in theory should be testing type !
         if (hasColors) {
             aiColor4D &c = mesh->mColors[0][i];
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, lineEnd);
             sz = fast_atoreal_move<ai_real>(sz, (ai_real &)c.r);
             if (*sz != '#' && *sz != '\n' && *sz != '\r') {
-                SkipSpaces(&sz);
+                SkipSpaces(&sz, lineEnd);
                 sz = fast_atoreal_move<ai_real>(sz, (ai_real &)c.g);
             } else {
                 c.g = 0.;
             }
             if (*sz != '#' && *sz != '\n' && *sz != '\r') {
-                SkipSpaces(&sz);
+                SkipSpaces(&sz, lineEnd);
                 sz = fast_atoreal_move<ai_real>(sz, (ai_real &)c.b);
             } else {
                 c.b = 0.;
             }
             if (*sz != '#' && *sz != '\n' && *sz != '\r') {
-                SkipSpaces(&sz);
+                SkipSpaces(&sz, lineEnd);
                 sz = fast_atoreal_move<ai_real>(sz, (ai_real &)c.a);
             } else {
                 c.a = 1.;
@@ -264,9 +265,9 @@ void OFFImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
         }
         if (hasTexCoord) {
             aiVector3D &t = mesh->mTextureCoords[0][i];
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, lineEnd);
             sz = fast_atoreal_move<ai_real>(sz, (ai_real &)t.x);
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, lineEnd);
             fast_atoreal_move<ai_real>(sz, (ai_real &)t.y);
         }
     }
@@ -280,7 +281,7 @@ void OFFImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
         }
         unsigned int idx;
         sz = line;
-        SkipSpaces(&sz);
+        SkipSpaces(&sz, lineEnd);
         idx = strtoul10(sz, &sz);
         if (!idx || idx > 9) {
             ASSIMP_LOG_ERROR("OFF: Faces with zero indices aren't allowed");
@@ -291,7 +292,7 @@ void OFFImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
         faces->mNumIndices = idx;
         faces->mIndices = new unsigned int[faces->mNumIndices];
         for (unsigned int m = 0; m < faces->mNumIndices; ++m) {
-            SkipSpaces(&sz);
+            SkipSpaces(&sz, lineEnd);
             idx = strtoul10(sz, &sz);
             if (idx >= numVertices) {
                 ASSIMP_LOG_ERROR("OFF: Vertex index is out of range");
@@ -315,7 +316,7 @@ void OFFImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     pScene->mMaterials = new aiMaterial *[pScene->mNumMaterials];
     aiMaterial *pcMat = new aiMaterial();
 
-    aiColor4D clr(ai_real(0.6), ai_real(0.6), ai_real(0.6), ai_real(1.0));
+    aiColor4D clr(0.6f, 0.6f, 0.6f, 1.0f);
     pcMat->AddProperty(&clr, 1, AI_MATKEY_COLOR_DIFFUSE);
     pScene->mMaterials[0] = pcMat;
 
diff --git a/code/AssetLib/OFF/OFFLoader.h b/code/AssetLib/OFF/OFFLoader.h
index b8577e507..40ea75db4 100644
--- a/code/AssetLib/OFF/OFFLoader.h
+++ b/code/AssetLib/OFF/OFFLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Obj/ObjExporter.cpp b/code/AssetLib/Obj/ObjExporter.cpp
index a5d8325fc..1622bc403 100644
--- a/code/AssetLib/Obj/ObjExporter.cpp
+++ b/code/AssetLib/Obj/ObjExporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2020, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 All rights reserved.
@@ -59,9 +59,9 @@ namespace Assimp {
 
 // ------------------------------------------------------------------------------------------------
 // Worker function for exporting a scene to Wavefront OBJ. Prototyped and registered in Exporter.cpp
-void ExportSceneObj(const char* pFile,IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* /*pProperties*/) {
+void ExportSceneObj(const char* pFile,IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* props) {
     // invoke the exporter
-    ObjExporter exporter(pFile, pScene);
+    ObjExporter exporter(pFile, pScene, false, props);
 
     if (exporter.mOutput.fail() || exporter.mOutputMat.fail()) {
         throw DeadlyExportError("output data creation failed. Most likely the file became too large: " + std::string(pFile));
@@ -86,9 +86,9 @@ void ExportSceneObj(const char* pFile,IOSystem* pIOSystem, const aiScene* pScene
 
 // ------------------------------------------------------------------------------------------------
 // Worker function for exporting a scene to Wavefront OBJ without the material file. Prototyped and registered in Exporter.cpp
-void ExportSceneObjNoMtl(const char* pFile,IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* ) {
+void ExportSceneObjNoMtl(const char* pFile,IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* props) {
     // invoke the exporter
-    ObjExporter exporter(pFile, pScene, true);
+    ObjExporter exporter(pFile, pScene, true, props);
 
     if (exporter.mOutput.fail() || exporter.mOutputMat.fail()) {
         throw DeadlyExportError("output data creation failed. Most likely the file became too large: " + std::string(pFile));
@@ -111,7 +111,7 @@ void ExportSceneObjNoMtl(const char* pFile,IOSystem* pIOSystem, const aiScene* p
 static const std::string MaterialExt = ".mtl";
 
 // ------------------------------------------------------------------------------------------------
-ObjExporter::ObjExporter(const char* _filename, const aiScene* pScene, bool noMtl)
+ObjExporter::ObjExporter(const char* _filename, const aiScene* pScene, bool noMtl, const ExportProperties* props)
 : filename(_filename)
 , pScene(pScene)
 , vn()
@@ -130,7 +130,10 @@ ObjExporter::ObjExporter(const char* _filename, const aiScene* pScene, bool noMt
     mOutputMat.imbue(l);
     mOutputMat.precision(ASSIMP_AI_REAL_TEXT_PRECISION);
 
-    WriteGeometryFile(noMtl);
+    WriteGeometryFile(
+        noMtl,
+        props == nullptr ? true : props->GetPropertyBool("bJoinIdenticalVertices", true)
+    );
     if ( !noMtl ) {
         WriteMaterialFile();
     }
@@ -171,9 +174,12 @@ void ObjExporter::WriteHeader(std::ostringstream& out) {
 
 // ------------------------------------------------------------------------------------------------
 std::string ObjExporter::GetMaterialName(unsigned int index) {
+    static const std::string EmptyStr;
+    if ( nullptr == pScene->mMaterials ) {
+        return EmptyStr;
+    }
     const aiMaterial* const mat = pScene->mMaterials[index];
     if ( nullptr == mat ) {
-        static const std::string EmptyStr;
         return EmptyStr;
     }
 
@@ -255,14 +261,14 @@ void ObjExporter::WriteMaterialFile() {
     }
 }
 
-void ObjExporter::WriteGeometryFile(bool noMtl) {
+void ObjExporter::WriteGeometryFile(bool noMtl, bool merge_identical_vertices) {
     WriteHeader(mOutput);
     if (!noMtl)
         mOutput << "mtllib "  << GetMaterialLibName() << endl << endl;
 
     // collect mesh geometry
     aiMatrix4x4 mBase;
-    AddNode(pScene->mRootNode, mBase);
+    AddNode(pScene->mRootNode, mBase, merge_identical_vertices);
 
     // write vertex positions with colors, if any
     mVpMap.getKeys( vp );
@@ -330,7 +336,7 @@ void ObjExporter::WriteGeometryFile(bool noMtl) {
 }
 
 // ------------------------------------------------------------------------------------------------
-void ObjExporter::AddMesh(const aiString& name, const aiMesh* m, const aiMatrix4x4& mat) {
+void ObjExporter::AddMesh(const aiString& name, const aiMesh* m, const aiMatrix4x4& mat, bool merge_identical_vertices) {
     mMeshes.emplace_back();
     MeshInstance& mesh = mMeshes.back();
 
@@ -362,13 +368,14 @@ void ObjExporter::AddMesh(const aiString& name, const aiMesh* m, const aiMatrix4
         for(unsigned int a = 0; a < f.mNumIndices; ++a) {
             const unsigned int idx = f.mIndices[a];
 
+            const unsigned int fi = merge_identical_vertices ? 0 : idx;
             aiVector3D vert = mat * m->mVertices[idx];
 
             if ( nullptr != m->mColors[ 0 ] ) {
                 aiColor4D col4 = m->mColors[ 0 ][ idx ];
-                face.indices[a].vp = mVpMap.getIndex({vert, aiColor3D(col4.r, col4.g, col4.b)});
+                face.indices[a].vp = mVpMap.getIndex({vert, aiColor3D(col4.r, col4.g, col4.b), fi});
             } else {
-                face.indices[a].vp = mVpMap.getIndex({vert, aiColor3D(0,0,0)});
+                face.indices[a].vp = mVpMap.getIndex({vert, aiColor3D(0,0,0), fi});
             }
 
             if (m->mNormals) {
@@ -388,21 +395,21 @@ void ObjExporter::AddMesh(const aiString& name, const aiMesh* m, const aiMatrix4
 }
 
 // ------------------------------------------------------------------------------------------------
-void ObjExporter::AddNode(const aiNode* nd, const aiMatrix4x4& mParent) {
+void ObjExporter::AddNode(const aiNode* nd, const aiMatrix4x4& mParent, bool merge_identical_vertices) {
     const aiMatrix4x4& mAbs = mParent * nd->mTransformation;
 
     aiMesh *cm( nullptr );
     for(unsigned int i = 0; i < nd->mNumMeshes; ++i) {
         cm = pScene->mMeshes[nd->mMeshes[i]];
         if (nullptr != cm) {
-            AddMesh(cm->mName, pScene->mMeshes[nd->mMeshes[i]], mAbs);
+            AddMesh(cm->mName, pScene->mMeshes[nd->mMeshes[i]], mAbs, merge_identical_vertices);
         } else {
-            AddMesh(nd->mName, pScene->mMeshes[nd->mMeshes[i]], mAbs);
+            AddMesh(nd->mName, pScene->mMeshes[nd->mMeshes[i]], mAbs, merge_identical_vertices);
         }
     }
 
     for(unsigned int i = 0; i < nd->mNumChildren; ++i) {
-        AddNode(nd->mChildren[i], mAbs);
+        AddNode(nd->mChildren[i], mAbs, merge_identical_vertices);
     }
 }
 
diff --git a/code/AssetLib/Obj/ObjExporter.h b/code/AssetLib/Obj/ObjExporter.h
index a64f38f74..c81c14263 100644
--- a/code/AssetLib/Obj/ObjExporter.h
+++ b/code/AssetLib/Obj/ObjExporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2020, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 All rights reserved.
@@ -51,6 +51,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include <map>
 
+#include <assimp/Exporter.hpp>
+
 struct aiScene;
 struct aiNode;
 struct aiMesh;
@@ -60,10 +62,10 @@ namespace Assimp {
 // ------------------------------------------------------------------------------------------------
 /** Helper class to export a given scene to an OBJ file. */
 // ------------------------------------------------------------------------------------------------
-class ObjExporter {
+class ObjExporter final {
 public:
     /// Constructor for a specific scene to export
-    ObjExporter(const char* filename, const aiScene* pScene, bool noMtl=false);
+    ObjExporter(const char* filename, const aiScene* pScene, bool noMtl=false, const ExportProperties* props = nullptr);
     ~ObjExporter();
     std::string GetMaterialLibName();
     std::string GetMaterialLibFileName();
@@ -97,10 +99,10 @@ private:
 
     void WriteHeader(std::ostringstream& out);
     void WriteMaterialFile();
-    void WriteGeometryFile(bool noMtl=false);
+    void WriteGeometryFile(bool noMtl=false, bool merge_identical_vertices = false);
     std::string GetMaterialName(unsigned int index);
-    void AddMesh(const aiString& name, const aiMesh* m, const aiMatrix4x4& mat);
-    void AddNode(const aiNode* nd, const aiMatrix4x4& mParent);
+    void AddMesh(const aiString& name, const aiMesh* m, const aiMatrix4x4& mat, bool merge_identical_vertices);
+    void AddNode(const aiNode* nd, const aiMatrix4x4& mParent, bool merge_identical_vertices);
 
 private:
     std::string filename;
@@ -109,6 +111,7 @@ private:
     struct vertexData {
         aiVector3D vp;
         aiColor3D vc; // OBJ does not support 4D color
+        uint32_t index = 0;
     };
 
     std::vector<aiVector3D> vn, vt;
@@ -133,7 +136,7 @@ private:
             if (a.vc.g > b.vc.g) return false;
             if (a.vc.b < b.vc.b) return true;
             if (a.vc.b > b.vc.b) return false;
-            return false;
+            return a.index < b.index;
         }
     };
 
diff --git a/code/AssetLib/Obj/ObjFileData.h b/code/AssetLib/Obj/ObjFileData.h
index 22090e63e..0d4367835 100644
--- a/code/AssetLib/Obj/ObjFileData.h
+++ b/code/AssetLib/Obj/ObjFileData.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -199,12 +199,12 @@ struct Material {
 
     //! Constructor
     Material() :
-            diffuse(ai_real(0.6), ai_real(0.6), ai_real(0.6)),
+            diffuse(0.6f, 0.6f, 0.6f),
             alpha(ai_real(1.0)),
             shineness(ai_real(0.0)),
             illumination_model(1),
             ior(ai_real(1.0)),
-            transparent(ai_real(1.0), ai_real(1.0), ai_real(1.0)),
+            transparent(1.0f, 1.0, 1.0),
             roughness(),
             metallic(),
             sheen(),
diff --git a/code/AssetLib/Obj/ObjFileImporter.cpp b/code/AssetLib/Obj/ObjFileImporter.cpp
index 339e90b06..f1699220a 100644
--- a/code/AssetLib/Obj/ObjFileImporter.cpp
+++ b/code/AssetLib/Obj/ObjFileImporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2023, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -67,7 +67,7 @@ static constexpr aiImporterDesc desc = {
     "obj"
 };
 
-static const unsigned int ObjMinSize = 16;
+static constexpr unsigned int ObjMinSize = 16u;
 
 namespace Assimp {
 
@@ -163,7 +163,7 @@ void ObjFileImporter::InternReadFile(const std::string &file, aiScene *pScene, I
 // ------------------------------------------------------------------------------------------------
 //  Create the data from parsed obj-file
 void ObjFileImporter::CreateDataFromImport(const ObjFile::Model *pModel, aiScene *pScene) {
-    if (nullptr == pModel) {
+    if (pModel == nullptr) {
         return;
     }
 
@@ -178,7 +178,6 @@ void ObjFileImporter::CreateDataFromImport(const ObjFile::Model *pModel, aiScene
     }
 
     if (!pModel->mObjects.empty()) {
-
         unsigned int meshCount = 0;
         unsigned int childCount = 0;
 
@@ -193,7 +192,7 @@ void ObjFileImporter::CreateDataFromImport(const ObjFile::Model *pModel, aiScene
         pScene->mRootNode->mChildren = new aiNode *[childCount];
 
         // Create nodes for the whole scene
-        std::vector<aiMesh *> MeshArray;
+        std::vector<std::unique_ptr<aiMesh>> MeshArray;
         MeshArray.reserve(meshCount);
         for (size_t index = 0; index < pModel->mObjects.size(); ++index) {
             createNodes(pModel, pModel->mObjects[index], pScene->mRootNode, pScene, MeshArray);
@@ -205,7 +204,7 @@ void ObjFileImporter::CreateDataFromImport(const ObjFile::Model *pModel, aiScene
         if (pScene->mNumMeshes > 0) {
             pScene->mMeshes = new aiMesh *[MeshArray.size()];
             for (size_t index = 0; index < MeshArray.size(); ++index) {
-                pScene->mMeshes[index] = MeshArray[index];
+                pScene->mMeshes[index] = MeshArray[index].release();
             }
         }
 
@@ -257,9 +256,8 @@ void ObjFileImporter::CreateDataFromImport(const ObjFile::Model *pModel, aiScene
 //  Creates all nodes of the model
 aiNode *ObjFileImporter::createNodes(const ObjFile::Model *pModel, const ObjFile::Object *pObject,
         aiNode *pParent, aiScene *pScene,
-        std::vector<aiMesh *> &MeshArray) {
-    ai_assert(nullptr != pModel);
-    if (nullptr == pObject) {
+        std::vector<std::unique_ptr<aiMesh>> &MeshArray) {
+    if (nullptr == pObject || pModel == nullptr) {
         return nullptr;
     }
 
@@ -275,12 +273,10 @@ aiNode *ObjFileImporter::createNodes(const ObjFile::Model *pModel, const ObjFile
 
     for (size_t i = 0; i < pObject->m_Meshes.size(); ++i) {
         unsigned int meshId = pObject->m_Meshes[i];
-        aiMesh *pMesh = createTopology(pModel, pObject, meshId);
+        std::unique_ptr<aiMesh> pMesh = createTopology(pModel, pObject, meshId);
         if (pMesh != nullptr) {
             if (pMesh->mNumFaces > 0) {
-                MeshArray.push_back(pMesh);
-            } else {
-                delete pMesh;
+                MeshArray.push_back(std::move(pMesh));
             }
         }
     }
@@ -312,17 +308,14 @@ aiNode *ObjFileImporter::createNodes(const ObjFile::Model *pModel, const ObjFile
 
 // ------------------------------------------------------------------------------------------------
 //  Create topology data
-aiMesh *ObjFileImporter::createTopology(const ObjFile::Model *pModel, const ObjFile::Object *pData, unsigned int meshIndex) {
-    // Checking preconditions
-    ai_assert(nullptr != pModel);
-
-    if (nullptr == pData) {
+std::unique_ptr<aiMesh> ObjFileImporter::createTopology(const ObjFile::Model *pModel, const ObjFile::Object *pData, unsigned int meshIndex) {
+    if (nullptr == pData || pModel == nullptr) {
         return nullptr;
     }
 
     // Create faces
     ObjFile::Mesh *pObjMesh = pModel->mMeshes[meshIndex];
-    if (!pObjMesh) {
+    if (pObjMesh == nullptr) {
         return nullptr;
     }
 
@@ -337,6 +330,9 @@ aiMesh *ObjFileImporter::createTopology(const ObjFile::Model *pModel, const ObjF
 
     for (size_t index = 0; index < pObjMesh->m_Faces.size(); index++) {
         const ObjFile::Face *inp = pObjMesh->m_Faces[index];
+        if (inp == nullptr) {
+            continue;
+        }
 
         if (inp->mPrimitiveType == aiPrimitiveType_LINE) {
             pMesh->mNumFaces += static_cast<unsigned int>(inp->m_vertices.size() - 1);
@@ -354,14 +350,14 @@ aiMesh *ObjFileImporter::createTopology(const ObjFile::Model *pModel, const ObjF
         }
     }
 
-    unsigned int uiIdxCount(0u);
+    unsigned int uiIdxCount = 0u;
     if (pMesh->mNumFaces > 0) {
         pMesh->mFaces = new aiFace[pMesh->mNumFaces];
         if (pObjMesh->m_uiMaterialIndex != ObjFile::Mesh::NoMaterial) {
             pMesh->mMaterialIndex = pObjMesh->m_uiMaterialIndex;
         }
 
-        unsigned int outIndex(0);
+        unsigned int outIndex = 0u;
 
         // Copy all data from all stored meshes
         for (auto &face : pObjMesh->m_Faces) {
@@ -394,7 +390,7 @@ aiMesh *ObjFileImporter::createTopology(const ObjFile::Model *pModel, const ObjF
     // Create mesh vertices
     createVertexArray(pModel, pData, meshIndex, pMesh.get(), uiIdxCount);
 
-    return pMesh.release();
+    return pMesh;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -405,11 +401,14 @@ void ObjFileImporter::createVertexArray(const ObjFile::Model *pModel,
         aiMesh *pMesh,
         unsigned int numIndices) {
     // Checking preconditions
-    ai_assert(nullptr != pCurrentObject);
+    if (pCurrentObject == nullptr || pModel == nullptr || pMesh == nullptr) {
+        return;
+    }
 
     // Break, if no faces are stored in object
-    if (pCurrentObject->m_Meshes.empty())
+    if (pCurrentObject->m_Meshes.empty()) {
         return;
+    }
 
     // Get current mesh
     ObjFile::Mesh *pObjMesh = pModel->mMeshes[uiMeshIndex];
@@ -588,11 +587,12 @@ void ObjFileImporter::createMaterials(const ObjFile::Model *pModel, aiScene *pSc
         it = pModel->mMaterialMap.find(pModel->mMaterialLib[matIndex]);
 
         // No material found, use the default material
-        if (pModel->mMaterialMap.end() == it)
+        if (pModel->mMaterialMap.end() == it) {
             continue;
+        }
 
         aiMaterial *mat = new aiMaterial;
-        ObjFile::Material *pCurrentMaterial = (*it).second;
+        ObjFile::Material *pCurrentMaterial = it->second;
         mat->AddProperty(&pCurrentMaterial->MaterialName, AI_MATKEY_NAME);
 
         // convert illumination model
@@ -779,8 +779,11 @@ void ObjFileImporter::createMaterials(const ObjFile::Model *pModel, aiScene *pSc
 //  Appends this node to the parent node
 void ObjFileImporter::appendChildToParentNode(aiNode *pParent, aiNode *pChild) {
     // Checking preconditions
-    ai_assert(nullptr != pParent);
-    ai_assert(nullptr != pChild);
+    if (pParent == nullptr || pChild == nullptr) {
+        ai_assert(nullptr != pParent);
+        ai_assert(nullptr != pChild);
+        return;
+    }
 
     // Assign parent to child
     pChild->mParent = pParent;
diff --git a/code/AssetLib/Obj/ObjFileImporter.h b/code/AssetLib/Obj/ObjFileImporter.h
index e76c27950..6923984e9 100644
--- a/code/AssetLib/Obj/ObjFileImporter.h
+++ b/code/AssetLib/Obj/ObjFileImporter.h
@@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/BaseImporter.h>
 #include <assimp/material.h>
+#include <memory>
 #include <vector>
 
 struct aiMesh;
@@ -60,7 +61,7 @@ struct Model;
 /// \class  ObjFileImporter
 /// \brief  Imports a waveform obj file
 // ------------------------------------------------------------------------------------------------
-class ObjFileImporter : public BaseImporter {
+class ObjFileImporter final : public BaseImporter {
 public:
     /// \brief  Default constructor
     ObjFileImporter();
@@ -84,10 +85,10 @@ protected:
 
     //! \brief  Creates all nodes stored in imported content.
     aiNode *createNodes(const ObjFile::Model *pModel, const ObjFile::Object *pData,
-            aiNode *pParent, aiScene *pScene, std::vector<aiMesh *> &MeshArray);
+            aiNode *pParent, aiScene *pScene, std::vector<std::unique_ptr<aiMesh>> &MeshArray);
 
     //! \brief  Creates topology data like faces and meshes for the geometry.
-    aiMesh *createTopology(const ObjFile::Model *pModel, const ObjFile::Object *pData,
+    std::unique_ptr<aiMesh> createTopology(const ObjFile::Model *pModel, const ObjFile::Object *pData,
             unsigned int uiMeshIndex);
 
     //! \brief  Creates vertices from model.
diff --git a/code/AssetLib/Obj/ObjFileMtlImporter.cpp b/code/AssetLib/Obj/ObjFileMtlImporter.cpp
index f8e3e1cde..02ccfcb93 100644
--- a/code/AssetLib/Obj/ObjFileMtlImporter.cpp
+++ b/code/AssetLib/Obj/ObjFileMtlImporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2020, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ObjFileMtlImporter.h"
 #include "ObjFileData.h"
 #include "ObjTools.h"
+#include <assimp/DefaultIOSystem.h>
 #include <assimp/ParsingUtils.h>
 #include <assimp/fast_atof.h>
 #include <assimp/material.h>
@@ -89,8 +90,9 @@ static constexpr char TypeOption[] = "-type";
 // -------------------------------------------------------------------
 //  Constructor
 ObjFileMtlImporter::ObjFileMtlImporter(std::vector<char> &buffer,
-        const std::string &,
+        const std::string &strAbsPath,
         ObjFile::Model *pModel) :
+        m_strAbsPath(strAbsPath),
         m_DataIt(buffer.begin()),
         m_DataItEnd(buffer.end()),
         m_pModel(pModel),
@@ -103,13 +105,23 @@ ObjFileMtlImporter::ObjFileMtlImporter(std::vector<char> &buffer,
         m_pModel->mDefaultMaterial = new ObjFile::Material;
         m_pModel->mDefaultMaterial->MaterialName.Set("default");
     }
+
+    // Try with OS folder separator first
+    char folderSeparator = DefaultIOSystem().getOsSeparator();
+    std::size_t found = m_strAbsPath.find_last_of(folderSeparator);
+    if (found == std::string::npos) {
+        // Not found, try alternative folder separator
+        folderSeparator = (folderSeparator == '/' ? '\\' : '/');
+        found = m_strAbsPath.find_last_of(folderSeparator);
+    }
+    if (found != std::string::npos) {
+        m_strAbsPath = m_strAbsPath.substr(0, found + 1);
+    } else {
+        m_strAbsPath = "";
+    }
     load();
 }
 
-// -------------------------------------------------------------------
-//  Destructor
-ObjFileMtlImporter::~ObjFileMtlImporter() = default;
-
 // -------------------------------------------------------------------
 //  Loads the material description
 void ObjFileMtlImporter::load() {
@@ -343,7 +355,7 @@ void ObjFileMtlImporter::createMaterial() {
         }
     }
 
-    name = trim_whitespaces(name);
+    name = ai_trim(name);
 
     std::map<std::string, ObjFile::Material *>::iterator it = m_pModel->mMaterialMap.find(name);
     if (m_pModel->mMaterialMap.end() == it) {
@@ -446,7 +458,7 @@ void ObjFileMtlImporter::getTexture() {
     std::string texture;
     m_DataIt = getName<DataArrayIt>(m_DataIt, m_DataItEnd, texture);
     if (nullptr != out) {
-        out->Set(texture);
+        out->Set(m_strAbsPath + texture);
     }
 }
 
diff --git a/code/AssetLib/Obj/ObjFileMtlImporter.h b/code/AssetLib/Obj/ObjFileMtlImporter.h
index 6e73cf45c..f187b6e58 100644
--- a/code/AssetLib/Obj/ObjFileMtlImporter.h
+++ b/code/AssetLib/Obj/ObjFileMtlImporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2020, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -71,13 +71,12 @@ public:
             ObjFile::Model *pModel);
 
     //! \brief  The class destructor
-    ~ObjFileMtlImporter();
+    ~ObjFileMtlImporter() = default;
 
     ObjFileMtlImporter(const ObjFileMtlImporter &rOther) = delete;
     ObjFileMtlImporter &operator=(const ObjFileMtlImporter &rOther) = delete;
 
 private:
-    /// Copy constructor, empty.
     /// Load the whole material description
     void load();
     /// Get color data.
@@ -109,8 +108,6 @@ private:
     std::vector<char> m_buffer;
 };
 
-// ------------------------------------------------------------------------------------------------
-
 } // Namespace Assimp
 
 #endif // OBJFILEMTLIMPORTER_H_INC
diff --git a/code/AssetLib/Obj/ObjFileParser.cpp b/code/AssetLib/Obj/ObjFileParser.cpp
index acb3f074c..f1f0b4017 100644
--- a/code/AssetLib/Obj/ObjFileParser.cpp
+++ b/code/AssetLib/Obj/ObjFileParser.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -52,7 +52,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <cstdlib>
 #include <memory>
 #include <utility>
-#include <string_view>
 
 namespace Assimp {
 
@@ -64,6 +63,7 @@ ObjFileParser::ObjFileParser() :
         m_pModel(nullptr),
         m_uiLine(0),
         m_buffer(),
+        mEnd(&m_buffer[Buffersize]),
         m_pIO(nullptr),
         m_progress(nullptr),
         m_originalObjFileName() {
@@ -97,8 +97,6 @@ ObjFileParser::ObjFileParser(IOStreamBuffer<char> &streamBuffer, const std::stri
     parseFile(streamBuffer);
 }
 
-ObjFileParser::~ObjFileParser() = default;
-
 void ObjFileParser::setBuffer(std::vector<char> &buffer) {
     m_DataIt = buffer.begin();
     m_DataItEnd = buffer.end();
@@ -113,14 +111,15 @@ void ObjFileParser::parseFile(IOStreamBuffer<char> &streamBuffer) {
     //const unsigned int updateProgressEveryBytes = 100 * 1024;
     const unsigned int bytesToProcess = static_cast<unsigned int>(streamBuffer.size());
     const unsigned int progressTotal = bytesToProcess;
-    unsigned int processed = 0;
-    size_t lastFilePos(0);
+    unsigned int processed = 0u;
+    size_t lastFilePos = 0u;
 
     bool insideCstype = false;
     std::vector<char> buffer;
     while (streamBuffer.getNextDataLine(buffer, '\\')) {
         m_DataIt = buffer.begin();
         m_DataItEnd = buffer.end();
+        mEnd = &buffer[buffer.size() - 1] + 1;
 
         // Handle progress reporting
         const size_t filePos(streamBuffer.getFilePos());
@@ -130,7 +129,7 @@ void ObjFileParser::parseFile(IOStreamBuffer<char> &streamBuffer) {
             m_progress->UpdateFileRead(processed, progressTotal);
         }
 
-        // handle cstype section end (http://paulbourke.net/dataformats/obj/)
+        // handle c-stype section end (http://paulbourke.net/dataformats/obj/)
         if (insideCstype) {
             switch (*m_DataIt) {
             case 'e': {
@@ -301,18 +300,19 @@ size_t ObjFileParser::getNumComponentsInDataDefinition() {
         } else if (IsLineEnd(*tmp)) {
             end_of_definition = true;
         }
-        if (!SkipSpaces(&tmp)) {
+        if (!SkipSpaces(&tmp, mEnd) || *tmp == '#') {
             break;
         }
         const bool isNum(IsNumeric(*tmp) || isNanOrInf(tmp));
-        SkipToken(tmp);
+        SkipToken(tmp, mEnd);
         if (isNum) {
             ++numComponents;
         }
-        if (!SkipSpaces(&tmp)) {
+        if (!SkipSpaces(&tmp, mEnd) || *tmp == '#') {
             break;
         }
     }
+
     return numComponents;
 }
 
@@ -451,7 +451,7 @@ void ObjFileParser::getFace(aiPrimitiveType type) {
     while (m_DataIt < m_DataItEnd) {
         int iStep = 1;
 
-        if (IsLineEnd(*m_DataIt)) {
+        if (IsLineEnd(*m_DataIt) || *m_DataIt == '#') {
             break;
         }
 
@@ -487,8 +487,9 @@ void ObjFileParser::getFace(aiPrimitiveType type) {
                 ++iStep;
             }
 
-            if (iPos == 1 && !vt && vn)
+            if (iPos == 1 && !vt && vn) {
                 iPos = 2; // skip texture coords for normals if there are no tex coords
+            }
 
             if (iVal > 0) {
                 // Store parsed index
@@ -576,14 +577,17 @@ void ObjFileParser::getMaterialDesc() {
 
     // Get name
     std::string strName(pStart, &(*m_DataIt));
-    strName = trim_whitespaces(strName);
-    if (strName.empty())
+    strName = ai_trim(strName);
+    if (strName.empty()) {
         skip = true;
+    }
 
-    // If the current mesh has the same material, we simply ignore that 'usemtl' command
+    // If the current mesh has the same material, we will ignore that 'usemtl' command
     // There is no need to create another object or even mesh here
-    if (m_pModel->mCurrentMaterial && m_pModel->mCurrentMaterial->MaterialName == aiString(strName)) {
-        skip = true;
+    if (!skip) {
+        if (m_pModel->mCurrentMaterial && m_pModel->mCurrentMaterial->MaterialName == aiString(strName)) {
+            skip = true;
+        }
     }
 
     if (!skip) {
@@ -656,13 +660,13 @@ void ObjFileParser::getMaterialLib() {
     } else {
         absName = strMatName;
     }
-
-    IOStream *pFile = m_pIO->Open(absName);
+	
+	std::unique_ptr<IOStream> pFile(m_pIO->Open(absName));
     if (nullptr == pFile) {
         ASSIMP_LOG_ERROR("OBJ: Unable to locate material file ", strMatName);
         std::string strMatFallbackName = m_originalObjFileName.substr(0, m_originalObjFileName.length() - 3) + "mtl";
         ASSIMP_LOG_INFO("OBJ: Opening fallback material file ", strMatFallbackName);
-        pFile = m_pIO->Open(strMatFallbackName);
+        pFile.reset(m_pIO->Open(strMatFallbackName));
         if (!pFile) {
             ASSIMP_LOG_ERROR("OBJ: Unable to locate fallback material file ", strMatFallbackName);
             m_DataIt = skipLine<DataArrayIt>(m_DataIt, m_DataItEnd, m_uiLine);
@@ -675,8 +679,8 @@ void ObjFileParser::getMaterialLib() {
     // material files if the model doesn't use any materials, so we
     // allow that.
     std::vector<char> buffer;
-    BaseImporter::TextFileToBuffer(pFile, buffer, BaseImporter::ALLOW_EMPTY);
-    m_pIO->Close(pFile);
+    BaseImporter::TextFileToBuffer(pFile.get(), buffer, BaseImporter::ALLOW_EMPTY);
+    //m_pIO->Close(pFile);
 
     // Importing the material library
     ObjFileMtlImporter mtlImporter(buffer, strMatName, m_pModel.get());
diff --git a/code/AssetLib/Obj/ObjFileParser.h b/code/AssetLib/Obj/ObjFileParser.h
index 0ed724461..7a0779bf2 100644
--- a/code/AssetLib/Obj/ObjFileParser.h
+++ b/code/AssetLib/Obj/ObjFileParser.h
@@ -41,6 +41,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef OBJ_FILEPARSER_H_INC
 #define OBJ_FILEPARSER_H_INC
 
+#include "ObjFileData.h"
+
 #include <assimp/IOStreamBuffer.h>
 #include <assimp/material.h>
 #include <assimp/mesh.h>
@@ -53,33 +55,28 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace Assimp {
 
-namespace ObjFile {
-struct Model;
-struct Object;
-struct Material;
-struct Point3;
-struct Point2;
-} // namespace ObjFile
-
+// Forward declarations
 class ObjFileImporter;
 class IOSystem;
 class ProgressHandler;
 
+// ------------------------------------------------------------------------------------------------
 /// \class  ObjFileParser
 /// \brief  Parser for a obj waveform file
+// ------------------------------------------------------------------------------------------------
 class ASSIMP_API ObjFileParser {
 public:
-    static const size_t Buffersize = 4096;
-    typedef std::vector<char> DataArray;
-    typedef std::vector<char>::iterator DataArrayIt;
-    typedef std::vector<char>::const_iterator ConstDataArrayIt;
+    static constexpr size_t Buffersize = 4096;
+    using DataArray = std::vector<char>;
+    using DataArrayIt = std::vector<char>::iterator;
+    using ConstDataArrayIt = std::vector<char>::const_iterator;
 
     /// @brief  The default constructor.
     ObjFileParser();
     /// @brief  Constructor with data array.
     ObjFileParser(IOStreamBuffer<char> &streamBuffer, const std::string &modelName, IOSystem *io, ProgressHandler *progress, const std::string &originalObjFileName);
     /// @brief  Destructor
-    ~ObjFileParser();
+    ~ObjFileParser() = default;
     /// @brief  If you want to load in-core data.
     void setBuffer(std::vector<char> &buffer);
     /// @brief  Model getter.
@@ -93,8 +90,6 @@ protected:
     void parseFile(IOStreamBuffer<char> &streamBuffer);
     /// Method to copy the new delimited word in the current line.
     void copyNextWord(char *pBuffer, size_t length);
-    /// Method to copy the new line.
-    //    void copyNextLine(char *pBuffer, size_t length);
     /// Get the number of components in a line.
     size_t getNumComponentsInDataDefinition();
     /// Stores the vector
@@ -149,6 +144,8 @@ private:
     unsigned int m_uiLine;
     //! Helper buffer
     char m_buffer[Buffersize];
+	/// End of buffer
+    const char *mEnd;
     /// Pointer to IO system instance.
     IOSystem *m_pIO;
     //! Pointer to progress handler
diff --git a/code/AssetLib/Obj/ObjTools.h b/code/AssetLib/Obj/ObjTools.h
index ca173de0a..b6407c2c8 100644
--- a/code/AssetLib/Obj/ObjTools.h
+++ b/code/AssetLib/Obj/ObjTools.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -247,22 +247,6 @@ inline char_t getFloat(char_t it, char_t end, ai_real &value) {
     return it;
 }
 
-/**
- *  @brief  Will remove white-spaces for a string.
- *  @param[in] str  The string to clean
- *  @return The trimmed string.
- */
-template <class string_type>
-inline string_type trim_whitespaces(string_type str) {
-    while (!str.empty() && IsSpace(str[0])) {
-        str.erase(0);
-    }
-    while (!str.empty() && IsSpace(str[str.length() - 1])) {
-        str.erase(str.length() - 1);
-    }
-    return str;
-}
-
 /**
  *  @brief  Checks for a line-end.
  *  @param[in] it   Current iterator in string.
diff --git a/code/AssetLib/Ogre/OgreBinarySerializer.cpp b/code/AssetLib/Ogre/OgreBinarySerializer.cpp
index 738e1181e..06ed89e2f 100644
--- a/code/AssetLib/Ogre/OgreBinarySerializer.cpp
+++ b/code/AssetLib/Ogre/OgreBinarySerializer.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Ogre/OgreBinarySerializer.h b/code/AssetLib/Ogre/OgreBinarySerializer.h
index eb026ea70..999b60009 100644
--- a/code/AssetLib/Ogre/OgreBinarySerializer.h
+++ b/code/AssetLib/Ogre/OgreBinarySerializer.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Ogre/OgreImporter.cpp b/code/AssetLib/Ogre/OgreImporter.cpp
index 5bf6901a0..0dcbf9b25 100644
--- a/code/AssetLib/Ogre/OgreImporter.cpp
+++ b/code/AssetLib/Ogre/OgreImporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Ogre/OgreImporter.h b/code/AssetLib/Ogre/OgreImporter.h
index 3a72ae70e..e03dbabb0 100644
--- a/code/AssetLib/Ogre/OgreImporter.h
+++ b/code/AssetLib/Ogre/OgreImporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Ogre/OgreMaterial.cpp b/code/AssetLib/Ogre/OgreMaterial.cpp
index 0def59b79..c166af137 100644
--- a/code/AssetLib/Ogre/OgreMaterial.cpp
+++ b/code/AssetLib/Ogre/OgreMaterial.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Ogre/OgreParsingUtils.h b/code/AssetLib/Ogre/OgreParsingUtils.h
index 60dd5cf76..0407377b2 100644
--- a/code/AssetLib/Ogre/OgreParsingUtils.h
+++ b/code/AssetLib/Ogre/OgreParsingUtils.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Ogre/OgreStructs.cpp b/code/AssetLib/Ogre/OgreStructs.cpp
index ed8b9be79..53cdfd35c 100644
--- a/code/AssetLib/Ogre/OgreStructs.cpp
+++ b/code/AssetLib/Ogre/OgreStructs.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Ogre/OgreStructs.h b/code/AssetLib/Ogre/OgreStructs.h
index dcdf0670f..cf6edba2f 100644
--- a/code/AssetLib/Ogre/OgreStructs.h
+++ b/code/AssetLib/Ogre/OgreStructs.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Ogre/OgreXmlSerializer.cpp b/code/AssetLib/Ogre/OgreXmlSerializer.cpp
index 8a1b88510..3ece5e636 100644
--- a/code/AssetLib/Ogre/OgreXmlSerializer.cpp
+++ b/code/AssetLib/Ogre/OgreXmlSerializer.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Ogre/OgreXmlSerializer.h b/code/AssetLib/Ogre/OgreXmlSerializer.h
index 406681f55..5e36cd3ee 100644
--- a/code/AssetLib/Ogre/OgreXmlSerializer.h
+++ b/code/AssetLib/Ogre/OgreXmlSerializer.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/OpenGEX/OpenGEXExporter.cpp b/code/AssetLib/OpenGEX/OpenGEXExporter.cpp
index f812d0ddb..f4f82a0a6 100644
--- a/code/AssetLib/OpenGEX/OpenGEXExporter.cpp
+++ b/code/AssetLib/OpenGEX/OpenGEXExporter.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/OpenGEX/OpenGEXExporter.h b/code/AssetLib/OpenGEX/OpenGEXExporter.h
index 8e31b9ae3..6877aecb2 100644
--- a/code/AssetLib/OpenGEX/OpenGEXExporter.h
+++ b/code/AssetLib/OpenGEX/OpenGEXExporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/OpenGEX/OpenGEXImporter.cpp b/code/AssetLib/OpenGEX/OpenGEXImporter.cpp
index 735f56755..8f6ef54d5 100644
--- a/code/AssetLib/OpenGEX/OpenGEXImporter.cpp
+++ b/code/AssetLib/OpenGEX/OpenGEXImporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #ifndef ASSIMP_BUILD_NO_OPENGEX_IMPORTER
 
-#include "AssetLib/OpenGEX/OpenGEXImporter.h"
+#include "OpenGEXImporter.h"
 #include "PostProcessing/MakeVerboseFormat.h"
 
 #include <assimp/DefaultIOSystem.h>
@@ -289,14 +289,13 @@ bool OpenGEXImporter::CanRead(const std::string &file, IOSystem *pIOHandler, boo
 //------------------------------------------------------------------------------------------------
 void OpenGEXImporter::InternReadFile(const std::string &filename, aiScene *pScene, IOSystem *pIOHandler) {
     // open source file
-    IOStream *file = pIOHandler->Open(filename, "rb");
+    std::unique_ptr<IOStream> file(pIOHandler->Open(filename, "rb"));
     if (!file) {
         throw DeadlyImportError("Failed to open file ", filename);
     }
 
     std::vector<char> buffer;
-    TextFileToBuffer(file, buffer);
-    pIOHandler->Close(file);
+    TextFileToBuffer(file.get(), buffer);
 
     OpenDDLParser myParser;
     myParser.setLogCallback(&logDDLParserMessage);
@@ -311,7 +310,8 @@ void OpenGEXImporter::InternReadFile(const std::string &filename, aiScene *pScen
 
     copyMeshes(pScene);
     copyCameras(pScene);
-    copyLights(pScene);
+    // TODO: lights only partially implemented and breaking model import
+//    copyLights(pScene);
     copyMaterials(pScene);
     resolveReferences();
     createNodeTree(pScene);
@@ -367,7 +367,8 @@ void OpenGEXImporter::handleNodes(DDLNode *node, aiScene *pScene) {
             break;
 
         case Grammar::LightNodeToken:
-            handleLightNode(*it, pScene);
+            // TODO: lights only partially implemented and breaking model import
+//            handleLightNode(*it, pScene);
             break;
 
         case Grammar::GeometryObjectToken:
@@ -379,7 +380,8 @@ void OpenGEXImporter::handleNodes(DDLNode *node, aiScene *pScene) {
             break;
 
         case Grammar::LightObjectToken:
-            handleLightObject(*it, pScene);
+            // TODO: lights only partially implemented and breaking model import
+//            handleLightObject(*it, pScene);
             break;
 
         case Grammar::TransformToken:
@@ -469,7 +471,10 @@ void OpenGEXImporter::handleNameNode(DDLNode *node, aiScene * /*pScene*/) {
         }
 
         const std::string name(val->getString());
-        if (m_tokenType == Grammar::GeometryNodeToken || m_tokenType == Grammar::LightNodeToken || m_tokenType == Grammar::CameraNodeToken) {
+        if (m_tokenType == Grammar::GeometryNodeToken ||
+                // TODO: lights only partially implemented and breaking model import
+//                m_tokenType == Grammar::LightNodeToken ||
+                m_tokenType == Grammar::CameraNodeToken) {
             m_currentNode->mName.Set(name.c_str());
         } else if (m_tokenType == Grammar::MaterialToken) {
             aiString aiName;
@@ -784,10 +789,10 @@ static void fillColor4(aiColor4D *col4, Value *vals) {
     col4->b = next->getFloat();
     next = next->m_next;
     if (!next) {
-        throw DeadlyImportError("OpenGEX: Not enough values to fill 4-element color, only 3");
+        col4->a = 1.0f;
+    } else {
+        col4->a = next->getFloat();
     }
-
-    col4->a = next->getFloat();
 }
 
 //------------------------------------------------------------------------------------------------
@@ -908,7 +913,13 @@ void OpenGEXImporter::handleIndexArrayNode(ODDLParser::DDLNode *node, aiScene *
         current.mIndices = new unsigned int[current.mNumIndices];
         Value *next(vaList->m_dataList);
         for (size_t indices = 0; indices < current.mNumIndices; indices++) {
-            const int idx(next->getUnsignedInt32());
+            int idx = -1;
+            if (next->m_type == Value::ValueType::ddl_unsigned_int16) {
+                idx = next->getUnsignedInt16();
+            } else if (next->m_type == Value::ValueType::ddl_unsigned_int32) {
+                idx = next->getUnsignedInt32();
+            }
+            
             ai_assert(static_cast<size_t>(idx) <= m_currentVertices.m_vertices.size());
             ai_assert(index < m_currentMesh->mNumVertices);
             aiVector3D &pos = (m_currentVertices.m_vertices[idx]);
diff --git a/code/AssetLib/OpenGEX/OpenGEXImporter.h b/code/AssetLib/OpenGEX/OpenGEXImporter.h
index 997d58af9..fe260ddc0 100644
--- a/code/AssetLib/OpenGEX/OpenGEXImporter.h
+++ b/code/AssetLib/OpenGEX/OpenGEXImporter.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -102,10 +101,10 @@ protected:
     void InternReadFile( const std::string &file, aiScene *pScene, IOSystem *pIOHandler ) override;
 
     /// BaseImporter override.
-    virtual const aiImporterDesc *GetInfo() const override;
+    const aiImporterDesc *GetInfo() const override;
 
     /// BaseImporter override.
-    virtual void SetupProperties( const Importer *pImp ) override;
+    void SetupProperties( const Importer *pImp ) override;
 
     void handleNodes( ODDLParser::DDLNode *node, aiScene *pScene );
     void handleMetricNode( ODDLParser::DDLNode *node, aiScene *pScene );
diff --git a/code/AssetLib/OpenGEX/OpenGEXStructs.h b/code/AssetLib/OpenGEX/OpenGEXStructs.h
index 5f845483d..b249cae31 100644
--- a/code/AssetLib/OpenGEX/OpenGEXStructs.h
+++ b/code/AssetLib/OpenGEX/OpenGEXStructs.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Ply/PlyExporter.cpp b/code/AssetLib/Ply/PlyExporter.cpp
index 9453e0d4d..8a30100a2 100644
--- a/code/AssetLib/Ply/PlyExporter.cpp
+++ b/code/AssetLib/Ply/PlyExporter.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -39,9 +38,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ----------------------------------------------------------------------
 */
-
-
-
 #if !defined(ASSIMP_BUILD_NO_EXPORT) && !defined(ASSIMP_BUILD_NO_PLY_EXPORTER)
 
 #include "PlyExporter.h"
@@ -54,9 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/Exporter.hpp>
 #include <assimp/qnan.h>
 
-
-//using namespace Assimp;
-namespace Assimp    {
+namespace Assimp {
 
 // make sure type_of returns consistent output across different platforms
 // also consider using: typeid(VAR).name()
@@ -66,8 +60,7 @@ template<> const char* type_of(double&) { return "double"; }
 
 // ------------------------------------------------------------------------------------------------
 // Worker function for exporting a scene to PLY. Prototyped and registered in Exporter.cpp
-void ExportScenePly(const char* pFile,IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* /*pProperties*/)
-{
+void ExportScenePly(const char* pFile,IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* /*pProperties*/) {
     // invoke the exporter
     PlyExporter exporter(pFile, pScene);
 
@@ -84,8 +77,7 @@ void ExportScenePly(const char* pFile,IOSystem* pIOSystem, const aiScene* pScene
     outfile->Write( exporter.mOutput.str().c_str(), static_cast<size_t>(exporter.mOutput.tellp()),1);
 }
 
-void ExportScenePlyBinary(const char* pFile, IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* /*pProperties*/)
-{
+void ExportScenePlyBinary(const char* pFile, IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* /*pProperties*/) {
     // invoke the exporter
     PlyExporter exporter(pFile, pScene, true);
 
@@ -104,10 +96,8 @@ void ExportScenePlyBinary(const char* pFile, IOSystem* pIOSystem, const aiScene*
 #define PLY_EXPORT_HAS_COLORS (PLY_EXPORT_HAS_TEXCOORDS << AI_MAX_NUMBER_OF_TEXTURECOORDS)
 
 // ------------------------------------------------------------------------------------------------
-PlyExporter::PlyExporter(const char* _filename, const aiScene* pScene, bool binary)
-: filename(_filename)
-, endl("\n")
-{
+PlyExporter::PlyExporter(const char* _filename, const aiScene* pScene, bool binary) : 
+        filename(_filename), endl("\n") {
     // make sure that all formatting happens using the standard, C locale and not the user's current locale
     const std::locale& l = std::locale("C");
     mOutput.imbue(l);
@@ -149,19 +139,14 @@ PlyExporter::PlyExporter(const char* _filename, const aiScene* pScene, bool bina
         << aiGetVersionRevision() << ")" << endl;
 
     // Look through materials for a diffuse texture, and add it if found
-    for ( unsigned int i = 0; i < pScene->mNumMaterials; ++i )
-    {
+    for ( unsigned int i = 0; i < pScene->mNumMaterials; ++i ) {
         const aiMaterial* const mat = pScene->mMaterials[i];
         aiString s;
-        if ( AI_SUCCESS == mat->Get( AI_MATKEY_TEXTURE_DIFFUSE( 0 ), s ) )
-        {
+        if ( AI_SUCCESS == mat->Get( AI_MATKEY_TEXTURE_DIFFUSE( 0 ), s ) ) {
             mOutput << "comment TextureFile " << s.data << endl;
         }
     }
 
-    // TODO: probably want to check here rather than just assume something
-    //       definitely not good to always write float even if we might have double precision
-
     ai_real tmp = 0.0;
     const char * typeName = type_of(tmp);
 
@@ -182,24 +167,12 @@ PlyExporter::PlyExporter(const char* _filename, const aiScene* pScene, bool bina
     // but in reality most importers only know about vertex positions, normals
     // and texture coordinates).
     for (unsigned int n = PLY_EXPORT_HAS_TEXCOORDS, c = 0; (components & n) && c != AI_MAX_NUMBER_OF_TEXTURECOORDS; n <<= 1, ++c) {
-        if (!c) {
-            mOutput << "property " << typeName << " s" << endl;
-            mOutput << "property " << typeName << " t" << endl;
-        }
-        else {
-            mOutput << "property " << typeName << " s" << c << endl;
-            mOutput << "property " << typeName << " t" << c << endl;
-        }
-    }
-
-    for (unsigned int n = PLY_EXPORT_HAS_COLORS, c = 0; (components & n) && c != AI_MAX_NUMBER_OF_COLOR_SETS; n <<= 1, ++c) {
         if (!c) {
             mOutput << "property " << "uchar" << " red" << endl;
             mOutput << "property " << "uchar" << " green" << endl;
             mOutput << "property " << "uchar" << " blue" << endl;
             mOutput << "property " << "uchar" << " alpha" << endl;
-        }
-        else {
+        } else {
             mOutput << "property " << "uchar" << " red" << c << endl;
             mOutput << "property " << "uchar" << " green" << c << endl;
             mOutput << "property " << "uchar" << " blue" << c << endl;
@@ -228,16 +201,14 @@ PlyExporter::PlyExporter(const char* _filename, const aiScene* pScene, bool bina
     for (unsigned int i = 0; i < pScene->mNumMeshes; ++i) {
         if (binary) {
             WriteMeshVertsBinary(pScene->mMeshes[i], components);
-        }
-        else {
+        } else {
             WriteMeshVerts(pScene->mMeshes[i], components);
         }
     }
     for (unsigned int i = 0, ofs = 0; i < pScene->mNumMeshes; ++i) {
         if (binary) {
             WriteMeshIndicesBinary(pScene->mMeshes[i], ofs);
-        }
-        else {
+        } else {
             WriteMeshIndices(pScene->mMeshes[i], ofs);
         }
         ofs += pScene->mMeshes[i]->mNumVertices;
@@ -245,12 +216,8 @@ PlyExporter::PlyExporter(const char* _filename, const aiScene* pScene, bool bina
 }
 
 // ------------------------------------------------------------------------------------------------
-PlyExporter::~PlyExporter() = default;
-
-// ------------------------------------------------------------------------------------------------
-void PlyExporter::WriteMeshVerts(const aiMesh* m, unsigned int components)
-{
-    static const ai_real inf = std::numeric_limits<ai_real>::infinity();
+void PlyExporter::WriteMeshVerts(const aiMesh* m, unsigned int components) {
+    static constexpr ai_real inf = std::numeric_limits<ai_real>::infinity();
 
     // If a component (for instance normal vectors) is present in at least one mesh in the scene,
     // then default values are written for meshes that do not contain this component.
@@ -258,27 +225,33 @@ void PlyExporter::WriteMeshVerts(const aiMesh* m, unsigned int components)
         mOutput <<
             m->mVertices[i].x << " " <<
             m->mVertices[i].y << " " <<
-            m->mVertices[i].z
-        ;
+            m->mVertices[i].z;
         if(components & PLY_EXPORT_HAS_NORMALS) {
             if (m->HasNormals() && is_not_qnan(m->mNormals[i].x) && std::fabs(m->mNormals[i].x) != inf) {
                 mOutput <<
                     " " << m->mNormals[i].x <<
                     " " << m->mNormals[i].y <<
                     " " << m->mNormals[i].z;
-            }
-            else {
+            } else {
                 mOutput << " 0.0 0.0 0.0";
             }
         }
 
         for (unsigned int n = PLY_EXPORT_HAS_TEXCOORDS, c = 0; (components & n) && c != AI_MAX_NUMBER_OF_TEXTURECOORDS; n <<= 1, ++c) {
             if (m->HasTextureCoords(c)) {
-                mOutput <<
-                    " " << m->mTextureCoords[c][i].x <<
-                    " " << m->mTextureCoords[c][i].y;
-            }
-            else {
+                if (m->mNumUVComponents[c] == 3) {
+                    mOutput <<
+                        " " << m->mTextureCoords[c][i].x <<
+                        " " << m->mTextureCoords[c][i].y <<
+                        " " << m->mTextureCoords[c][i].z;
+                } else if (m->mNumUVComponents[c] == 2) {
+                    mOutput <<
+                        " " << m->mTextureCoords[c][i].x <<
+                        " " << m->mTextureCoords[c][i].y;
+                } else {
+                    throw DeadlyExportError("Invalid number of texture coordinates detected: " + std::to_string(m->mNumUVComponents[c]));
+                }
+            } else {
                 mOutput << " -1.0 -1.0";
             }
         }
@@ -290,8 +263,7 @@ void PlyExporter::WriteMeshVerts(const aiMesh* m, unsigned int components)
                     " " << (int)(m->mColors[c][i].g * 255) <<
                     " " << (int)(m->mColors[c][i].b * 255) <<
                     " " << (int)(m->mColors[c][i].a * 255);
-            }
-            else {
+            } else {
                 mOutput << " 0 0 0";
             }
         }
@@ -299,15 +271,13 @@ void PlyExporter::WriteMeshVerts(const aiMesh* m, unsigned int components)
         if(components & PLY_EXPORT_HAS_TANGENTS_BITANGENTS) {
             if (m->HasTangentsAndBitangents()) {
                 mOutput <<
-                " " << m->mTangents[i].x <<
-                " " << m->mTangents[i].y <<
-                " " << m->mTangents[i].z <<
-                " " << m->mBitangents[i].x <<
-                " " << m->mBitangents[i].y <<
-                " " << m->mBitangents[i].z
-                ;
-            }
-            else {
+                    " " << m->mTangents[i].x <<
+                    " " << m->mTangents[i].y <<
+                    " " << m->mTangents[i].z <<
+                    " " << m->mBitangents[i].x <<
+                    " " << m->mBitangents[i].y <<
+                    " " << m->mBitangents[i].z;
+            } else {
                 mOutput << " 0.0 0.0 0.0 0.0 0.0 0.0";
             }
         }
@@ -317,8 +287,7 @@ void PlyExporter::WriteMeshVerts(const aiMesh* m, unsigned int components)
 }
 
 // ------------------------------------------------------------------------------------------------
-void PlyExporter::WriteMeshVertsBinary(const aiMesh* m, unsigned int components)
-{
+void PlyExporter::WriteMeshVertsBinary(const aiMesh* m, unsigned int components) {
     // If a component (for instance normal vectors) is present in at least one mesh in the scene,
     // then default values are written for meshes that do not contain this component.
     aiVector3D defaultNormal(0, 0, 0);
@@ -329,8 +298,7 @@ void PlyExporter::WriteMeshVertsBinary(const aiMesh* m, unsigned int components)
         if (components & PLY_EXPORT_HAS_NORMALS) {
             if (m->HasNormals()) {
                 mOutput.write(reinterpret_cast<const char*>(&m->mNormals[i].x), 12);
-            }
-            else {
+            } else {
                 mOutput.write(reinterpret_cast<const char*>(&defaultNormal.x), 12);
             }
         }
@@ -338,18 +306,28 @@ void PlyExporter::WriteMeshVertsBinary(const aiMesh* m, unsigned int components)
         for (unsigned int n = PLY_EXPORT_HAS_TEXCOORDS, c = 0; (components & n) && c != AI_MAX_NUMBER_OF_TEXTURECOORDS; n <<= 1, ++c) {
             if (m->HasTextureCoords(c)) {
                 mOutput.write(reinterpret_cast<const char*>(&m->mTextureCoords[c][i].x), 8);
-            }
-            else {
+            } else {
                 mOutput.write(reinterpret_cast<const char*>(&defaultUV.x), 8);
             }
         }
 
         for (unsigned int n = PLY_EXPORT_HAS_COLORS, c = 0; (components & n) && c != AI_MAX_NUMBER_OF_COLOR_SETS; n <<= 1, ++c) {
             if (m->HasVertexColors(c)) {
-                mOutput.write(reinterpret_cast<const char*>(&m->mColors[c][i].r), 16);
-            }
-            else {
-                mOutput.write(reinterpret_cast<const char*>(&defaultColor.r), 16);
+                unsigned char rgba[4] = {
+                    static_cast<unsigned char>(m->mColors[c][i].r * 255),
+                    static_cast<unsigned char>(m->mColors[c][i].g * 255),
+                    static_cast<unsigned char>(m->mColors[c][i].b * 255),
+                    static_cast<unsigned char>(m->mColors[c][i].a * 255)
+                };
+                mOutput.write(reinterpret_cast<const char*>(&rgba), 4);
+            } else {
+                unsigned char rgba[4] = {
+                    static_cast<unsigned char>(defaultColor.r * 255),
+                    static_cast<unsigned char>(defaultColor.g * 255),
+                    static_cast<unsigned char>(defaultColor.b * 255),
+                    static_cast<unsigned char>(defaultColor.a * 255)
+                };
+                mOutput.write(reinterpret_cast<const char*>(&rgba), 4);
             }
         }
 
@@ -357,8 +335,7 @@ void PlyExporter::WriteMeshVertsBinary(const aiMesh* m, unsigned int components)
             if (m->HasTangentsAndBitangents()) {
                 mOutput.write(reinterpret_cast<const char*>(&m->mTangents[i].x), 12);
                 mOutput.write(reinterpret_cast<const char*>(&m->mBitangents[i].x), 12);
-            }
-            else {
+            } else {
                 mOutput.write(reinterpret_cast<const char*>(&defaultNormal.x), 12);
                 mOutput.write(reinterpret_cast<const char*>(&defaultNormal.x), 12);
             }
@@ -367,8 +344,7 @@ void PlyExporter::WriteMeshVertsBinary(const aiMesh* m, unsigned int components)
 }
 
 // ------------------------------------------------------------------------------------------------
-void PlyExporter::WriteMeshIndices(const aiMesh* m, unsigned int offset)
-{
+void PlyExporter::WriteMeshIndices(const aiMesh* m, unsigned int offset) {
     for (unsigned int i = 0; i < m->mNumFaces; ++i) {
         const aiFace& f = m->mFaces[i];
         mOutput << f.mNumIndices;
@@ -379,10 +355,10 @@ void PlyExporter::WriteMeshIndices(const aiMesh* m, unsigned int offset)
     }
 }
 
+// ------------------------------------------------------------------------------------------------
 // Generic method in case we want to use different data types for the indices or make this configurable.
 template<typename NumIndicesType, typename IndexType>
-void WriteMeshIndicesBinary_Generic(const aiMesh* m, unsigned int offset, std::ostringstream& output)
-{
+void WriteMeshIndicesBinary_Generic(const aiMesh* m, unsigned int offset, std::ostringstream& output) {
     for (unsigned int i = 0; i < m->mNumFaces; ++i) {
         const aiFace& f = m->mFaces[i];
         NumIndicesType numIndices = static_cast<NumIndicesType>(f.mNumIndices);
@@ -394,8 +370,8 @@ void WriteMeshIndicesBinary_Generic(const aiMesh* m, unsigned int offset, std::o
     }
 }
 
-void PlyExporter::WriteMeshIndicesBinary(const aiMesh* m, unsigned int offset)
-{
+// ------------------------------------------------------------------------------------------------
+void PlyExporter::WriteMeshIndicesBinary(const aiMesh* m, unsigned int offset) {
     WriteMeshIndicesBinary_Generic<unsigned char, int>(m, offset, mOutput);
 }
 
diff --git a/code/AssetLib/Ply/PlyExporter.h b/code/AssetLib/Ply/PlyExporter.h
index ff3a54cb6..8541d7bce 100644
--- a/code/AssetLib/Ply/PlyExporter.h
+++ b/code/AssetLib/Ply/PlyExporter.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -62,7 +61,10 @@ public:
     /// The class constructor for a specific scene to export
     PlyExporter(const char* filename, const aiScene* pScene, bool binary = false);
     /// The class destructor, empty.
-    ~PlyExporter();
+    ~PlyExporter() = default;
+
+    PlyExporter( const PlyExporter & ) = delete;
+    PlyExporter &operator = ( const PlyExporter & ) = delete;
 
 public:
     /// public string-streams to write all output into:
@@ -77,10 +79,6 @@ private:
 private:
     const std::string filename;  // tHE FILENAME
     const std::string endl;      // obviously, this endl() doesn't flush() the stream
-
-private:
-    PlyExporter( const PlyExporter & );
-    PlyExporter &operator = ( const PlyExporter & );
 };
 
 } // Namespace Assimp
diff --git a/code/AssetLib/Ply/PlyLoader.cpp b/code/AssetLib/Ply/PlyLoader.cpp
index a747ba5cd..cbf4e5321 100644
--- a/code/AssetLib/Ply/PlyLoader.cpp
+++ b/code/AssetLib/Ply/PlyLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -81,6 +81,27 @@ namespace {
 
         return props[idx];
     }
+
+    // ------------------------------------------------------------------------------------------------
+    static bool isBigEndian(const char *szMe) {
+        ai_assert(nullptr != szMe);
+
+        // binary_little_endian
+        // binary_big_endian
+        bool isBigEndian{ false };
+#if (defined AI_BUILD_BIG_ENDIAN)
+        if ('l' == *szMe || 'L' == *szMe) {
+            isBigEndian = true;
+        }
+#else
+        if ('b' == *szMe || 'B' == *szMe) {
+            isBigEndian = true;
+        }
+#endif // ! AI_BUILD_BIG_ENDIAN
+
+        return isBigEndian;
+    }
+
 } // namespace
 
 // ------------------------------------------------------------------------------------------------
@@ -92,6 +113,11 @@ PLYImporter::PLYImporter() :
     // empty
 }
 
+// ------------------------------------------------------------------------------------------------
+PLYImporter::~PLYImporter() {
+    delete mGeneratedMesh;
+}
+
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool PLYImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
@@ -104,26 +130,6 @@ const aiImporterDesc *PLYImporter::GetInfo() const {
     return &desc;
 }
 
-// ------------------------------------------------------------------------------------------------
-static bool isBigEndian(const char *szMe) {
-    ai_assert(nullptr != szMe);
-
-    // binary_little_endian
-    // binary_big_endian
-    bool isBigEndian(false);
-#if (defined AI_BUILD_BIG_ENDIAN)
-    if ('l' == *szMe || 'L' == *szMe) {
-        isBigEndian = true;
-    }
-#else
-    if ('b' == *szMe || 'B' == *szMe) {
-        isBigEndian = true;
-    }
-#endif // ! AI_BUILD_BIG_ENDIAN
-
-    return isBigEndian;
-}
-
 // ------------------------------------------------------------------------------------------------
 // Imports the given file into the given scene structure.
 void PLYImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) {
@@ -134,7 +140,7 @@ void PLYImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     }
 
     // Get the file-size
-    const size_t fileSize(fileStream->FileSize());
+    const size_t fileSize = fileStream->FileSize();
     if (0 == fileSize) {
         throw DeadlyImportError("File ", pFile, " is empty.");
     }
@@ -159,7 +165,8 @@ void PLYImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     mBuffer = (unsigned char *)&mBuffer2[0];
 
     char *szMe = (char *)&this->mBuffer[0];
-    SkipSpacesAndLineEnd(szMe, (const char **)&szMe);
+    const char *end = &mBuffer2[0] + mBuffer2.size();
+    SkipSpacesAndLineEnd(szMe, (const char **)&szMe, end);
 
     // determine the format of the file data and construct the aiMesh
     PLY::DOM sPlyDom;
@@ -167,7 +174,7 @@ void PLYImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 
     if (TokenMatch(szMe, "format", 6)) {
         if (TokenMatch(szMe, "ascii", 5)) {
-            SkipLine(szMe, (const char **)&szMe);
+            SkipLine(szMe, (const char **)&szMe, end);
             if (!PLY::DOM::ParseInstance(streamedBuffer, &sPlyDom, this)) {
                 if (mGeneratedMesh != nullptr) {
                     delete (mGeneratedMesh);
@@ -179,7 +186,7 @@ void PLYImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
             }
         } else if (!::strncmp(szMe, "binary_", 7)) {
             szMe += 7;
-            const bool bIsBE(isBigEndian(szMe));
+            const bool bIsBE = isBigEndian(szMe);
 
             // skip the line, parse the rest of the header and build the DOM
             if (!PLY::DOM::ParseInstanceBinary(streamedBuffer, &sPlyDom, this, bIsBE)) {
@@ -241,6 +248,8 @@ void PLYImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     pScene->mNumMeshes = 1;
     pScene->mMeshes = new aiMesh *[pScene->mNumMeshes];
     pScene->mMeshes[0] = mGeneratedMesh;
+
+    // Move the mesh ownership into the scene instance
     mGeneratedMesh = nullptr;
 
     // generate a simple node structure
@@ -253,20 +262,22 @@ void PLYImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     }
 }
 
+static constexpr ai_uint NotSet = 0xFFFFFFFF;
+
 void PLYImporter::LoadVertex(const PLY::Element *pcElement, const PLY::ElementInstance *instElement, unsigned int pos) {
     ai_assert(nullptr != pcElement);
     ai_assert(nullptr != instElement);
 
-    ai_uint aiPositions[3] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
+    ai_uint aiPositions[3] = { NotSet, NotSet, NotSet };
     PLY::EDataType aiTypes[3] = { EDT_Char, EDT_Char, EDT_Char };
 
-    ai_uint aiNormal[3] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
+    ai_uint aiNormal[3] = { NotSet, NotSet, NotSet };
     PLY::EDataType aiNormalTypes[3] = { EDT_Char, EDT_Char, EDT_Char };
 
-    unsigned int aiColors[4] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
+    unsigned int aiColors[4] = { NotSet, NotSet, NotSet, NotSet };
     PLY::EDataType aiColorsTypes[4] = { EDT_Char, EDT_Char, EDT_Char, EDT_Char };
 
-    unsigned int aiTexcoord[2] = { 0xFFFFFFFF, 0xFFFFFFFF };
+    unsigned int aiTexcoord[2] = { NotSet, NotSet };
     PLY::EDataType aiTexcoordTypes[2] = { EDT_Char, EDT_Char };
 
     // now check whether which normal components are available
@@ -336,17 +347,17 @@ void PLYImporter::LoadVertex(const PLY::Element *pcElement, const PLY::ElementIn
     if (0 != cnt) {
         // Position
         aiVector3D vOut;
-        if (0xFFFFFFFF != aiPositions[0]) {
+        if (NotSet != aiPositions[0]) {
             vOut.x = PLY::PropertyInstance::ConvertTo<ai_real>(
                     GetProperty(instElement->alProperties, aiPositions[0]).avList.front(), aiTypes[0]);
         }
 
-        if (0xFFFFFFFF != aiPositions[1]) {
+        if (NotSet != aiPositions[1]) {
             vOut.y = PLY::PropertyInstance::ConvertTo<ai_real>(
                     GetProperty(instElement->alProperties, aiPositions[1]).avList.front(), aiTypes[1]);
         }
 
-        if (0xFFFFFFFF != aiPositions[2]) {
+        if (NotSet != aiPositions[2]) {
             vOut.z = PLY::PropertyInstance::ConvertTo<ai_real>(
                     GetProperty(instElement->alProperties, aiPositions[2]).avList.front(), aiTypes[2]);
         }
@@ -354,19 +365,19 @@ void PLYImporter::LoadVertex(const PLY::Element *pcElement, const PLY::ElementIn
         // Normals
         aiVector3D nOut;
         bool haveNormal = false;
-        if (0xFFFFFFFF != aiNormal[0]) {
+        if (NotSet != aiNormal[0]) {
             nOut.x = PLY::PropertyInstance::ConvertTo<ai_real>(
                     GetProperty(instElement->alProperties, aiNormal[0]).avList.front(), aiNormalTypes[0]);
             haveNormal = true;
         }
 
-        if (0xFFFFFFFF != aiNormal[1]) {
+        if (NotSet != aiNormal[1]) {
             nOut.y = PLY::PropertyInstance::ConvertTo<ai_real>(
                     GetProperty(instElement->alProperties, aiNormal[1]).avList.front(), aiNormalTypes[1]);
             haveNormal = true;
         }
 
-        if (0xFFFFFFFF != aiNormal[2]) {
+        if (NotSet != aiNormal[2]) {
             nOut.z = PLY::PropertyInstance::ConvertTo<ai_real>(
                     GetProperty(instElement->alProperties, aiNormal[2]).avList.front(), aiNormalTypes[2]);
             haveNormal = true;
@@ -375,7 +386,7 @@ void PLYImporter::LoadVertex(const PLY::Element *pcElement, const PLY::ElementIn
         // Colors
         aiColor4D cOut;
         bool haveColor = false;
-        if (0xFFFFFFFF != aiColors[0]) {
+        if (NotSet != aiColors[0]) {
             cOut.r = NormalizeColorValue(GetProperty(instElement->alProperties,
                                                  aiColors[0])
                                                  .avList.front(),
@@ -383,7 +394,7 @@ void PLYImporter::LoadVertex(const PLY::Element *pcElement, const PLY::ElementIn
             haveColor = true;
         }
 
-        if (0xFFFFFFFF != aiColors[1]) {
+        if (NotSet != aiColors[1]) {
             cOut.g = NormalizeColorValue(GetProperty(instElement->alProperties,
                                                  aiColors[1])
                                                  .avList.front(),
@@ -391,7 +402,7 @@ void PLYImporter::LoadVertex(const PLY::Element *pcElement, const PLY::ElementIn
             haveColor = true;
         }
 
-        if (0xFFFFFFFF != aiColors[2]) {
+        if (NotSet != aiColors[2]) {
             cOut.b = NormalizeColorValue(GetProperty(instElement->alProperties,
                                                  aiColors[2])
                                                  .avList.front(),
@@ -400,7 +411,7 @@ void PLYImporter::LoadVertex(const PLY::Element *pcElement, const PLY::ElementIn
         }
 
         // assume 1.0 for the alpha channel if it is not set
-        if (0xFFFFFFFF == aiColors[3]) {
+        if (NotSet == aiColors[3]) {
             cOut.a = 1.0;
         } else {
             cOut.a = NormalizeColorValue(GetProperty(instElement->alProperties,
@@ -415,13 +426,13 @@ void PLYImporter::LoadVertex(const PLY::Element *pcElement, const PLY::ElementIn
         aiVector3D tOut;
         tOut.z = 0;
         bool haveTextureCoords = false;
-        if (0xFFFFFFFF != aiTexcoord[0]) {
+        if (NotSet != aiTexcoord[0]) {
             tOut.x = PLY::PropertyInstance::ConvertTo<ai_real>(
                     GetProperty(instElement->alProperties, aiTexcoord[0]).avList.front(), aiTexcoordTypes[0]);
             haveTextureCoords = true;
         }
 
-        if (0xFFFFFFFF != aiTexcoord[1]) {
+        if (NotSet != aiTexcoord[1]) {
             tOut.y = PLY::PropertyInstance::ConvertTo<ai_real>(
                     GetProperty(instElement->alProperties, aiTexcoord[1]).avList.front(), aiTexcoordTypes[1]);
             haveTextureCoords = true;
@@ -437,6 +448,9 @@ void PLYImporter::LoadVertex(const PLY::Element *pcElement, const PLY::ElementIn
             mGeneratedMesh->mNumVertices = pcElement->NumOccur;
             mGeneratedMesh->mVertices = new aiVector3D[mGeneratedMesh->mNumVertices];
         }
+        if (pos >= mGeneratedMesh->mNumVertices) {
+            throw DeadlyImportError("Invalid .ply file: Too many vertices");
+        }
 
         mGeneratedMesh->mVertices[pos] = vOut;
 
@@ -503,16 +517,12 @@ void PLYImporter::LoadFace(const PLY::Element *pcElement, const PLY::ElementInst
     bool bOne = false;
 
     // index of the vertex index list
-    unsigned int iProperty = 0xFFFFFFFF;
+    unsigned int iProperty = NotSet;
     PLY::EDataType eType = EDT_Char;
     bool bIsTriStrip = false;
 
-    // index of the material index property
-    // unsigned int iMaterialIndex = 0xFFFFFFFF;
-    // PLY::EDataType eType2 = EDT_Char;
-
     // texture coordinates
-    unsigned int iTextureCoord = 0xFFFFFFFF;
+    unsigned int iTextureCoord = NotSet;
     PLY::EDataType eType3 = EDT_Char;
 
     // face = unique number of vertex indices
@@ -563,11 +573,15 @@ void PLYImporter::LoadFace(const PLY::Element *pcElement, const PLY::ElementInst
         if (mGeneratedMesh->mFaces == nullptr) {
             mGeneratedMesh->mNumFaces = pcElement->NumOccur;
             mGeneratedMesh->mFaces = new aiFace[mGeneratedMesh->mNumFaces];
+        } else {
+            if (mGeneratedMesh->mNumFaces < pcElement->NumOccur) {
+                throw DeadlyImportError("Invalid .ply file: Too many faces");
+            }
         }
 
         if (!bIsTriStrip) {
             // parse the list of vertex indices
-            if (0xFFFFFFFF != iProperty) {
+            if (NotSet != iProperty) {
                 const unsigned int iNum = (unsigned int)GetProperty(instElement->alProperties, iProperty).avList.size();
                 mGeneratedMesh->mFaces[pos].mNumIndices = iNum;
                 mGeneratedMesh->mFaces[pos].mIndices = new unsigned int[iNum];
@@ -580,15 +594,7 @@ void PLYImporter::LoadFace(const PLY::Element *pcElement, const PLY::ElementInst
                 }
             }
 
-            // parse the material index
-            // cannot be handled without processing the whole file first
-            /*if (0xFFFFFFFF != iMaterialIndex)
-        {
-            mGeneratedMesh->mFaces[pos]. = PLY::PropertyInstance::ConvertTo<unsigned int>(
-            GetProperty(instElement->alProperties, iMaterialIndex).avList.front(), eType2);
-        }*/
-
-            if (0xFFFFFFFF != iTextureCoord) {
+            if (NotSet != iTextureCoord) {
                 const unsigned int iNum = (unsigned int)GetProperty(instElement->alProperties, iTextureCoord).avList.size();
 
                 // should be 6 coords
@@ -674,41 +680,29 @@ void PLYImporter::GetMaterialColor(const std::vector<PLY::PropertyInstance> &avL
         aiColor4D *clrOut) {
     ai_assert(nullptr != clrOut);
 
-    if (0xFFFFFFFF == aiPositions[0])
+    if (NotSet == aiPositions[0]) {
         clrOut->r = 0.0f;
-    else {
-        clrOut->r = NormalizeColorValue(GetProperty(avList,
-                                                aiPositions[0])
-                                                .avList.front(),
-                aiTypes[0]);
+    } else {
+        clrOut->r = NormalizeColorValue(GetProperty(avList, aiPositions[0]).avList.front(), aiTypes[0]);
     }
 
-    if (0xFFFFFFFF == aiPositions[1])
+    if (NotSet == aiPositions[1]) {
         clrOut->g = 0.0f;
-    else {
-        clrOut->g = NormalizeColorValue(GetProperty(avList,
-                                                aiPositions[1])
-                                                .avList.front(),
-                aiTypes[1]);
+    } else {
+        clrOut->g = NormalizeColorValue(GetProperty(avList, aiPositions[1]).avList.front(), aiTypes[1]);
     }
 
-    if (0xFFFFFFFF == aiPositions[2])
+    if (NotSet == aiPositions[2])
         clrOut->b = 0.0f;
     else {
-        clrOut->b = NormalizeColorValue(GetProperty(avList,
-                                                aiPositions[2])
-                                                .avList.front(),
-                aiTypes[2]);
+        clrOut->b = NormalizeColorValue(GetProperty(avList, aiPositions[2]).avList.front(), aiTypes[2]);
     }
 
     // assume 1.0 for the alpha channel ifit is not set
-    if (0xFFFFFFFF == aiPositions[3])
+    if (NotSet == aiPositions[3])
         clrOut->a = 1.0f;
     else {
-        clrOut->a = NormalizeColorValue(GetProperty(avList,
-                                                aiPositions[3])
-                                                .avList.front(),
-                aiTypes[3]);
+        clrOut->a = NormalizeColorValue(GetProperty(avList, aiPositions[3]).avList.front(), aiTypes[3]);
     }
 }
 
diff --git a/code/AssetLib/Ply/PlyLoader.h b/code/AssetLib/Ply/PlyLoader.h
index f85445f91..8cd946a5f 100644
--- a/code/AssetLib/Ply/PlyLoader.h
+++ b/code/AssetLib/Ply/PlyLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -62,10 +62,10 @@ using namespace PLY;
 // ---------------------------------------------------------------------------
 /** Importer class to load the stanford PLY file format
 */
-class PLYImporter : public BaseImporter {
+class PLYImporter final : public BaseImporter {
 public:
     PLYImporter();
-    ~PLYImporter() override = default;
+    ~PLYImporter() override;
 
     // -------------------------------------------------------------------
     /** Returns whether the class can handle the format of the given file.
@@ -120,13 +120,9 @@ protected:
             PLY::PropertyInstance::ValueUnion val,
             PLY::EDataType eType);
 
-    /** Buffer to hold the loaded file */
+private:
     unsigned char *mBuffer;
-
-    /** Document object model representation extracted from the file */
     PLY::DOM *pcDOM;
-
-    /** Mesh generated by loader */
     aiMesh *mGeneratedMesh;
 };
 
diff --git a/code/AssetLib/Ply/PlyParser.cpp b/code/AssetLib/Ply/PlyParser.cpp
index 662da805e..9199b6a4f 100644
--- a/code/AssetLib/Ply/PlyParser.cpp
+++ b/code/AssetLib/Ply/PlyParser.cpp
@@ -3,8 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -48,9 +47,28 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/ByteSwapper.h>
 #include <assimp/fast_atof.h>
 #include <assimp/DefaultLogger.hpp>
+#include <unordered_set>
 #include <utility>
 
-using namespace Assimp;
+namespace Assimp {
+
+std::string to_string(EElementSemantic e) {
+
+    switch (e) {
+    case EEST_Vertex:
+        return std::string{ "vertex" };
+    case EEST_TriStrip:
+        return std::string{ "tristrips" };
+    case EEST_Edge:
+        return std::string{ "edge" };
+    case EEST_Material:
+        return std::string{ "material" };
+    case EEST_TextureFile:
+        return std::string{ "TextureFile" };
+    default:
+        return std::string{ "invalid" };
+    }
+}
 
 // ------------------------------------------------------------------------------------------------
 PLY::EDataType PLY::Property::ParseDataType(std::vector<char> &buffer) {
@@ -281,6 +299,10 @@ bool PLY::Element::ParseElement(IOStreamBuffer<char> &streamBuffer, std::vector<
         // if the exact semantic can't be determined, just store
         // the original string identifier
         pOut->szName = std::string(&buffer[0], &buffer[0] + strlen(&buffer[0]));
+        auto pos = pOut->szName.find_last_of(' ');
+        if (pos != std::string::npos) {
+            pOut->szName.erase(pos, pOut->szName.size());
+        }
     }
 
     if (!PLY::DOM::SkipSpaces(buffer))
@@ -296,7 +318,7 @@ bool PLY::Element::ParseElement(IOStreamBuffer<char> &streamBuffer, std::vector<
         return true;
     }
 
-    //parse the number of occurrences of this element
+    // parse the number of occurrences of this element
     const char *pCur = (char *)&buffer[0];
     pOut->NumOccur = strtoul10(pCur, &pCur);
 
@@ -321,13 +343,13 @@ bool PLY::Element::ParseElement(IOStreamBuffer<char> &streamBuffer, std::vector<
     return true;
 }
 
-// ------------------------------------------------------------------------------------------------
 bool PLY::DOM::SkipSpaces(std::vector<char> &buffer) {
     const char *pCur = buffer.empty() ? nullptr : (char *)&buffer[0];
+    const char *end = pCur + buffer.size();
     bool ret = false;
     if (pCur) {
         const char *szCur = pCur;
-        ret = Assimp::SkipSpaces(pCur, &pCur);
+        ret = Assimp::SkipSpaces(pCur, &pCur, end);
 
         uintptr_t iDiff = (uintptr_t)pCur - (uintptr_t)szCur;
         buffer.erase(buffer.begin(), buffer.begin() + iDiff);
@@ -339,10 +361,11 @@ bool PLY::DOM::SkipSpaces(std::vector<char> &buffer) {
 
 bool PLY::DOM::SkipLine(std::vector<char> &buffer) {
     const char *pCur = buffer.empty() ? nullptr : (char *)&buffer[0];
+    const char *end = pCur + buffer.size();
     bool ret = false;
     if (pCur) {
         const char *szCur = pCur;
-        ret = Assimp::SkipLine(pCur, &pCur);
+        ret = Assimp::SkipLine(pCur, &pCur, end);
 
         uintptr_t iDiff = (uintptr_t)pCur - (uintptr_t)szCur;
         buffer.erase(buffer.begin(), buffer.begin() + iDiff);
@@ -369,10 +392,11 @@ bool PLY::DOM::TokenMatch(std::vector<char> &buffer, const char *token, unsigned
 
 bool PLY::DOM::SkipSpacesAndLineEnd(std::vector<char> &buffer) {
     const char *pCur = buffer.empty() ? nullptr : (char *)&buffer[0];
+    const char *end = pCur + buffer.size();
     bool ret = false;
     if (pCur) {
         const char *szCur = pCur;
-        ret = Assimp::SkipSpacesAndLineEnd(pCur, &pCur);
+        ret = Assimp::SkipSpacesAndLineEnd(pCur, &pCur, end);
 
         uintptr_t iDiff = (uintptr_t)pCur - (uintptr_t)szCur;
         buffer.erase(buffer.begin(), buffer.begin() + iDiff);
@@ -411,6 +435,7 @@ bool PLY::DOM::SkipComments(std::vector<char> buffer) {
 bool PLY::DOM::ParseHeader(IOStreamBuffer<char> &streamBuffer, std::vector<char> &buffer, bool isBinary) {
     ASSIMP_LOG_VERBOSE_DEBUG("PLY::DOM::ParseHeader() begin");
 
+    std::unordered_set<std::string> definedAlElements;
     // parse all elements
     while (!buffer.empty()) {
         // skip all comments
@@ -419,6 +444,13 @@ bool PLY::DOM::ParseHeader(IOStreamBuffer<char> &streamBuffer, std::vector<char>
         PLY::Element out;
         if (PLY::Element::ParseElement(streamBuffer, buffer, &out)) {
             // add the element to the list of elements
+
+            const auto propertyName = (out.szName.empty()) ? to_string(out.eSemantic) : out.szName;
+            auto alreadyDefined = definedAlElements.find(propertyName);
+            if (alreadyDefined != definedAlElements.end()) {
+                throw DeadlyImportError("Property '" + propertyName + "' in header already defined ");
+            }
+            definedAlElements.insert(propertyName);
             alElements.push_back(out);
         } else if (TokenMatch(buffer, "end_header", 10)) {
             // we have reached the end of the header
@@ -426,7 +458,7 @@ bool PLY::DOM::ParseHeader(IOStreamBuffer<char> &streamBuffer, std::vector<char>
         } else {
             // ignore unknown header elements
             if (!streamBuffer.getNextLine(buffer))
-              return false;
+                return false;
         }
     }
 
@@ -446,7 +478,7 @@ bool PLY::DOM::ParseElementInstanceLists(IOStreamBuffer<char> &streamBuffer, std
     std::vector<PLY::ElementInstanceList>::iterator a = alElementData.begin();
 
     // parse all element instances
-    //construct vertices and faces
+    // construct vertices and faces
     for (; i != alElements.end(); ++i, ++a) {
         if ((*i).eSemantic == EEST_Vertex || (*i).eSemantic == EEST_Face || (*i).eSemantic == EEST_TriStrip) {
             PLY::ElementInstanceList::ParseInstanceList(streamBuffer, buffer, &(*i), nullptr, loader);
@@ -528,7 +560,7 @@ bool PLY::DOM::ParseInstance(IOStreamBuffer<char> &streamBuffer, DOM *p_pcOut, P
         return false;
     }
 
-    //get next line after header
+    // get next line after header
     streamBuffer.getNextLine(buffer);
     if (!p_pcOut->ParseElementInstanceLists(streamBuffer, buffer, loader)) {
         ASSIMP_LOG_VERBOSE_DEBUG("PLY::DOM::ParseInstance() failure");
@@ -558,23 +590,24 @@ bool PLY::ElementInstanceList::ParseInstanceList(
         }
     } else {
         const char *pCur = (const char *)&buffer[0];
+        const char *end = pCur + buffer.size();
         // be sure to have enough storage
         for (unsigned int i = 0; i < pcElement->NumOccur; ++i) {
             if (p_pcOut)
-                PLY::ElementInstance::ParseInstance(pCur, pcElement, &p_pcOut->alInstances[i]);
+                PLY::ElementInstance::ParseInstance(pCur, end, pcElement, &p_pcOut->alInstances[i]);
             else {
                 ElementInstance elt;
-                PLY::ElementInstance::ParseInstance(pCur, pcElement, &elt);
+                PLY::ElementInstance::ParseInstance(pCur, end, pcElement, &elt);
 
                 // Create vertex or face
                 if (pcElement->eSemantic == EEST_Vertex) {
-                    //call loader instance from here
+                    // call loader instance from here
                     loader->LoadVertex(pcElement, &elt, i);
                 } else if (pcElement->eSemantic == EEST_Face) {
-                    //call loader instance from here
+                    // call loader instance from here
                     loader->LoadFace(pcElement, &elt, i);
                 } else if (pcElement->eSemantic == EEST_TriStrip) {
-                    //call loader instance from here
+                    // call loader instance from here
                     loader->LoadFace(pcElement, &elt, i);
                 }
             }
@@ -611,13 +644,13 @@ bool PLY::ElementInstanceList::ParseInstanceListBinary(
 
             // Create vertex or face
             if (pcElement->eSemantic == EEST_Vertex) {
-                //call loader instance from here
+                // call loader instance from here
                 loader->LoadVertex(pcElement, &elt, i);
             } else if (pcElement->eSemantic == EEST_Face) {
-                //call loader instance from here
+                // call loader instance from here
                 loader->LoadFace(pcElement, &elt, i);
             } else if (pcElement->eSemantic == EEST_TriStrip) {
-                //call loader instance from here
+                // call loader instance from here
                 loader->LoadFace(pcElement, &elt, i);
             }
         }
@@ -626,7 +659,7 @@ bool PLY::ElementInstanceList::ParseInstanceListBinary(
 }
 
 // ------------------------------------------------------------------------------------------------
-bool PLY::ElementInstance::ParseInstance(const char *&pCur,
+bool PLY::ElementInstance::ParseInstance(const char *&pCur, const char *end,
         const PLY::Element *pcElement,
         PLY::ElementInstance *p_pcOut) {
     ai_assert(nullptr != pcElement);
@@ -638,7 +671,7 @@ bool PLY::ElementInstance::ParseInstance(const char *&pCur,
     std::vector<PLY::PropertyInstance>::iterator i = p_pcOut->alProperties.begin();
     std::vector<PLY::Property>::const_iterator a = pcElement->alProperties.begin();
     for (; i != p_pcOut->alProperties.end(); ++i, ++a) {
-        if (!(PLY::PropertyInstance::ParseInstance(pCur, &(*a), &(*i)))) {
+        if (!(PLY::PropertyInstance::ParseInstance(pCur, end, &(*a), &(*i)))) {
             ASSIMP_LOG_WARN("Unable to parse property instance. "
                             "Skipping this element instance");
 
@@ -678,13 +711,13 @@ bool PLY::ElementInstance::ParseInstanceBinary(
 }
 
 // ------------------------------------------------------------------------------------------------
-bool PLY::PropertyInstance::ParseInstance(const char *&pCur,
-        const PLY::Property *prop, PLY::PropertyInstance *p_pcOut) {
+bool PLY::PropertyInstance::ParseInstance(const char *&pCur, const char *end, const PLY::Property *prop,
+        PLY::PropertyInstance *p_pcOut) {
     ai_assert(nullptr != prop);
     ai_assert(nullptr != p_pcOut);
 
     // skip spaces at the beginning
-    if (!SkipSpaces(&pCur)) {
+    if (!SkipSpaces(&pCur, end)) {
         return false;
     }
 
@@ -699,7 +732,7 @@ bool PLY::PropertyInstance::ParseInstance(const char *&pCur,
         // parse all list elements
         p_pcOut->avList.resize(iNum);
         for (unsigned int i = 0; i < iNum; ++i) {
-            if (!SkipSpaces(&pCur))
+            if (!SkipSpaces(&pCur, end))
                 return false;
 
             PLY::PropertyInstance::ParseValue(pCur, prop->eType, &p_pcOut->avList[i]);
@@ -711,7 +744,7 @@ bool PLY::PropertyInstance::ParseInstance(const char *&pCur,
         PLY::PropertyInstance::ParseValue(pCur, prop->eType, &v);
         p_pcOut->avList.push_back(v);
     }
-    SkipSpacesAndLineEnd(&pCur);
+    SkipSpacesAndLineEnd(&pCur, end);
     return true;
 }
 
@@ -774,7 +807,7 @@ bool PLY::PropertyInstance::ParseValue(const char *&pCur,
     ai_assert(nullptr != pCur);
     ai_assert(nullptr != out);
 
-    //calc element size
+    // calc element size
     bool ret = true;
     switch (eType) {
     case EDT_UInt:
@@ -824,7 +857,7 @@ bool PLY::PropertyInstance::ParseValueBinary(IOStreamBuffer<char> &streamBuffer,
         bool p_bBE) {
     ai_assert(nullptr != out);
 
-    //calc element size
+    // calc element size
     unsigned int lsize = 0;
     switch (eType) {
     case EDT_Char:
@@ -852,11 +885,11 @@ bool PLY::PropertyInstance::ParseValueBinary(IOStreamBuffer<char> &streamBuffer,
         break;
     }
 
-    //read the next file block if needed
+    // read the next file block if needed
     if (bufferSize < lsize) {
         std::vector<char> nbuffer;
         if (streamBuffer.getNextBlock(nbuffer)) {
-            //concat buffer contents
+            // concat buffer contents
             buffer = std::vector<char>(buffer.end() - bufferSize, buffer.end());
             buffer.insert(buffer.end(), nbuffer.begin(), nbuffer.end());
             nbuffer.clear();
@@ -958,4 +991,6 @@ bool PLY::PropertyInstance::ParseValueBinary(IOStreamBuffer<char> &streamBuffer,
     return ret;
 }
 
+} // namespace Assimp
+
 #endif // !! ASSIMP_BUILD_NO_PLY_IMPORTER
diff --git a/code/AssetLib/Ply/PlyParser.h b/code/AssetLib/Ply/PlyParser.h
index 593791e92..53a5338e3 100644
--- a/code/AssetLib/Ply/PlyParser.h
+++ b/code/AssetLib/Ply/PlyParser.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -324,7 +324,7 @@ public:
 
     // -------------------------------------------------------------------
     //! Parse a property instance
-    static bool ParseInstance(const char* &pCur,
+    static bool ParseInstance(const char* &pCur, const char *end,
         const Property* prop, PropertyInstance* p_pcOut);
 
     // -------------------------------------------------------------------
@@ -364,7 +364,7 @@ public:
 
     // -------------------------------------------------------------------
     //! Parse an element instance
-    static bool ParseInstance(const char* &pCur,
+    static bool ParseInstance(const char *&pCur, const char *end,
         const Element* pcElement, ElementInstance* p_pcOut);
 
     // -------------------------------------------------------------------
diff --git a/code/AssetLib/Q3BSP/Q3BSPFileData.h b/code/AssetLib/Q3BSP/Q3BSPFileData.h
index 086cf7842..90acdeb03 100644
--- a/code/AssetLib/Q3BSP/Q3BSPFileData.h
+++ b/code/AssetLib/Q3BSP/Q3BSPFileData.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Q3BSP/Q3BSPFileImporter.cpp b/code/AssetLib/Q3BSP/Q3BSPFileImporter.cpp
index 3c56775e8..c4c1cbb3c 100644
--- a/code/AssetLib/Q3BSP/Q3BSPFileImporter.cpp
+++ b/code/AssetLib/Q3BSP/Q3BSPFileImporter.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -395,7 +394,10 @@ void Q3BSPFileImporter::createTriangleTopology(const Q3BSP::Q3BSPModel *pModel,
                 m_pCurrentFace->mIndices = new unsigned int[3];
                 m_pCurrentFace->mIndices[idx] = vertIdx;
             }
-        }
+		} else {
+			m_pCurrentFace->mIndices[idx] = vertIdx;
+		}
+
 
         pMesh->mVertices[vertIdx].Set(pVertex->vPosition.x, pVertex->vPosition.y, pVertex->vPosition.z);
         pMesh->mNormals[vertIdx].Set(pVertex->vNormal.x, pVertex->vNormal.y, pVertex->vNormal.z);
@@ -585,7 +587,7 @@ bool Q3BSPFileImporter::importTextureFromArchive(const Q3BSP::Q3BSPModel *model,
 
             aiString name;
             name.data[0] = '*';
-            name.length = 1 + ASSIMP_itoa10(name.data + 1, static_cast<unsigned int>(MAXLEN - 1), static_cast<int32_t>(mTextures.size()));
+            name.length = 1 + ASSIMP_itoa10(name.data + 1, static_cast<unsigned int>(AI_MAXLEN - 1), static_cast<int32_t>(mTextures.size()));
 
             archive->Close(pTextureStream);
 
@@ -638,7 +640,7 @@ bool Q3BSPFileImporter::importLightmap(const Q3BSP::Q3BSPModel *pModel, aiScene
 
     aiString name;
     name.data[0] = '*';
-    name.length = 1 + ASSIMP_itoa10(name.data + 1, static_cast<unsigned int>(MAXLEN - 1), static_cast<int32_t>(mTextures.size()));
+    name.length = 1 + ASSIMP_itoa10(name.data + 1, static_cast<unsigned int>(AI_MAXLEN - 1), static_cast<int32_t>(mTextures.size()));
 
     pMatHelper->AddProperty(&name, AI_MATKEY_TEXTURE_LIGHTMAP(1));
     mTextures.push_back(pTexture);
diff --git a/code/AssetLib/Q3BSP/Q3BSPFileImporter.h b/code/AssetLib/Q3BSP/Q3BSPFileImporter.h
index 63d6edb21..78cbfbeee 100644
--- a/code/AssetLib/Q3BSP/Q3BSPFileImporter.h
+++ b/code/AssetLib/Q3BSP/Q3BSPFileImporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Q3BSP/Q3BSPFileParser.cpp b/code/AssetLib/Q3BSP/Q3BSPFileParser.cpp
index 910da5b36..346ce9c0e 100644
--- a/code/AssetLib/Q3BSP/Q3BSPFileParser.cpp
+++ b/code/AssetLib/Q3BSP/Q3BSPFileParser.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Q3BSP/Q3BSPFileParser.h b/code/AssetLib/Q3BSP/Q3BSPFileParser.h
index 15cc751cc..486b5f474 100644
--- a/code/AssetLib/Q3BSP/Q3BSPFileParser.h
+++ b/code/AssetLib/Q3BSP/Q3BSPFileParser.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Q3D/Q3DLoader.cpp b/code/AssetLib/Q3D/Q3DLoader.cpp
index b599ad8f2..2862350a5 100644
--- a/code/AssetLib/Q3D/Q3DLoader.cpp
+++ b/code/AssetLib/Q3D/Q3DLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -250,6 +250,10 @@ void Q3DImporter::InternReadFile(const std::string &pFile,
                 c = stream.GetI1();
                 while (c) {
                     mat.name.data[mat.name.length++] = c;
+                    if (mat.name.length == AI_MAXLEN) {
+                        ASSIMP_LOG_ERROR("String ouverflow detected, skipped material name parsing.");
+                        break;
+                    }
                     c = stream.GetI1();
                 }
 
diff --git a/code/AssetLib/Q3D/Q3DLoader.h b/code/AssetLib/Q3D/Q3DLoader.h
index 54af86dc2..035e102ea 100644
--- a/code/AssetLib/Q3D/Q3DLoader.h
+++ b/code/AssetLib/Q3D/Q3DLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include <cstdint>
 
-namespace Assimp    {
+namespace Assimp {
 
 // ---------------------------------------------------------------------------
 /** Importer class for the Quick3D Object and Scene formats.
diff --git a/code/AssetLib/Raw/RawLoader.cpp b/code/AssetLib/Raw/RawLoader.cpp
index 4c5f852b0..289584b6a 100644
--- a/code/AssetLib/Raw/RawLoader.cpp
+++ b/code/AssetLib/Raw/RawLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -104,11 +104,12 @@ void RAWImporter::InternReadFile(const std::string &pFile,
 
     // now read all lines
     char line[4096];
+    const char *end = &line[4096];
     while (GetNextLine(buffer, line)) {
         // if the line starts with a non-numeric identifier, it marks
         // the beginning of a new group
         const char *sz = line;
-        SkipSpaces(&sz);
+        SkipSpaces(&sz, end);
         if (IsLineEnd(*sz)) continue;
         if (!IsNumeric(*sz)) {
             const char *sz2 = sz;
@@ -117,8 +118,8 @@ void RAWImporter::InternReadFile(const std::string &pFile,
             const unsigned int length = (unsigned int)(sz2 - sz);
 
             // find an existing group with this name
-            for (std::vector<GroupInformation>::iterator it = outGroups.begin(), end = outGroups.end();
-                    it != end; ++it) {
+            for (std::vector<GroupInformation>::iterator it = outGroups.begin(), endIt = outGroups.end();
+                    it != endIt; ++it) {
                 if (length == (*it).name.length() && !::strcmp(sz, (*it).name.c_str())) {
                     curGroup = it;
                     sz2 = nullptr;
@@ -134,7 +135,7 @@ void RAWImporter::InternReadFile(const std::string &pFile,
             float data[12];
             unsigned int num;
             for (num = 0; num < 12; ++num) {
-                if (!SkipSpaces(&sz) || !IsNumeric(*sz)) break;
+                if (!SkipSpaces(&sz, end) || !IsNumeric(*sz)) break;
                 sz = fast_atoreal_move<float>(sz, data[num]);
             }
             if (num != 12 && num != 9) {
diff --git a/code/AssetLib/Raw/RawLoader.h b/code/AssetLib/Raw/RawLoader.h
index 83e4a9f1f..c4d983b58 100644
--- a/code/AssetLib/Raw/RawLoader.h
+++ b/code/AssetLib/Raw/RawLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/SIB/SIBImporter.cpp b/code/AssetLib/SIB/SIBImporter.cpp
index 840f74b7d..8e058461d 100644
--- a/code/AssetLib/SIB/SIBImporter.cpp
+++ b/code/AssetLib/SIB/SIBImporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -195,6 +195,7 @@ static aiString ReadString(StreamReaderLE *stream, uint32_t numWChars) {
 
     return result;
 }
+
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool SIBImporter::CanRead(const std::string &filename, IOSystem * /*pIOHandler*/, bool /*checkSig*/) const {
diff --git a/code/AssetLib/SIB/SIBImporter.h b/code/AssetLib/SIB/SIBImporter.h
index 903c36561..ed7e03d5f 100644
--- a/code/AssetLib/SIB/SIBImporter.h
+++ b/code/AssetLib/SIB/SIBImporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/SMD/SMDLoader.cpp b/code/AssetLib/SMD/SMDLoader.cpp
index 4b63dd9d0..fe7c35e78 100644
--- a/code/AssetLib/SMD/SMDLoader.cpp
+++ b/code/AssetLib/SMD/SMDLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -82,9 +82,11 @@ static constexpr aiImporterDesc desc = {
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
 SMDImporter::SMDImporter() :
-        configFrameID(), 
-        pScene( nullptr ), 
-        iFileSize( 0 ), 
+        configFrameID(),
+        mBuffer(),
+        mEnd(nullptr),
+        pScene(nullptr),
+        iFileSize( 0 ),
         iSmallestFrame( INT_MAX ),
         dLengthOfAnim( 0.0 ),
         bHasUVs(false ),
@@ -92,9 +94,6 @@ SMDImporter::SMDImporter() :
     // empty
 }
 
-// ------------------------------------------------------------------------------------------------
-// Destructor, private as well
-SMDImporter::~SMDImporter() = default;
 
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
@@ -401,8 +400,12 @@ void SMDImporter::AddBoneChildren(aiNode* pcNode, uint32_t iParent) {
         }
     }
 
+    // nothing to do
+    if (pcNode->mNumChildren == 0)
+        return;
+
     // now allocate the output array
-    pcNode->mChildren = new aiNode*[pcNode->mNumChildren];
+    pcNode->mChildren = new aiNode *[pcNode->mNumChildren];
 
     // and fill all subnodes
     unsigned int qq( 0 );
@@ -452,11 +455,10 @@ void SMDImporter::CreateOutputNodes() {
         delete pcOldRoot;
 
         pScene->mRootNode->mParent = nullptr;
-    }
-    else
-    {
-        ::strcpy(pScene->mRootNode->mName.data, "<SMD_root>");
+    } else {
+        static constexpr char rootName[11] = "<SMD_root>";
         pScene->mRootNode->mName.length = 10;
+        ::strncpy(pScene->mRootNode->mName.data, rootName, pScene->mRootNode->mName.length);
     }
 }
 
@@ -590,12 +592,12 @@ void SMDImporter::CreateOutputMaterials() {
         pScene->mMaterials[iMat] = pcMat;
 
         aiString szName;
-        szName.length = static_cast<ai_uint32>(ai_snprintf(szName.data,MAXLEN,"Texture_%u",iMat));
+        szName.length = static_cast<ai_uint32>(ai_snprintf(szName.data, AI_MAXLEN, "Texture_%u", iMat));
         pcMat->AddProperty(&szName,AI_MATKEY_NAME);
 
         if (aszTextures[iMat].length())
         {
-            ::strncpy(szName.data, aszTextures[iMat].c_str(),MAXLEN-1);
+            ::strncpy(szName.data, aszTextures[iMat].c_str(), AI_MAXLEN - 1);
             szName.length = static_cast<ai_uint32>( aszTextures[iMat].length() );
             pcMat->AddProperty(&szName,AI_MATKEY_TEXTURE_DIFFUSE(0));
         }
@@ -632,13 +634,13 @@ void SMDImporter::ParseFile() {
 
     // read line per line ...
     for ( ;; ) {
-        if(!SkipSpacesAndLineEnd(szCurrent,&szCurrent)) {
+        if(!SkipSpacesAndLineEnd(szCurrent,&szCurrent, mEnd)) {
             break;
         }
 
         // "version <n> \n", <n> should be 1 for hl and hl2 SMD files
         if (TokenMatch(szCurrent,"version",7)) {
-            if(!SkipSpaces(szCurrent,&szCurrent)) break;
+            if(!SkipSpaces(szCurrent,&szCurrent, mEnd)) break;
             if (1 != strtoul10(szCurrent,&szCurrent)) {
                 ASSIMP_LOG_WARN("SMD.version is not 1. This "
                     "file format is not known. Continuing happily ...");
@@ -647,26 +649,26 @@ void SMDImporter::ParseFile() {
         }
         // "nodes\n" - Starts the node section
         if (TokenMatch(szCurrent,"nodes",5)) {
-            ParseNodesSection(szCurrent,&szCurrent);
+            ParseNodesSection(szCurrent, &szCurrent, mEnd);
             continue;
         }
         // "triangles\n" - Starts the triangle section
         if (TokenMatch(szCurrent,"triangles",9)) {
-            ParseTrianglesSection(szCurrent,&szCurrent);
+            ParseTrianglesSection(szCurrent, &szCurrent, mEnd);
             continue;
         }
         // "vertexanimation\n" - Starts the vertex animation section
         if (TokenMatch(szCurrent,"vertexanimation",15)) {
             bHasUVs = false;
-            ParseVASection(szCurrent,&szCurrent);
+            ParseVASection(szCurrent, &szCurrent, mEnd);
             continue;
         }
         // "skeleton\n" - Starts the skeleton section
         if (TokenMatch(szCurrent,"skeleton",8)) {
-            ParseSkeletonSection(szCurrent,&szCurrent);
+            ParseSkeletonSection(szCurrent, &szCurrent, mEnd);
             continue;
         }
-        SkipLine(szCurrent,&szCurrent);
+        SkipLine(szCurrent, &szCurrent, mEnd);
     }
 }
 
@@ -683,6 +685,7 @@ void SMDImporter::ReadSmd(const std::string &pFile, IOSystem* pIOHandler) {
     // Allocate storage and copy the contents of the file to a memory buffer
     mBuffer.resize(iFileSize + 1);
     TextFileToBuffer(file.get(), mBuffer);
+    mEnd = &mBuffer[mBuffer.size() - 1] + 1;
 
     iSmallestFrame = INT_MAX;
     bHasUVs = true;
@@ -723,26 +726,26 @@ unsigned int SMDImporter::GetTextureIndex(const std::string& filename) {
 
 // ------------------------------------------------------------------------------------------------
 // Parse the nodes section of the file
-void SMDImporter::ParseNodesSection(const char* szCurrent, const char** szCurrentOut) {
+void SMDImporter::ParseNodesSection(const char* szCurrent, const char** szCurrentOut, const char *end) {
     for ( ;; ) {
         // "end\n" - Ends the nodes section
-        if (0 == ASSIMP_strincmp(szCurrent,"end",3) && IsSpaceOrNewLine(*(szCurrent+3))) {
+        if (0 == ASSIMP_strincmp(szCurrent, "end", 3) && IsSpaceOrNewLine(*(szCurrent+3))) {
             szCurrent += 4;
             break;
         }
-        ParseNodeInfo(szCurrent,&szCurrent);
+        ParseNodeInfo(szCurrent,&szCurrent, end);
     }
-    SkipSpacesAndLineEnd(szCurrent,&szCurrent);
+    SkipSpacesAndLineEnd(szCurrent, &szCurrent, end);
     *szCurrentOut = szCurrent;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Parse the triangles section of the file
-void SMDImporter::ParseTrianglesSection(const char* szCurrent, const char** szCurrentOut) {
+void SMDImporter::ParseTrianglesSection(const char *szCurrent, const char **szCurrentOut, const char *end) {
     // Parse a triangle, parse another triangle, parse the next triangle ...
     // and so on until we reach a token that looks quite similar to "end"
     for ( ;; ) {
-        if(!SkipSpacesAndLineEnd(szCurrent,&szCurrent)) {
+        if(!SkipSpacesAndLineEnd(szCurrent,&szCurrent, end)) {
             break;
         }
 
@@ -750,17 +753,17 @@ void SMDImporter::ParseTrianglesSection(const char* szCurrent, const char** szCu
         if (TokenMatch(szCurrent,"end",3)) {
             break;
         }
-        ParseTriangle(szCurrent,&szCurrent);
+        ParseTriangle(szCurrent,&szCurrent, end);
     }
-    SkipSpacesAndLineEnd(szCurrent,&szCurrent);
+    SkipSpacesAndLineEnd(szCurrent,&szCurrent, end);
     *szCurrentOut = szCurrent;
 }
 // ------------------------------------------------------------------------------------------------
 // Parse the vertex animation section of the file
-void SMDImporter::ParseVASection(const char* szCurrent, const char** szCurrentOut) {
+void SMDImporter::ParseVASection(const char *szCurrent, const char **szCurrentOut, const char *end) {
     unsigned int iCurIndex = 0;
     for ( ;; ) {
-        if (!SkipSpacesAndLineEnd(szCurrent,&szCurrent)) {
+        if (!SkipSpacesAndLineEnd(szCurrent,&szCurrent, end)) {
             break;
         }
 
@@ -774,10 +777,10 @@ void SMDImporter::ParseVASection(const char* szCurrent, const char** szCurrentOu
             // NOTE: The doc says that time values COULD be negative ...
             // NOTE2: this is the shape key -> valve docs
             int iTime = 0;
-            if(!ParseSignedInt(szCurrent,&szCurrent,iTime) || configFrameID != (unsigned int)iTime) {
+            if (!ParseSignedInt(szCurrent, &szCurrent, end, iTime) || configFrameID != (unsigned int)iTime) {
                 break;
             }
-            SkipLine(szCurrent,&szCurrent);
+            SkipLine(szCurrent,&szCurrent, end);
         } else {
             if(0 == iCurIndex) {
                 asTriangles.emplace_back();
@@ -785,7 +788,7 @@ void SMDImporter::ParseVASection(const char* szCurrent, const char** szCurrentOu
             if (++iCurIndex == 3) {
                 iCurIndex = 0;
             }
-            ParseVertex(szCurrent,&szCurrent,asTriangles.back().avVertices[iCurIndex],true);
+            ParseVertex(szCurrent,&szCurrent, end, asTriangles.back().avVertices[iCurIndex],true);
         }
     }
 
@@ -794,16 +797,16 @@ void SMDImporter::ParseVASection(const char* szCurrent, const char** szCurrentOu
         asTriangles.pop_back();
     }
 
-    SkipSpacesAndLineEnd(szCurrent,&szCurrent);
+    SkipSpacesAndLineEnd(szCurrent,&szCurrent, end);
     *szCurrentOut = szCurrent;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Parse the skeleton section of the file
-void SMDImporter::ParseSkeletonSection(const char* szCurrent, const char** szCurrentOut) {
+void SMDImporter::ParseSkeletonSection(const char *szCurrent, const char **szCurrentOut, const char *end) {
     int iTime = 0;
     for ( ;; ) {
-        if (!SkipSpacesAndLineEnd(szCurrent,&szCurrent)) {
+        if (!SkipSpacesAndLineEnd(szCurrent,&szCurrent, end)) {
             break;
         }
 
@@ -811,15 +814,15 @@ void SMDImporter::ParseSkeletonSection(const char* szCurrent, const char** szCur
         if (TokenMatch(szCurrent,"end",3)) {
             break;
         } else if (TokenMatch(szCurrent,"time",4)) {
-        // "time <n>\n" - Specifies the current animation frame
-            if(!ParseSignedInt(szCurrent,&szCurrent,iTime)) {
+            // "time <n>\n" - Specifies the current animation frame
+            if (!ParseSignedInt(szCurrent, &szCurrent, end, iTime)) {
                 break;
             }
 
             iSmallestFrame = std::min(iSmallestFrame,iTime);
-            SkipLine(szCurrent,&szCurrent);
+            SkipLine(szCurrent, &szCurrent, end);
         } else {
-            ParseSkeletonElement(szCurrent,&szCurrent,iTime);
+            ParseSkeletonElement(szCurrent, &szCurrent, end, iTime);
         }
     }
     *szCurrentOut = szCurrent;
@@ -827,16 +830,16 @@ void SMDImporter::ParseSkeletonSection(const char* szCurrent, const char** szCur
 
 // ------------------------------------------------------------------------------------------------
 #define SMDI_PARSE_RETURN { \
-    SkipLine(szCurrent,&szCurrent); \
+    SkipLine(szCurrent,&szCurrent, end); \
     *szCurrentOut = szCurrent; \
     return; \
 }
 // ------------------------------------------------------------------------------------------------
 // Parse a node line
-void SMDImporter::ParseNodeInfo(const char* szCurrent, const char** szCurrentOut) {
+void SMDImporter::ParseNodeInfo(const char *szCurrent, const char **szCurrentOut, const char *end) {
     unsigned int iBone  = 0;
-    SkipSpacesAndLineEnd(szCurrent,&szCurrent);
-    if ( !ParseUnsignedInt(szCurrent,&szCurrent,iBone) || !SkipSpaces(szCurrent,&szCurrent)) {
+    SkipSpacesAndLineEnd(szCurrent, &szCurrent, end);
+    if ( !ParseUnsignedInt(szCurrent, &szCurrent, end, iBone) || !SkipSpaces(szCurrent,&szCurrent, end)) {
         throw DeadlyImportError("Unexpected EOF/EOL while parsing bone index");
     }
     if (iBone == UINT_MAX) {
@@ -877,7 +880,7 @@ void SMDImporter::ParseNodeInfo(const char* szCurrent, const char** szCurrentOut
     szCurrent = szEnd;
 
     // the only negative bone parent index that could occur is -1 AFAIK
-    if(!ParseSignedInt(szCurrent,&szCurrent,(int&)bone.iParent))  {
+    if(!ParseSignedInt(szCurrent, &szCurrent, end, (int&)bone.iParent))  {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing bone parent index. Assuming -1");
         SMDI_PARSE_RETURN;
     }
@@ -888,12 +891,12 @@ void SMDImporter::ParseNodeInfo(const char* szCurrent, const char** szCurrentOut
 
 // ------------------------------------------------------------------------------------------------
 // Parse a skeleton element
-void SMDImporter::ParseSkeletonElement(const char* szCurrent, const char** szCurrentOut,int iTime) {
+void SMDImporter::ParseSkeletonElement(const char *szCurrent, const char **szCurrentOut, const char *end, int iTime) {
     aiVector3D vPos;
     aiVector3D vRot;
 
     unsigned int iBone  = 0;
-    if(!ParseUnsignedInt(szCurrent,&szCurrent,iBone)) {
+    if (!ParseUnsignedInt(szCurrent, &szCurrent, end, iBone)) {
         ASSIMP_LOG_ERROR("Unexpected EOF/EOL while parsing bone index");
         SMDI_PARSE_RETURN;
     }
@@ -907,27 +910,27 @@ void SMDImporter::ParseSkeletonElement(const char* szCurrent, const char** szCur
     SMD::Bone::Animation::MatrixKey& key = bone.sAnim.asKeys.back();
 
     key.dTime = (double)iTime;
-    if(!ParseFloat(szCurrent,&szCurrent,(float&)vPos.x)) {
+    if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vPos.x)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing bone.pos.x");
         SMDI_PARSE_RETURN;
     }
-    if(!ParseFloat(szCurrent,&szCurrent,(float&)vPos.y)) {
+    if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vPos.y)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing bone.pos.y");
         SMDI_PARSE_RETURN;
     }
-    if(!ParseFloat(szCurrent,&szCurrent,(float&)vPos.z)) {
+    if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vPos.z)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing bone.pos.z");
         SMDI_PARSE_RETURN;
     }
-    if(!ParseFloat(szCurrent,&szCurrent,(float&)vRot.x)) {
+    if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vRot.x)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing bone.rot.x");
         SMDI_PARSE_RETURN;
     }
-    if(!ParseFloat(szCurrent,&szCurrent,(float&)vRot.y)) {
+    if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vRot.y)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing bone.rot.y");
         SMDI_PARSE_RETURN;
     }
-    if(!ParseFloat(szCurrent,&szCurrent,(float&)vRot.z)) {
+    if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vRot.z)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing bone.rot.z");
         SMDI_PARSE_RETURN;
     }
@@ -947,11 +950,11 @@ void SMDImporter::ParseSkeletonElement(const char* szCurrent, const char** szCur
 
 // ------------------------------------------------------------------------------------------------
 // Parse a triangle
-void SMDImporter::ParseTriangle(const char* szCurrent, const char** szCurrentOut) {
+void SMDImporter::ParseTriangle(const char *szCurrent, const char **szCurrentOut, const char *end) {
     asTriangles.emplace_back();
     SMD::Face& face = asTriangles.back();
 
-    if(!SkipSpaces(szCurrent,&szCurrent)) {
+    if(!SkipSpaces(szCurrent, &szCurrent, end)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing a triangle");
         return;
     }
@@ -963,19 +966,19 @@ void SMDImporter::ParseTriangle(const char* szCurrent, const char** szCurrentOut
     // ... and get the index that belongs to this file name
     face.iTexture = GetTextureIndex(std::string(szLast,(uintptr_t)szCurrent-(uintptr_t)szLast));
 
-    SkipSpacesAndLineEnd(szCurrent,&szCurrent);
+    SkipSpacesAndLineEnd(szCurrent, &szCurrent, end);
 
     // load three vertices
     for (auto &avVertex : face.avVertices) {
-        ParseVertex(szCurrent,&szCurrent, avVertex);
+        ParseVertex(szCurrent, &szCurrent, end, avVertex);
     }
     *szCurrentOut = szCurrent;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Parse a float
-bool SMDImporter::ParseFloat(const char* szCurrent, const char** szCurrentOut, float& out) {
-    if(!SkipSpaces(&szCurrent)) {
+bool SMDImporter::ParseFloat(const char *szCurrent, const char **szCurrentOut, const char *end, float &out) {
+    if (!SkipSpaces(&szCurrent, end)) {
         return false;
     }
 
@@ -985,8 +988,8 @@ bool SMDImporter::ParseFloat(const char* szCurrent, const char** szCurrentOut, f
 
 // ------------------------------------------------------------------------------------------------
 // Parse an unsigned int
-bool SMDImporter::ParseUnsignedInt(const char* szCurrent, const char** szCurrentOut, unsigned int& out) {
-    if(!SkipSpaces(&szCurrent)) {
+bool SMDImporter::ParseUnsignedInt(const char *szCurrent, const char **szCurrentOut, const char *end, unsigned int &out) {
+    if(!SkipSpaces(&szCurrent, end)) {
         return false;
     }
 
@@ -996,8 +999,8 @@ bool SMDImporter::ParseUnsignedInt(const char* szCurrent, const char** szCurrent
 
 // ------------------------------------------------------------------------------------------------
 // Parse a signed int
-bool SMDImporter::ParseSignedInt(const char* szCurrent, const char** szCurrentOut, int& out) {
-    if(!SkipSpaces(&szCurrent)) {
+bool SMDImporter::ParseSignedInt(const char *szCurrent, const char **szCurrentOut, const char *end, int &out) {
+    if(!SkipSpaces(&szCurrent, end)) {
         return false;
     }
 
@@ -1008,37 +1011,37 @@ bool SMDImporter::ParseSignedInt(const char* szCurrent, const char** szCurrentOu
 // ------------------------------------------------------------------------------------------------
 // Parse a vertex
 void SMDImporter::ParseVertex(const char* szCurrent,
-        const char** szCurrentOut, SMD::Vertex& vertex,
+        const char **szCurrentOut, const char *end, SMD::Vertex &vertex,
         bool bVASection /*= false*/) {
-    if (SkipSpaces(&szCurrent) && IsLineEnd(*szCurrent)) {
-        SkipSpacesAndLineEnd(szCurrent,&szCurrent);
-        return ParseVertex(szCurrent,szCurrentOut,vertex,bVASection);
+    if (SkipSpaces(&szCurrent, end) && IsLineEnd(*szCurrent)) {
+        SkipSpacesAndLineEnd(szCurrent,&szCurrent, end);
+        return ParseVertex(szCurrent, szCurrentOut, end, vertex, bVASection);
     }
-    if(!ParseSignedInt(szCurrent,&szCurrent,(int&)vertex.iParentNode)) {
+    if(!ParseSignedInt(szCurrent, &szCurrent, end, (int&)vertex.iParentNode)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.parent");
         SMDI_PARSE_RETURN;
     }
-    if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.pos.x)) {
+    if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vertex.pos.x)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.pos.x");
         SMDI_PARSE_RETURN;
     }
-    if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.pos.y)) {
+    if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vertex.pos.y)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.pos.y");
         SMDI_PARSE_RETURN;
     }
-    if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.pos.z)) {
+    if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vertex.pos.z)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.pos.z");
         SMDI_PARSE_RETURN;
     }
-    if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.nor.x)) {
+    if(!ParseFloat(szCurrent,&szCurrent,end, (float&)vertex.nor.x)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.nor.x");
         SMDI_PARSE_RETURN;
     }
-    if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.nor.y)) {
+    if(!ParseFloat(szCurrent,&szCurrent, end, (float&)vertex.nor.y)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.nor.y");
         SMDI_PARSE_RETURN;
     }
-    if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.nor.z)) {
+    if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vertex.nor.z)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.nor.z");
         SMDI_PARSE_RETURN;
     }
@@ -1047,11 +1050,11 @@ void SMDImporter::ParseVertex(const char* szCurrent,
         SMDI_PARSE_RETURN;
     }
 
-    if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.uv.x)) {
+    if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vertex.uv.x)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.uv.x");
         SMDI_PARSE_RETURN;
     }
-    if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.uv.y)) {
+    if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vertex.uv.y)) {
         LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.uv.y");
         SMDI_PARSE_RETURN;
     }
@@ -1059,16 +1062,16 @@ void SMDImporter::ParseVertex(const char* szCurrent,
     // now read the number of bones affecting this vertex
     // all elements from now are fully optional, we don't need them
     unsigned int iSize = 0;
-    if(!ParseUnsignedInt(szCurrent,&szCurrent,iSize)) {
+    if(!ParseUnsignedInt(szCurrent, &szCurrent, end, iSize)) {
         SMDI_PARSE_RETURN;
     }
     vertex.aiBoneLinks.resize(iSize,std::pair<unsigned int, float>(0,0.0f));
 
     for (auto &aiBoneLink : vertex.aiBoneLinks) {
-        if(!ParseUnsignedInt(szCurrent,&szCurrent,aiBoneLink.first)) {
+        if(!ParseUnsignedInt(szCurrent, &szCurrent, end, aiBoneLink.first)) {
             SMDI_PARSE_RETURN;
         }
-        if(!ParseFloat(szCurrent,&szCurrent,aiBoneLink.second)) {
+        if(!ParseFloat(szCurrent, &szCurrent, end, aiBoneLink.second)) {
             SMDI_PARSE_RETURN;
         }
     }
@@ -1077,6 +1080,6 @@ void SMDImporter::ParseVertex(const char* szCurrent,
     SMDI_PARSE_RETURN;
 }
 
-}
+} // namespace Assimp
 
 #endif // !! ASSIMP_BUILD_NO_SMD_IMPORTER
diff --git a/code/AssetLib/SMD/SMDLoader.h b/code/AssetLib/SMD/SMDLoader.h
index adf80ba14..667292371 100644
--- a/code/AssetLib/SMD/SMDLoader.h
+++ b/code/AssetLib/SMD/SMDLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -162,7 +162,7 @@ struct Bone {
 class ASSIMP_API SMDImporter : public BaseImporter {
 public:
     SMDImporter();
-    ~SMDImporter() override;
+    ~SMDImporter() override = default;
 
     // -------------------------------------------------------------------
     /** Returns whether the class can handle the format of the given file.
@@ -206,7 +206,7 @@ protected:
      * the next section (or to EOF)
     */
     void ParseTrianglesSection(const char* szCurrent,
-        const char** szCurrentOut);
+            const char **szCurrentOut, const char *end);
 
     // -------------------------------------------------------------------
     /** Parse the vertex animation section in VTA files
@@ -216,7 +216,7 @@ protected:
      * the next section (or to EOF)
     */
     void ParseVASection(const char* szCurrent,
-        const char** szCurrentOut);
+            const char **szCurrentOu, const char *end);
 
     // -------------------------------------------------------------------
     /** Parse the nodes section of the SMD file
@@ -226,7 +226,7 @@ protected:
      * the next section (or to EOF)
     */
     void ParseNodesSection(const char* szCurrent,
-        const char** szCurrentOut);
+            const char **szCurrentOut, const char *end);
 
     // -------------------------------------------------------------------
     /** Parse the skeleton section of the SMD file
@@ -236,7 +236,7 @@ protected:
      * the next section (or to EOF)
     */
     void ParseSkeletonSection(const char* szCurrent,
-        const char** szCurrentOut);
+            const char **szCurrentOut, const char *end);
 
     // -------------------------------------------------------------------
     /** Parse a single triangle in the SMD file
@@ -245,8 +245,7 @@ protected:
      * \param szCurrentOut Receives the output cursor position
     */
     void ParseTriangle(const char* szCurrent,
-        const char** szCurrentOut);
-
+            const char **szCurrentOut, const char *end);
 
     // -------------------------------------------------------------------
     /** Parse a single vertex in the SMD file
@@ -256,7 +255,7 @@ protected:
      * \param vertex Vertex to be filled
     */
     void ParseVertex(const char* szCurrent,
-        const char** szCurrentOut, SMD::Vertex& vertex,
+            const char **szCurrentOut, const char *end, SMD::Vertex &vertex,
         bool bVASection = false);
 
     // -------------------------------------------------------------------
@@ -271,32 +270,31 @@ protected:
     /** Parse a line in the skeleton section
      */
     void ParseSkeletonElement(const char* szCurrent,
-        const char** szCurrentOut,int iTime);
+            const char **szCurrentOut, const char *end, int iTime);
 
     // -------------------------------------------------------------------
     /** Parse a line in the nodes section
      */
     void ParseNodeInfo(const char* szCurrent,
-        const char** szCurrentOut);
-
+            const char **szCurrentOut, const char *end);
 
     // -------------------------------------------------------------------
     /** Parse a floating-point value
      */
     bool ParseFloat(const char* szCurrent,
-        const char** szCurrentOut, float& out);
+            const char **szCurrentOut, const char *end, float &out);
 
     // -------------------------------------------------------------------
     /** Parse an unsigned integer. There may be no sign!
      */
     bool ParseUnsignedInt(const char* szCurrent,
-        const char** szCurrentOut, unsigned int& out);
+            const char **szCurrentOut, const char *end, unsigned int &out);
 
     // -------------------------------------------------------------------
     /** Parse a signed integer. Signs (+,-) are handled.
      */
     bool ParseSignedInt(const char* szCurrent,
-        const char** szCurrentOut, int& out);
+            const char **szCurrentOut, const char *end, int &out);
 
     // -------------------------------------------------------------------
     /** Fix invalid time values in the file
@@ -304,7 +302,7 @@ protected:
     void FixTimeValues();
 
     // -------------------------------------------------------------------
-    /** Add all children of a bone as subnodes to a node
+    /** Add all children of a bone as sub-nodes to a node
      * \param pcNode Parent node
      * \param iParent Parent bone index
      */
@@ -329,17 +327,15 @@ protected:
 
 
     // -------------------------------------------------------------------
-    inline bool SkipLine( const char* in, const char** out)
-    {
-        Assimp::SkipLine(in,out);
+    inline bool SkipLine( const char* in, const char** out, const char *end) {
+        Assimp::SkipLine(in, out, end);
         ++iLineNumber;
         return true;
     }
     // -------------------------------------------------------------------
-    inline bool SkipSpacesAndLineEnd( const char* in, const char** out)
-    {
+    inline bool SkipSpacesAndLineEnd(const char *in, const char **out, const char *end) {
         ++iLineNumber;
-        return Assimp::SkipSpacesAndLineEnd(in,out);
+        return Assimp::SkipSpacesAndLineEnd(in, out, end);
     }
 
 private:
@@ -349,6 +345,7 @@ private:
 
     /** Buffer to hold the loaded file */
     std::vector<char> mBuffer;
+    char *mEnd;
 
     /** Output scene to be filled
     */
diff --git a/code/AssetLib/STEPParser/STEPFileEncoding.cpp b/code/AssetLib/STEPParser/STEPFileEncoding.cpp
index 92eb4f284..7508e90b2 100644
--- a/code/AssetLib/STEPParser/STEPFileEncoding.cpp
+++ b/code/AssetLib/STEPParser/STEPFileEncoding.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/STEPParser/STEPFileEncoding.h b/code/AssetLib/STEPParser/STEPFileEncoding.h
index 950c9b3e2..8148ce7b8 100644
--- a/code/AssetLib/STEPParser/STEPFileEncoding.h
+++ b/code/AssetLib/STEPParser/STEPFileEncoding.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/STEPParser/STEPFileReader.cpp b/code/AssetLib/STEPParser/STEPFileReader.cpp
index 2bcfa1755..d60caf744 100644
--- a/code/AssetLib/STEPParser/STEPFileReader.cpp
+++ b/code/AssetLib/STEPParser/STEPFileReader.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -40,9 +39,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-/** @file  STEPFileReader.cpp
+/**
+ * @file  STEPFileReader.cpp
  *  @brief Implementation of the STEP file parser, which fills a
- *     STEP::DB with data read from a file.
+ *         STEP::DB with data read from a file.
  */
 
 #include "STEPFileReader.h"
@@ -58,34 +58,28 @@ using namespace Assimp;
 namespace EXPRESS = STEP::EXPRESS;
 
 // ------------------------------------------------------------------------------------------------
-std::string AddLineNumber(const std::string& s,uint64_t line /*= LINE_NOT_SPECIFIED*/, const std::string& prefix = std::string())
-{
+std::string AddLineNumber(const std::string& s,uint64_t line /*= LINE_NOT_SPECIFIED*/, const std::string& prefix = std::string()) {
     return line == STEP::SyntaxError::LINE_NOT_SPECIFIED ? prefix+s : static_cast<std::string>( (Formatter::format(),prefix,"(line ",line,") ",s) );
 }
 
 // ------------------------------------------------------------------------------------------------
-std::string AddEntityID(const std::string& s,uint64_t entity /*= ENTITY_NOT_SPECIFIED*/, const std::string& prefix = std::string())
-{
+std::string AddEntityID(const std::string& s,uint64_t entity /*= ENTITY_NOT_SPECIFIED*/, const std::string& prefix = std::string()) {
     return entity == STEP::TypeError::ENTITY_NOT_SPECIFIED ? prefix+s : static_cast<std::string>( (Formatter::format(),prefix,"(entity #",entity,") ",s));
 }
 
 
 // ------------------------------------------------------------------------------------------------
-STEP::SyntaxError::SyntaxError (const std::string& s,uint64_t line /* = LINE_NOT_SPECIFIED */)
-: DeadlyImportError(AddLineNumber(s,line))
-{
-
+STEP::SyntaxError::SyntaxError (const std::string& s,uint64_t line) : DeadlyImportError(AddLineNumber(s,line)) {
+    // empty
 }
 
 // ------------------------------------------------------------------------------------------------
-STEP::TypeError::TypeError (const std::string& s,uint64_t entity /* = ENTITY_NOT_SPECIFIED */,uint64_t line /*= LINE_NOT_SPECIFIED*/)
-: DeadlyImportError(AddLineNumber(AddEntityID(s,entity),line))
-{
-
+STEP::TypeError::TypeError (const std::string& s,uint64_t entity, uint64_t line) : DeadlyImportError(AddLineNumber(AddEntityID(s,entity),line)) {
+    // empty
 }
 
-static const char *ISO_Token         = "ISO-10303-21;";
-static const char *FILE_SCHEMA_Token = "FILE_SCHEMA";
+static constexpr char ISO_Token[]         = "ISO-10303-21;";
+static constexpr char FILE_SCHEMA_Token[] = "FILE_SCHEMA";
 // ------------------------------------------------------------------------------------------------
 STEP::DB* STEP::ReadFileHeader(std::shared_ptr<IOStream> stream) {
     std::shared_ptr<StreamReaderLE> reader = std::shared_ptr<StreamReaderLE>(new StreamReaderLE(std::move(stream)));
@@ -110,8 +104,9 @@ STEP::DB* STEP::ReadFileHeader(std::shared_ptr<IOStream> stream) {
 
         if (s.substr(0,11) == FILE_SCHEMA_Token) {
             const char* sz = s.c_str()+11;
-            SkipSpaces(sz,&sz);
-            std::shared_ptr< const EXPRESS::DataType > schema = EXPRESS::DataType::Parse(sz);
+            const char *end = s.c_str() + s.size();
+            SkipSpaces(sz,&sz, end);
+            std::shared_ptr< const EXPRESS::DataType > schema = EXPRESS::DataType::Parse(sz, end);
 
             // the file schema should be a regular list entity, although it usually contains exactly one entry
             // since the list itself is contained in a regular parameter list, we actually have
@@ -304,10 +299,10 @@ void STEP::ReadFile(DB& db,const EXPRESS::ConversionSchema& scheme,
 }
 
 // ------------------------------------------------------------------------------------------------
-std::shared_ptr<const EXPRESS::DataType> EXPRESS::DataType::Parse(const char*& inout,uint64_t line, const EXPRESS::ConversionSchema* schema /*= nullptr*/)
+std::shared_ptr<const EXPRESS::DataType> EXPRESS::DataType::Parse(const char*& inout, const char *end, uint64_t line, const EXPRESS::ConversionSchema* schema /*= nullptr*/)
 {
     const char* cur = inout;
-    SkipSpaces(&cur);
+    SkipSpaces(&cur, end);
     if (*cur == ',' || IsSpaceOrNewLine(*cur)) {
         throw STEP::SyntaxError("unexpected token, expected parameter",line);
     }
@@ -325,7 +320,7 @@ std::shared_ptr<const EXPRESS::DataType> EXPRESS::DataType::Parse(const char*& i
                 std::transform(s.begin(),s.end(),s.begin(),&ai_tolower<char> );
                 if (schema->IsKnownToken(s)) {
                     for(cur = t+1;*cur++ != '(';);
-                    std::shared_ptr<const EXPRESS::DataType> dt = Parse(cur);
+                    std::shared_ptr<const EXPRESS::DataType> dt = Parse(cur, end);
                     inout = *cur ? cur+1 : cur;
                     return dt;
                 }
@@ -348,7 +343,7 @@ std::shared_ptr<const EXPRESS::DataType> EXPRESS::DataType::Parse(const char*& i
     else if (*cur == '(' ) {
         // start of an aggregate, further parsing is done by the LIST factory constructor
         inout = cur;
-        return EXPRESS::LIST::Parse(inout,line,schema);
+        return EXPRESS::LIST::Parse(inout, end, line, schema);
     }
     else if (*cur == '.' ) {
         // enum (includes boolean)
@@ -427,9 +422,10 @@ std::shared_ptr<const EXPRESS::DataType> EXPRESS::DataType::Parse(const char*& i
 }
 
 // ------------------------------------------------------------------------------------------------
-std::shared_ptr<const EXPRESS::LIST> EXPRESS::LIST::Parse(const char*& inout,uint64_t line, const EXPRESS::ConversionSchema* schema /*= nullptr*/) {
+std::shared_ptr<const EXPRESS::LIST> EXPRESS::LIST::Parse(const char*& inout, const char *end,
+        uint64_t line, const EXPRESS::ConversionSchema* schema) {
     const std::shared_ptr<EXPRESS::LIST> list = std::make_shared<EXPRESS::LIST>();
-    EXPRESS::LIST::MemberList& members = list->members;
+    EXPRESS::LIST::MemberList& cur_members = list->members;
 
     const char* cur = inout;
     if (*cur++ != '(') {
@@ -442,19 +438,19 @@ std::shared_ptr<const EXPRESS::LIST> EXPRESS::LIST::Parse(const char*& inout,uin
         count += (*c == ',' ? 1 : 0);
     }
 
-    members.reserve(count);
+    cur_members.reserve(count);
 
     for(;;++cur) {
         if (!*cur) {
             throw STEP::SyntaxError("unexpected end of line while reading list");
         }
-        SkipSpaces(cur,&cur);
+        SkipSpaces(cur,&cur, end);
         if (*cur == ')') {
             break;
         }
 
-        members.push_back( EXPRESS::DataType::Parse(cur,line,schema));
-        SkipSpaces(cur,&cur);
+        cur_members.push_back(EXPRESS::DataType::Parse(cur, end, line, schema));
+        SkipSpaces(cur, &cur, end);
 
         if (*cur != ',') {
             if (*cur == ')') {
@@ -464,7 +460,7 @@ std::shared_ptr<const EXPRESS::LIST> EXPRESS::LIST::Parse(const char*& inout,uin
         }
     }
 
-    inout = cur+1;
+    inout = cur + 1;
     return list;
 }
 
@@ -503,21 +499,13 @@ STEP::LazyObject::LazyObject(DB& db, uint64_t id,uint64_t /*line*/, const char*
     int64_t skip_depth( 0 );
     while ( *a ) {
         handleSkippedDepthFromToken(a, skip_depth);
-        /*if (*a == '(') {
-            ++skip_depth;
-        } else if (*a == ')') {
-            --skip_depth;
-        }*/
 
-		if (skip_depth >= 1 && *a=='#') {
-			if (*(a + 1) != '#') {
-				/*const char *tmp;
-				const int64_t num = static_cast<int64_t>(strtoul10_64(a + 1, &tmp));
-				db.MarkRef(num, id);*/
-                db.MarkRef(getIdFromToken(a), id);
-			} else {
-				++a;
-			}
+	if (skip_depth >= 1 && *a=='#') {
+		if (*(a + 1) != '#') {
+			db.MarkRef(getIdFromToken(a), id);
+		} else {
+			++a;
+		}
         }
         ++a;
     }
@@ -543,7 +531,8 @@ void STEP::LazyObject::LazyInit() const {
     }
 
     const char* acopy = args;
-    std::shared_ptr<const EXPRESS::LIST> conv_args = EXPRESS::LIST::Parse(acopy,(uint64_t)STEP::SyntaxError::LINE_NOT_SPECIFIED,&db.GetSchema());
+    const char *end = acopy + std::strlen(args);
+    std::shared_ptr<const EXPRESS::LIST> conv_args = EXPRESS::LIST::Parse(acopy, end, (uint64_t)STEP::SyntaxError::LINE_NOT_SPECIFIED,&db.GetSchema());
     delete[] args;
     args = nullptr;
 
diff --git a/code/AssetLib/STEPParser/STEPFileReader.h b/code/AssetLib/STEPParser/STEPFileReader.h
index 8a57937c0..7e6be636a 100644
--- a/code/AssetLib/STEPParser/STEPFileReader.h
+++ b/code/AssetLib/STEPParser/STEPFileReader.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -60,8 +59,7 @@ void ReadFile(DB& db,const EXPRESS::ConversionSchema& scheme, const char* const*
 
 /// @brief  Helper to read a file.
 template <size_t N, size_t N2>
-inline
-void ReadFile(DB& db,const EXPRESS::ConversionSchema& scheme, const char* const (&arr)[N], const char* const (&arr2)[N2]) {
+inline void ReadFile(DB& db,const EXPRESS::ConversionSchema& scheme, const char* const (&arr)[N], const char* const (&arr2)[N2]) {
     return ReadFile(db,scheme,arr,N,arr2,N2);
 }
 
diff --git a/code/AssetLib/STL/STLExporter.cpp b/code/AssetLib/STL/STLExporter.cpp
index 9bbc2063f..b0361cf94 100644
--- a/code/AssetLib/STL/STLExporter.cpp
+++ b/code/AssetLib/STL/STLExporter.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -39,9 +38,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ----------------------------------------------------------------------
 */
-
-
-
 #if !defined(ASSIMP_BUILD_NO_EXPORT) && !defined(ASSIMP_BUILD_NO_STL_EXPORTER)
 
 #include "STLExporter.h"
@@ -55,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using namespace Assimp;
 
-namespace Assimp    {
+namespace Assimp {
 
 // ------------------------------------------------------------------------------------------------
 // Worker function for exporting a scene to Stereolithograpy. Prototyped and registered in Exporter.cpp
@@ -78,6 +74,7 @@ void ExportSceneSTL(const char* pFile,IOSystem* pIOSystem, const aiScene* pScene
 
     outfile->Write( exporter.mOutput.str().c_str(), static_cast<size_t>(exporter.mOutput.tellp()),1);
 }
+
 void ExportSceneSTLBinary(const char* pFile,IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* pProperties )
 {
     bool exportPointClouds = pProperties->GetPropertyBool(AI_CONFIG_EXPORT_POINT_CLOUDS);
@@ -100,13 +97,11 @@ void ExportSceneSTLBinary(const char* pFile,IOSystem* pIOSystem, const aiScene*
 
 } // end of namespace Assimp
 
-static const char *SolidToken = "solid";
-static const char *EndSolidToken = "endsolid";
+static constexpr char SolidToken[]    = "solid";
+static constexpr char EndSolidToken[] = "endsolid";
 
 // ------------------------------------------------------------------------------------------------
-STLExporter::STLExporter(const char* _filename, const aiScene* pScene, bool exportPointClouds, bool binary)
-: filename(_filename)
-, endl("\n")
+STLExporter::STLExporter(const char* _filename, const aiScene* pScene, bool exportPointClouds, bool binary) : filename(_filename) , endl("\n")
 {
     // make sure that all formatting happens using the standard, C locale and not the user's current locale
     const std::locale& l = std::locale("C");
@@ -173,24 +168,26 @@ void STLExporter::WritePointCloud(const std::string &name, const aiScene* pScene
 }
 
 // ------------------------------------------------------------------------------------------------
-void STLExporter::WriteMesh(const aiMesh* m)
-{
+void STLExporter::WriteMesh(const aiMesh* m) {
     for (unsigned int i = 0; i < m->mNumFaces; ++i) {
         const aiFace& f = m->mFaces[i];
+        if (f.mNumIndices < 3) {
+            continue;
+        }
 
         // we need per-face normals. We specified aiProcess_GenNormals as pre-requisite for this exporter,
         // but nonetheless we have to expect per-vertex normals.
         aiVector3D nor;
         if (m->mNormals) {
-            for(unsigned int a = 0; a < f.mNumIndices; ++a) {
+            for (unsigned int a = 0; a < f.mNumIndices; ++a) {
                 nor += m->mNormals[f.mIndices[a]];
             }
             nor.NormalizeSafe();
         }
         mOutput << " facet normal " << nor.x << " " << nor.y << " " << nor.z << endl;
         mOutput << "  outer loop" << endl;
-        for(unsigned int a = 0; a < f.mNumIndices; ++a) {
-            const aiVector3D& v  = m->mVertices[f.mIndices[a]];
+        for (unsigned int a = 0; a < f.mNumIndices; ++a) {
+            const aiVector3D &v = m->mVertices[f.mIndices[a]];
             mOutput << "  vertex " << v.x << " " << v.y << " " << v.z << endl;
         }
 
@@ -199,10 +196,13 @@ void STLExporter::WriteMesh(const aiMesh* m)
     }
 }
 
-void STLExporter::WriteMeshBinary(const aiMesh* m)
-{
+void STLExporter::WriteMeshBinary(const aiMesh* m) {
     for (unsigned int i = 0; i < m->mNumFaces; ++i) {
         const aiFace& f = m->mFaces[i];
+        if (f.mNumIndices < 3) {
+            continue;
+        }
+
         // we need per-face normals. We specified aiProcess_GenNormals as pre-requisite for this exporter,
         // but nonetheless we have to expect per-vertex normals.
         aiVector3D nor;
diff --git a/code/AssetLib/STL/STLExporter.h b/code/AssetLib/STL/STLExporter.h
index 066dcfefd..267539382 100644
--- a/code/AssetLib/STL/STLExporter.h
+++ b/code/AssetLib/STL/STLExporter.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/STL/STLLoader.cpp b/code/AssetLib/STL/STLLoader.cpp
index 269ee1467..37ac6a27b 100644
--- a/code/AssetLib/STL/STLLoader.cpp
+++ b/code/AssetLib/STL/STLLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -98,7 +98,7 @@ static bool IsAsciiSTL(const char *buffer, size_t fileSize) {
 
     const char *bufferEnd = buffer + fileSize;
 
-    if (!SkipSpaces(&buffer)) {
+    if (!SkipSpaces(&buffer, bufferEnd)) {
         return false;
     }
 
@@ -181,7 +181,7 @@ void STLImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     mBuffer = &buffer2[0];
 
     // the default vertex color is light gray.
-    mClrColorDefault.r = mClrColorDefault.g = mClrColorDefault.b = mClrColorDefault.a = (ai_real)0.6;
+    mClrColorDefault.r = mClrColorDefault.g = mClrColorDefault.b = mClrColorDefault.a = 0.6f;
 
     // allocate a single node
     mScene->mRootNode = new aiNode();
@@ -209,7 +209,7 @@ void STLImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     }
     pcMat->AddProperty(&clrDiffuse, 1, AI_MATKEY_COLOR_DIFFUSE);
     pcMat->AddProperty(&clrDiffuse, 1, AI_MATKEY_COLOR_SPECULAR);
-    clrDiffuse = aiColor4D(ai_real(0.05), ai_real(0.05), ai_real(0.05), ai_real(1.0));
+    clrDiffuse = aiColor4D(0.05f, 0.05f, 0.05f, 1.0f);
     pcMat->AddProperty(&clrDiffuse, 1, AI_MATKEY_COLOR_AMBIENT);
 
     mScene->mNumMaterials = 1;
@@ -244,11 +244,11 @@ void STLImporter::LoadASCIIFile(aiNode *root) {
         aiNode *node = new aiNode;
         node->mParent = root;
         nodes.push_back(node);
-        SkipSpaces(&sz);
+        SkipSpaces(&sz, bufferEnd);
         ai_assert(!IsLineEnd(sz));
 
         sz += 5; // skip the "solid"
-        SkipSpaces(&sz);
+        SkipSpaces(&sz, bufferEnd);
         const char *szMe = sz;
         while (!IsSpaceOrNewLine(*sz)) {
             sz++;
@@ -257,7 +257,7 @@ void STLImporter::LoadASCIIFile(aiNode *root) {
         size_t temp = (size_t)(sz - szMe);
         // setup the name of the node
         if (temp) {
-            if (temp >= MAXLEN) {
+            if (temp >= AI_MAXLEN) {
                 throw DeadlyImportError("STL: Node name too long");
             }
             std::string name(szMe, temp);
@@ -270,7 +270,7 @@ void STLImporter::LoadASCIIFile(aiNode *root) {
         unsigned int faceVertexCounter = 3;
         for (;;) {
             // go to the next token
-            if (!SkipSpacesAndLineEnd(&sz)) {
+            if (!SkipSpacesAndLineEnd(&sz, bufferEnd)) {
                 // seems we're finished although there was no end marker
                 ASSIMP_LOG_WARN("STL: unexpected EOF. \'endsolid\' keyword was expected");
                 break;
@@ -284,7 +284,7 @@ void STLImporter::LoadASCIIFile(aiNode *root) {
                 faceVertexCounter = 0;
 
                 sz += 6;
-                SkipSpaces(&sz);
+                SkipSpaces(&sz, bufferEnd);
                 if (strncmp(sz, "normal", 6)) {
                     ASSIMP_LOG_WARN("STL: a facet normal vector was expected but not found");
                 } else {
@@ -293,11 +293,11 @@ void STLImporter::LoadASCIIFile(aiNode *root) {
                     }
                     aiVector3D vn;
                     sz += 7;
-                    SkipSpaces(&sz);
+                    SkipSpaces(&sz, bufferEnd);
                     sz = fast_atoreal_move<ai_real>(sz, (ai_real &)vn.x);
-                    SkipSpaces(&sz);
+                    SkipSpaces(&sz, bufferEnd);
                     sz = fast_atoreal_move<ai_real>(sz, (ai_real &)vn.y);
-                    SkipSpaces(&sz);
+                    SkipSpaces(&sz, bufferEnd);
                     sz = fast_atoreal_move<ai_real>(sz, (ai_real &)vn.z);
                     normalBuffer.emplace_back(vn);
                     normalBuffer.emplace_back(vn);
@@ -312,13 +312,13 @@ void STLImporter::LoadASCIIFile(aiNode *root) {
                         throw DeadlyImportError("STL: unexpected EOF while parsing facet");
                     }
                     sz += 7;
-                    SkipSpaces(&sz);
+                    SkipSpaces(&sz, bufferEnd);
                     positionBuffer.emplace_back();
                     aiVector3D *vn = &positionBuffer.back();
                     sz = fast_atoreal_move<ai_real>(sz, (ai_real &)vn->x);
-                    SkipSpaces(&sz);
+                    SkipSpaces(&sz, bufferEnd);
                     sz = fast_atoreal_move<ai_real>(sz, (ai_real &)vn->y);
-                    SkipSpaces(&sz);
+                    SkipSpaces(&sz, bufferEnd);
                     sz = fast_atoreal_move<ai_real>(sz, (ai_real &)vn->z);
                     faceVertexCounter++;
                 }
@@ -326,7 +326,7 @@ void STLImporter::LoadASCIIFile(aiNode *root) {
                 do {
                     ++sz;
                 } while (!IsLineEnd(*sz));
-                SkipSpacesAndLineEnd(&sz);
+                SkipSpacesAndLineEnd(&sz, bufferEnd);
                 // finished!
                 break;
             } else { // else skip the whole identifier
diff --git a/code/AssetLib/STL/STLLoader.h b/code/AssetLib/STL/STLLoader.h
index 0be6a95f0..279050fec 100644
--- a/code/AssetLib/STL/STLLoader.h
+++ b/code/AssetLib/STL/STLLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Step/STEPFile.h b/code/AssetLib/Step/STEPFile.h
index 76a9370f5..cf6a0736d 100644
--- a/code/AssetLib/Step/STEPFile.h
+++ b/code/AssetLib/Step/STEPFile.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -82,8 +82,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // this is intended as stress test - by default, entities are evaluated
 // lazily and therefore not unless needed.
 
-//#define ASSIMP_IFC_TEST
-
 namespace Assimp {
 
 // ********************************************************************************
@@ -199,35 +197,27 @@ public:
     }
 
 public:
-    /** parse a variable from a string and set 'inout' to the character
-     *  behind the last consumed character. An optional schema enables,
-     *  if specified, automatic conversion of custom data types.
-     *
-     *  @throw SyntaxError
-     */
-    static std::shared_ptr<const EXPRESS::DataType> Parse(const char *&inout,
-            uint64_t line = SyntaxError::LINE_NOT_SPECIFIED,
-            const EXPRESS::ConversionSchema *schema = nullptr);
+    /// @brief Parse a variable from a string and set 'inout' to the character behind the last consumed character.
+    ///
+    ///  An optional schema enables, if specified, automatic conversion of custom data types.
+    ///
+    /// @throw SyntaxError
+    static std::shared_ptr<const EXPRESS::DataType> Parse(const char *&inout, const char *end,
+            uint64_t line = SyntaxError::LINE_NOT_SPECIFIED, const EXPRESS::ConversionSchema *schema = nullptr);
 };
 
 typedef DataType SELECT;
 typedef DataType LOGICAL;
 
 // -------------------------------------------------------------------------------
-/** Sentinel class to represent explicitly unset (optional) fields ($) */
+/// Sentinel class to represent explicitly unset (optional) fields ($)
 // -------------------------------------------------------------------------------
-class UNSET : public DataType {
-public:
-private:
-};
+class UNSET : public DataType {};
 
 // -------------------------------------------------------------------------------
-/** Sentinel class to represent explicitly derived fields (*) */
+/// Sentinel class to represent explicitly derived fields (*)
 // -------------------------------------------------------------------------------
-class ISDERIVED : public DataType {
-public:
-private:
-};
+class ISDERIVED : public DataType {};
 
 // -------------------------------------------------------------------------------
 /** Shared implementation for some of the primitive data type, i.e. int, float
@@ -304,7 +294,7 @@ public:
 public:
     /** @see DaraType::Parse
      */
-    static std::shared_ptr<const EXPRESS::LIST> Parse(const char *&inout,
+    static std::shared_ptr<const EXPRESS::LIST> Parse(const char *&inout, const char *end,
             uint64_t line = SyntaxError::LINE_NOT_SPECIFIED,
             const EXPRESS::ConversionSchema *schema = nullptr);
 
@@ -589,12 +579,12 @@ private:
 };
 
 template <typename T>
-inline bool operator==(const std::shared_ptr<LazyObject> &lo, T whatever) {
+inline bool operator == (const std::shared_ptr<LazyObject> &lo, T whatever) {
     return *lo == whatever; // XXX use std::forward if we have 0x
 }
 
 template <typename T>
-inline bool operator==(const std::pair<uint64_t, std::shared_ptr<LazyObject>> &lo, T whatever) {
+inline bool operator == (const std::pair<uint64_t, std::shared_ptr<LazyObject>> &lo, T whatever) {
     return *(lo.second) == whatever; // XXX use std::forward if we have 0x
 }
 
@@ -607,18 +597,30 @@ struct Lazy {
     Lazy(const LazyObject *obj = nullptr) : obj(obj) {}
 
     operator const T *() const {
+        if (obj == nullptr) {
+            throw TypeError("Obj type is nullptr.");
+        }
         return obj->ToPtr<T>();
     }
 
     operator const T &() const {
+        if (obj == nullptr) {
+            throw TypeError("Obj type is nullptr.");
+        }
         return obj->To<T>();
     }
 
     const T &operator*() const {
+        if (obj == nullptr) {
+            throw TypeError("Obj type is nullptr.");
+        }
         return obj->To<T>();
     }
 
     const T *operator->() const {
+        if (obj == nullptr) {
+            throw TypeError("Obj type is nullptr.");
+        }
         return &obj->To<T>();
     }
 
diff --git a/code/AssetLib/Step/StepExporter.cpp b/code/AssetLib/Step/StepExporter.cpp
index e13c9edab..1e5de037b 100644
--- a/code/AssetLib/Step/StepExporter.cpp
+++ b/code/AssetLib/Step/StepExporter.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -37,11 +36,9 @@ 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.
 
-@author: Richard Steffen, 2015
 ----------------------------------------------------------------------
 */
 
-
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_STEP_EXPORTER
 
diff --git a/code/AssetLib/Step/StepExporter.h b/code/AssetLib/Step/StepExporter.h
index a02262659..4bc614b8e 100644
--- a/code/AssetLib/Step/StepExporter.h
+++ b/code/AssetLib/Step/StepExporter.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Terragen/TerragenLoader.cpp b/code/AssetLib/Terragen/TerragenLoader.cpp
index b1870414c..a9de4017c 100644
--- a/code/AssetLib/Terragen/TerragenLoader.cpp
+++ b/code/AssetLib/Terragen/TerragenLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/Terragen/TerragenLoader.h b/code/AssetLib/Terragen/TerragenLoader.h
index 0c7b686e9..0e0f7fd96 100644
--- a/code/AssetLib/Terragen/TerragenLoader.h
+++ b/code/AssetLib/Terragen/TerragenLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/USD/USDLoader.cpp b/code/AssetLib/USD/USDLoader.cpp
new file mode 100644
index 000000000..2cbed62ce
--- /dev/null
+++ b/code/AssetLib/USD/USDLoader.cpp
@@ -0,0 +1,124 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software 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 the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+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.
+----------------------------------------------------------------------
+*/
+
+/** @file  USDLoader.cpp
+ *  @brief Implementation of the USD importer class
+ */
+
+#ifndef ASSIMP_BUILD_NO_USD_IMPORTER
+#include <memory>
+
+// internal headers
+#include <assimp/ai_assert.h>
+#include <assimp/anim.h>
+#include <assimp/DefaultIOSystem.h>
+#include <assimp/DefaultLogger.hpp>
+#include <assimp/fast_atof.h>
+#include <assimp/Importer.hpp>
+#include <assimp/importerdesc.h>
+#include <assimp/IOStreamBuffer.h>
+#include <assimp/IOSystem.hpp>
+#include <assimp/scene.h>
+#include <assimp/StringUtils.h>
+#include <assimp/StreamReader.h>
+
+#include "USDLoader.h"
+#include "USDLoaderUtil.h"
+#include "USDPreprocessor.h"
+
+static constexpr aiImporterDesc desc = {
+    "USD Object Importer",
+    "",
+    "",
+    "https://en.wikipedia.org/wiki/Universal_Scene_Description/",
+    aiImporterFlags_SupportTextFlavour | aiImporterFlags_SupportBinaryFlavour,
+    0,
+    0,
+    0,
+    0,
+    "usd usda usdc usdz"
+};
+
+namespace Assimp {
+using namespace std;
+
+// Constructor to be privately used by Importer
+USDImporter::USDImporter() :
+    impl(USDImporterImplTinyusdz()) {
+}
+
+// ------------------------------------------------------------------------------------------------
+
+bool USDImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool) const {
+    // Based on token
+    static constexpr uint32_t usdcTokens[] = { AI_MAKE_MAGIC("PXR-USDC") };
+    bool canRead = CheckMagicToken(pIOHandler, pFile, usdcTokens, AI_COUNT_OF(usdcTokens));
+    if (canRead) {
+        return canRead;
+    }
+
+    // Based on extension
+    // TODO: confirm OK to replace this w/SimpleExtensionCheck() below
+    canRead = isUsd(pFile) || isUsda(pFile) || isUsdc(pFile) || isUsdz(pFile);
+    if (canRead) {
+        return canRead;
+    }
+    canRead = SimpleExtensionCheck(pFile, "usd", "usda", "usdc", "usdz");
+    return canRead;
+}
+
+const aiImporterDesc *USDImporter::GetInfo() const {
+    return &desc;
+}
+
+void USDImporter::InternReadFile(
+        const std::string &pFile,
+        aiScene *pScene,
+        IOSystem *pIOHandler) {
+    impl.InternReadFile(
+            pFile,
+            pScene,
+            pIOHandler);
+}
+
+} // namespace Assimp
+
+#endif // !! ASSIMP_BUILD_NO_USD_IMPORTER
+
diff --git a/code/AssetLib/USD/USDLoader.h b/code/AssetLib/USD/USDLoader.h
new file mode 100644
index 000000000..213336064
--- /dev/null
+++ b/code/AssetLib/USD/USDLoader.h
@@ -0,0 +1,78 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software 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 the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+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.
+----------------------------------------------------------------------
+*/
+
+/** @file  USDLoader.h
+ *  @brief Declaration of the USD importer class.
+ */
+#pragma once
+#ifndef AI_USDLOADER_H_INCLUDED
+#define AI_USDLOADER_H_INCLUDED
+
+#include <assimp/BaseImporter.h>
+#include <assimp/types.h>
+#include <vector>
+#include <cstdint>
+
+#include "USDLoaderImplTinyusdz.h"
+
+namespace Assimp {
+class USDImporter : public BaseImporter {
+public:
+    USDImporter();
+    ~USDImporter() override = default;
+
+    /// \brief  Returns whether the class can handle the format of the given file.
+    /// \remark See BaseImporter::CanRead() for details.
+    bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const override;
+
+protected:
+    //! \brief  Appends the supported extension.
+    const aiImporterDesc *GetInfo() const override;
+
+    void InternReadFile(
+            const std::string &pFile,
+            aiScene *pScene,
+            IOSystem *pIOHandler) override;
+private:
+    USDImporterImplTinyusdz impl;
+};
+
+} // namespace Assimp
+#endif // AI_USDLOADER_H_INCLUDED
diff --git a/code/AssetLib/USD/USDLoaderImplTinyusdz.cpp b/code/AssetLib/USD/USDLoaderImplTinyusdz.cpp
new file mode 100644
index 000000000..31c2463d7
--- /dev/null
+++ b/code/AssetLib/USD/USDLoaderImplTinyusdz.cpp
@@ -0,0 +1,971 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software 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 the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+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.
+
+----------------------------------------------------------------------
+*/
+
+/** @file  USDLoader.cpp
+ *  @brief Implementation of the USD importer class
+ */
+
+#ifndef ASSIMP_BUILD_NO_USD_IMPORTER
+#include <memory>
+#include <sstream>
+
+// internal headers
+#include <assimp/ai_assert.h>
+#include <assimp/anim.h>
+#include <assimp/CreateAnimMesh.h>
+#include <assimp/DefaultIOSystem.h>
+#include <assimp/DefaultLogger.hpp>
+#include <assimp/fast_atof.h>
+#include <assimp/Importer.hpp>
+#include <assimp/importerdesc.h>
+#include <assimp/IOStreamBuffer.h>
+#include <assimp/IOSystem.hpp>
+#include "assimp/MemoryIOWrapper.h"
+#include <assimp/StringUtils.h>
+#include <assimp/StreamReader.h>
+
+#include "io-util.hh" // namespace tinyusdz::io
+#include "tydra/scene-access.hh"
+#include "tydra/shader-network.hh"
+#include "USDLoaderImplTinyusdzHelper.h"
+#include "USDLoaderImplTinyusdz.h"
+#include "USDLoaderUtil.h"
+#include "USDPreprocessor.h"
+
+#include "../../../contrib/tinyusdz/assimp_tinyusdz_logging.inc"
+
+namespace {
+    static constexpr char TAG[] = "tinyusdz loader";
+}
+
+namespace Assimp {
+using namespace std;
+
+void USDImporterImplTinyusdz::InternReadFile(
+        const std::string &pFile,
+        aiScene *pScene,
+        IOSystem *pIOHandler) {
+    // Grab filename for logging purposes
+    size_t pos = pFile.find_last_of('/');
+    string basePath = pFile.substr(0, pos);
+    string nameWExt = pFile.substr(pos + 1);
+    stringstream ss;
+    ss.str("");
+    ss << "InternReadFile(): model" << nameWExt;
+    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+
+    bool is_load_from_mem{ pFile.substr(0, AI_MEMORYIO_MAGIC_FILENAME_LENGTH) == AI_MEMORYIO_MAGIC_FILENAME };
+    std::vector<uint8_t> in_mem_data;
+    if (is_load_from_mem) {
+        auto stream_closer = [pIOHandler](IOStream *pStream) {
+            pIOHandler->Close(pStream);
+        };
+        std::unique_ptr<IOStream, decltype(stream_closer)> file_stream(pIOHandler->Open(pFile, "rb"), stream_closer);
+        if (!file_stream) {
+            throw DeadlyImportError("Failed to open file ", pFile, ".");
+        }
+        size_t file_size{ file_stream->FileSize() };
+        in_mem_data.resize(file_size);
+        file_stream->Read(in_mem_data.data(), 1, file_size);
+    }
+
+    bool ret{ false };
+    tinyusdz::USDLoadOptions options;
+    tinyusdz::Stage stage;
+    std::string warn, err;
+    bool is_usdz{ false };
+    if (isUsdc(pFile)) {
+        ret = is_load_from_mem ? LoadUSDCFromMemory(in_mem_data.data(), in_mem_data.size(), pFile, &stage, &warn, &err, options) :
+                                 LoadUSDCFromFile(pFile, &stage, &warn, &err, options);
+        ss.str("");
+        ss << "InternReadFile(): LoadUSDCFromFile() result: " << ret;
+        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+    } else if (isUsda(pFile)) {
+        ret = is_load_from_mem ? LoadUSDAFromMemory(in_mem_data.data(), in_mem_data.size(), pFile, &stage, &warn, &err, options) :
+                                 LoadUSDAFromFile(pFile, &stage, &warn, &err, options);
+        ss.str("");
+        ss << "InternReadFile(): LoadUSDAFromFile() result: " << ret;
+        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+    } else if (isUsdz(pFile)) {
+        ret = is_load_from_mem ? LoadUSDZFromMemory(in_mem_data.data(), in_mem_data.size(), pFile, &stage, &warn, &err, options) :
+                                 LoadUSDZFromFile(pFile, &stage, &warn, &err, options);
+        is_usdz = true;
+        ss.str("");
+        ss << "InternReadFile(): LoadUSDZFromFile() result: " << ret;
+        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+    } else if (isUsd(pFile)) {
+        ret = is_load_from_mem ? LoadUSDFromMemory(in_mem_data.data(), in_mem_data.size(), pFile, &stage, &warn, &err, options) :
+                                 LoadUSDFromFile(pFile, &stage, &warn, &err, options);
+        ss.str("");
+        ss << "InternReadFile(): LoadUSDFromFile() result: " << ret;
+        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+    }
+    if (warn.empty() && err.empty()) {
+        ss.str("");
+        ss << "InternReadFile(): load free of warnings/errors";
+        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+    } else {
+        if (!warn.empty()) {
+            ss.str("");
+            ss << "InternReadFile(): WARNING reported: " << warn;
+            TINYUSDZLOGW(TAG, "%s", ss.str().c_str());
+        }
+        if (!err.empty()) {
+            ss.str("");
+            ss << "InternReadFile(): ERROR reported: " << err;
+            TINYUSDZLOGE(TAG, "%s", ss.str().c_str());
+        }
+    }
+    if (!ret) {
+        ss.str("");
+        ss << "InternReadFile(): ERROR: load failed! ret: " << ret;
+        TINYUSDZLOGE(TAG, "%s", ss.str().c_str());
+        return;
+    }
+    tinyusdz::tydra::RenderScene render_scene;
+    tinyusdz::tydra::RenderSceneConverter converter;
+    tinyusdz::tydra::RenderSceneConverterEnv env(stage);
+    std::string usd_basedir = tinyusdz::io::GetBaseDir(pFile);
+    env.set_search_paths({ usd_basedir }); // {} needed to convert to vector of char
+
+    // NOTE: Pointer address of usdz_asset must be valid until the call of RenderSceneConverter::ConvertToRenderScene.
+    tinyusdz::USDZAsset usdz_asset;
+    if (is_usdz) {
+        bool is_read_USDZ_asset = is_load_from_mem ? tinyusdz::ReadUSDZAssetInfoFromMemory(in_mem_data.data(), in_mem_data.size(), false, &usdz_asset, &warn, &err) :
+                                                     tinyusdz::ReadUSDZAssetInfoFromFile(pFile, &usdz_asset, &warn, &err);
+        if (!is_read_USDZ_asset) {
+            if (!warn.empty()) {
+                ss.str("");
+                ss << "InternReadFile(): ReadUSDZAssetInfoFromFile: WARNING reported: " << warn;
+                TINYUSDZLOGW(TAG, "%s", ss.str().c_str());
+            }
+            if (!err.empty()) {
+                ss.str("");
+                ss << "InternReadFile(): ReadUSDZAssetInfoFromFile: ERROR reported: " << err;
+                TINYUSDZLOGE(TAG, "%s", ss.str().c_str());
+            }
+            ss.str("");
+            ss << "InternReadFile(): ReadUSDZAssetInfoFromFile: ERROR!";
+            TINYUSDZLOGE(TAG, "%s", ss.str().c_str());
+        } else {
+            ss.str("");
+            ss << "InternReadFile(): ReadUSDZAssetInfoFromFile: OK";
+            TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+        }
+
+        tinyusdz::AssetResolutionResolver arr;
+        if (!tinyusdz::SetupUSDZAssetResolution(arr, &usdz_asset)) {
+            ss.str("");
+            ss << "InternReadFile(): SetupUSDZAssetResolution: ERROR: load failed! ret: " << ret;
+            TINYUSDZLOGE(TAG, "%s", ss.str().c_str());
+        } else {
+            ss.str("");
+            ss << "InternReadFile(): SetupUSDZAssetResolution: OK";
+            TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+            env.asset_resolver = arr;
+        }
+    }
+
+    ret = converter.ConvertToRenderScene(env, &render_scene);
+    if (!ret) {
+        ss.str("");
+        ss << "InternReadFile(): ConvertToRenderScene() failed!";
+        TINYUSDZLOGE(TAG, "%s", ss.str().c_str());
+        return;
+    }
+
+    // sanityCheckNodesRecursive(pScene->mRootNode);
+    animations(render_scene, pScene);
+    meshes(render_scene, pScene, nameWExt);
+    materials(render_scene, pScene, nameWExt);
+    textures(render_scene, pScene, nameWExt);
+    textureImages(render_scene, pScene, nameWExt);
+    buffers(render_scene, pScene, nameWExt);
+    pScene->mRootNode = nodesRecursive(nullptr, render_scene.nodes[0], render_scene.skeletons);
+
+    setupBlendShapes(render_scene, pScene, nameWExt);
+}
+void USDImporterImplTinyusdz::animations(
+    const tinyusdz::tydra::RenderScene& render_scene,
+    aiScene* pScene) {
+    if (render_scene.animations.empty()) {
+        return;
+    }
+
+    pScene->mNumAnimations = unsigned(render_scene.animations.size());
+    pScene->mAnimations = new aiAnimation *[pScene->mNumAnimations];
+
+    for (unsigned animationIndex = 0; animationIndex < pScene->mNumAnimations; ++animationIndex) {
+
+        const auto &animation = render_scene.animations[animationIndex];
+
+        auto newAiAnimation = new aiAnimation();
+        pScene->mAnimations[animationIndex] = newAiAnimation;
+
+        newAiAnimation->mName = animation.abs_path;
+
+        if (animation.channels_map.empty()) {
+            newAiAnimation->mNumChannels = 0;
+            continue;
+        }
+
+        // each channel affects a node (joint)
+        newAiAnimation->mTicksPerSecond = render_scene.meta.framesPerSecond;
+        newAiAnimation->mNumChannels = unsigned(animation.channels_map.size());
+
+        newAiAnimation->mChannels = new aiNodeAnim *[newAiAnimation->mNumChannels];
+        int channelIndex = 0;
+        for (const auto &[jointName, animationChannelMap] : animation.channels_map) {
+            auto newAiNodeAnim = new aiNodeAnim();
+            newAiAnimation->mChannels[channelIndex] = newAiNodeAnim;
+            newAiNodeAnim->mNodeName = jointName;
+            newAiAnimation->mDuration = 0;
+
+            std::vector<aiVectorKey> positionKeys;
+            std::vector<aiQuatKey> rotationKeys;
+            std::vector<aiVectorKey> scalingKeys;
+
+            for (const auto &[channelType, animChannel] : animationChannelMap) {
+                switch (channelType) {
+                case tinyusdz::tydra::AnimationChannel::ChannelType::Rotation:
+                    if (animChannel.rotations.static_value.has_value()) {
+                        rotationKeys.emplace_back(0, tinyUsdzQuatToAiQuat(animChannel.rotations.static_value.value()));
+                    }
+                    for (const auto &rotationAnimSampler : animChannel.rotations.samples) {
+                        if (rotationAnimSampler.t > newAiAnimation->mDuration) {
+                            newAiAnimation->mDuration = rotationAnimSampler.t;
+                        }
+
+                        rotationKeys.emplace_back(rotationAnimSampler.t, tinyUsdzQuatToAiQuat(rotationAnimSampler.value));
+                    }
+                    break;
+                case tinyusdz::tydra::AnimationChannel::ChannelType::Scale:
+                    if (animChannel.scales.static_value.has_value()) {
+                        scalingKeys.emplace_back(0, tinyUsdzScaleOrPosToAssimp(animChannel.scales.static_value.value()));
+                    }
+                    for (const auto &scaleAnimSampler : animChannel.scales.samples) {
+                        if (scaleAnimSampler.t > newAiAnimation->mDuration) {
+                            newAiAnimation->mDuration = scaleAnimSampler.t;
+                        }
+                        scalingKeys.emplace_back(scaleAnimSampler.t, tinyUsdzScaleOrPosToAssimp(scaleAnimSampler.value));
+                    }
+                    break;
+                case tinyusdz::tydra::AnimationChannel::ChannelType::Transform:
+                    if (animChannel.transforms.static_value.has_value()) {
+                        aiVector3D position;
+                        aiVector3D scale;
+                        aiQuaternion rotation;
+                        tinyUsdzMat4ToAiMat4(animChannel.transforms.static_value.value().m).Decompose(scale, rotation, position);
+
+                        positionKeys.emplace_back(0, position);
+                        scalingKeys.emplace_back(0, scale);
+                        rotationKeys.emplace_back(0, rotation);
+                    }
+                    for (const auto &transformAnimSampler : animChannel.transforms.samples) {
+                        if (transformAnimSampler.t > newAiAnimation->mDuration) {
+                            newAiAnimation->mDuration = transformAnimSampler.t;
+                        }
+
+                        aiVector3D position;
+                        aiVector3D scale;
+                        aiQuaternion rotation;
+                        tinyUsdzMat4ToAiMat4(transformAnimSampler.value.m).Decompose(scale, rotation, position);
+
+                        positionKeys.emplace_back(transformAnimSampler.t, position);
+                        scalingKeys.emplace_back(transformAnimSampler.t, scale);
+                        rotationKeys.emplace_back(transformAnimSampler.t, rotation);
+                    }
+                    break;
+                case tinyusdz::tydra::AnimationChannel::ChannelType::Translation:
+                    if (animChannel.translations.static_value.has_value()) {
+                        positionKeys.emplace_back(0, tinyUsdzScaleOrPosToAssimp(animChannel.translations.static_value.value()));
+                    }
+                    for (const auto &translationAnimSampler : animChannel.translations.samples) {
+                        if (translationAnimSampler.t > newAiAnimation->mDuration) {
+                            newAiAnimation->mDuration = translationAnimSampler.t;
+                        }
+
+                        positionKeys.emplace_back(translationAnimSampler.t, tinyUsdzScaleOrPosToAssimp(translationAnimSampler.value));
+                    }
+                    break;
+                default:
+                    TINYUSDZLOGW(TAG, "Unsupported animation channel type (%s). Please update the USD importer to support this animation channel.", tinyusdzAnimChannelTypeFor(channelType).c_str());
+                }
+            }
+
+            newAiNodeAnim->mNumPositionKeys = unsigned(positionKeys.size());
+            newAiNodeAnim->mPositionKeys = new aiVectorKey[newAiNodeAnim->mNumPositionKeys];
+            std::move(positionKeys.begin(), positionKeys.end(), newAiNodeAnim->mPositionKeys);
+
+            newAiNodeAnim->mNumRotationKeys = unsigned(rotationKeys.size());
+            newAiNodeAnim->mRotationKeys = new aiQuatKey[newAiNodeAnim->mNumRotationKeys];
+            std::move(rotationKeys.begin(), rotationKeys.end(), newAiNodeAnim->mRotationKeys);
+
+            newAiNodeAnim->mNumScalingKeys = unsigned(scalingKeys.size());
+            newAiNodeAnim->mScalingKeys = new aiVectorKey[newAiNodeAnim->mNumScalingKeys];
+            std::move(scalingKeys.begin(), scalingKeys.end(), newAiNodeAnim->mScalingKeys);
+
+            ++channelIndex;
+        }
+    }
+}
+
+void USDImporterImplTinyusdz::meshes(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        aiScene *pScene,
+        const std::string &nameWExt) {
+    stringstream ss;
+    pScene->mNumMeshes = static_cast<unsigned int>(render_scene.meshes.size());
+    pScene->mMeshes = new aiMesh *[pScene->mNumMeshes]();
+    ss.str("");
+    ss << "meshes(): pScene->mNumMeshes: " << pScene->mNumMeshes;
+    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+
+    // Export meshes
+    for (size_t meshIdx = 0; meshIdx < pScene->mNumMeshes; meshIdx++) {
+        pScene->mMeshes[meshIdx] = new aiMesh();
+        pScene->mMeshes[meshIdx]->mName.Set(render_scene.meshes[meshIdx].prim_name);
+        ss.str("");
+        ss << "   mesh[" << meshIdx << "]: " <<
+                render_scene.meshes[meshIdx].joint_and_weights.jointIndices.size() << " jointIndices, " <<
+                render_scene.meshes[meshIdx].joint_and_weights.jointWeights.size() << " jointWeights, elementSize: " <<
+                render_scene.meshes[meshIdx].joint_and_weights.elementSize;
+        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+        ss.str("");
+        ss << "        skel_id: " << render_scene.meshes[meshIdx].skel_id;
+        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+        if (render_scene.meshes[meshIdx].material_id > -1) {
+            pScene->mMeshes[meshIdx]->mMaterialIndex = render_scene.meshes[meshIdx].material_id;
+        }
+        verticesForMesh(render_scene, pScene, meshIdx, nameWExt);
+        facesForMesh(render_scene, pScene, meshIdx, nameWExt);
+        // Some models infer normals from faces, but others need them e.g.
+        //   - apple "toy car" canopy normals will be wrong
+        //   - human "untitled" model (tinyusdz issue #115) will be "splotchy"
+        normalsForMesh(render_scene, pScene, meshIdx, nameWExt);
+        materialsForMesh(render_scene, pScene, meshIdx, nameWExt);
+        uvsForMesh(render_scene, pScene, meshIdx, nameWExt);
+    }
+}
+
+void USDImporterImplTinyusdz::verticesForMesh(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        aiScene *pScene,
+        size_t meshIdx,
+        const std::string &nameWExt) {
+    UNUSED(nameWExt);
+    const auto numVertices = static_cast<unsigned int>(render_scene.meshes[meshIdx].points.size());
+    pScene->mMeshes[meshIdx]->mNumVertices = numVertices;
+    pScene->mMeshes[meshIdx]->mVertices = new aiVector3D[pScene->mMeshes[meshIdx]->mNumVertices];
+
+    // Check if this is a skinned mesh
+    if (int skeleton_id = render_scene.meshes[meshIdx].skel_id; skeleton_id > -1) {
+        // Recursively iterate to collect all the joints in the hierarchy into a flattened array
+        std::vector<const tinyusdz::tydra::SkelNode *> skeletonNodes;
+        skeletonNodes.push_back(&render_scene.skeletons[skeleton_id].root_node);
+        for (int i = 0; i < skeletonNodes.size(); ++i) {
+            for (const auto &child : skeletonNodes[i]->children) {
+                skeletonNodes.push_back(&child);
+            }
+        }
+
+        // Convert USD skeleton joints to Assimp bones
+        const unsigned int numBones = unsigned(skeletonNodes.size());
+        pScene->mMeshes[meshIdx]->mNumBones = numBones;
+        pScene->mMeshes[meshIdx]->mBones = new aiBone *[numBones];
+
+        for (unsigned int i = 0; i < numBones; ++i) {
+            const tinyusdz::tydra::SkelNode *skeletonNode = skeletonNodes[i];
+            const int boneIndex = skeletonNode->joint_id;
+
+            // Sorted so that Assimp bone ids align with USD joint id
+            auto outputBone = new aiBone();
+            outputBone->mName = aiString(skeletonNode->joint_name);
+            outputBone->mOffsetMatrix = tinyUsdzMat4ToAiMat4(skeletonNode->bind_transform.m).Inverse();
+            pScene->mMeshes[meshIdx]->mBones[boneIndex] = outputBone;
+        }
+
+        // Vertex weights
+        std::vector<std::vector<aiVertexWeight>> aiBonesVertexWeights;
+        aiBonesVertexWeights.resize(numBones);
+
+        const std::vector<int> &jointIndices = render_scene.meshes[meshIdx].joint_and_weights.jointIndices;
+        const std::vector<float> &jointWeightIndices = render_scene.meshes[meshIdx].joint_and_weights.jointWeights;
+        const int numWeightsPerVertex = render_scene.meshes[meshIdx].joint_and_weights.elementSize;
+
+        for (unsigned int vertexIndex = 0; vertexIndex < numVertices; ++vertexIndex) {
+            for (int weightIndex = 0; weightIndex < numWeightsPerVertex; ++weightIndex) {
+                const unsigned int index = vertexIndex * numWeightsPerVertex + weightIndex;
+                const float jointWeight = jointWeightIndices[index];
+
+                if (jointWeight > 0) {
+                    const int jointIndex = jointIndices[index];
+                    aiBonesVertexWeights[jointIndex].emplace_back(vertexIndex, jointWeight);
+                }
+            }
+        }
+
+        for (unsigned boneIndex = 0; boneIndex < numBones; ++boneIndex) {
+            const auto numWeightsForBone = unsigned(aiBonesVertexWeights[boneIndex].size());
+            pScene->mMeshes[meshIdx]->mBones[boneIndex]->mWeights = new aiVertexWeight[numWeightsForBone];
+            pScene->mMeshes[meshIdx]->mBones[boneIndex]->mNumWeights = numWeightsForBone;
+
+            std::swap_ranges(aiBonesVertexWeights[boneIndex].begin(), aiBonesVertexWeights[boneIndex].end(), pScene->mMeshes[meshIdx]->mBones[boneIndex]->mWeights);
+        }
+    }  // Skinned mesh end
+
+    for (size_t j = 0; j < pScene->mMeshes[meshIdx]->mNumVertices; ++j) {
+        pScene->mMeshes[meshIdx]->mVertices[j].x = render_scene.meshes[meshIdx].points[j][0];
+        pScene->mMeshes[meshIdx]->mVertices[j].y = render_scene.meshes[meshIdx].points[j][1];
+        pScene->mMeshes[meshIdx]->mVertices[j].z = render_scene.meshes[meshIdx].points[j][2];
+    }
+}
+
+void USDImporterImplTinyusdz::facesForMesh(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        aiScene *pScene,
+        size_t meshIdx,
+        const std::string &nameWExt) {
+    UNUSED(nameWExt);
+    pScene->mMeshes[meshIdx]->mNumFaces = static_cast<unsigned int>(render_scene.meshes[meshIdx].faceVertexCounts().size());
+    pScene->mMeshes[meshIdx]->mFaces = new aiFace[pScene->mMeshes[meshIdx]->mNumFaces]();
+    size_t faceVertIdxOffset = 0;
+    for (size_t faceIdx = 0; faceIdx < pScene->mMeshes[meshIdx]->mNumFaces; ++faceIdx) {
+        pScene->mMeshes[meshIdx]->mFaces[faceIdx].mNumIndices = render_scene.meshes[meshIdx].faceVertexCounts()[faceIdx];
+        pScene->mMeshes[meshIdx]->mFaces[faceIdx].mIndices = new unsigned int[pScene->mMeshes[meshIdx]->mFaces[faceIdx].mNumIndices];
+        for (size_t j = 0; j < pScene->mMeshes[meshIdx]->mFaces[faceIdx].mNumIndices; ++j) {
+            pScene->mMeshes[meshIdx]->mFaces[faceIdx].mIndices[j] =
+                    render_scene.meshes[meshIdx].faceVertexIndices()[j + faceVertIdxOffset];
+        }
+        faceVertIdxOffset += pScene->mMeshes[meshIdx]->mFaces[faceIdx].mNumIndices;
+    }
+}
+
+void USDImporterImplTinyusdz::normalsForMesh(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        aiScene *pScene,
+        size_t meshIdx,
+        const std::string &nameWExt) {
+    UNUSED(nameWExt);
+    pScene->mMeshes[meshIdx]->mNormals = new aiVector3D[pScene->mMeshes[meshIdx]->mNumVertices];
+    const float *floatPtr = reinterpret_cast<const float *>(render_scene.meshes[meshIdx].normals.get_data().data());
+    for (size_t vertIdx = 0, fpj = 0; vertIdx < pScene->mMeshes[meshIdx]->mNumVertices; ++vertIdx, fpj += 3) {
+        pScene->mMeshes[meshIdx]->mNormals[vertIdx].x = floatPtr[fpj];
+        pScene->mMeshes[meshIdx]->mNormals[vertIdx].y = floatPtr[fpj + 1];
+        pScene->mMeshes[meshIdx]->mNormals[vertIdx].z = floatPtr[fpj + 2];
+    }
+}
+
+void USDImporterImplTinyusdz::materialsForMesh(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        aiScene *pScene,
+        size_t meshIdx,
+        const std::string &nameWExt) {
+    UNUSED(render_scene); UNUSED(pScene); UNUSED(meshIdx); UNUSED(nameWExt);
+}
+
+void USDImporterImplTinyusdz::uvsForMesh(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        aiScene *pScene,
+        size_t meshIdx,
+        const std::string &nameWExt) {
+    UNUSED(nameWExt);
+    const size_t uvSlotsCount = render_scene.meshes[meshIdx].texcoords.size();
+    if (uvSlotsCount < 1) {
+        return;
+    }
+    pScene->mMeshes[meshIdx]->mTextureCoords[0] = new aiVector3D[pScene->mMeshes[meshIdx]->mNumVertices];
+    pScene->mMeshes[meshIdx]->mNumUVComponents[0] = 2; // U and V stored in "x", "y" of aiVector3D.
+    for (unsigned int uvSlotIdx = 0; uvSlotIdx < uvSlotsCount; ++uvSlotIdx) {
+        const auto uvsForSlot = render_scene.meshes[meshIdx].texcoords.at(uvSlotIdx);
+        if (uvsForSlot.get_data().size() == 0) {
+            continue;
+        }
+        const float *floatPtr = reinterpret_cast<const float *>(uvsForSlot.get_data().data());
+        for (size_t vertIdx = 0, fpj = 0; vertIdx < pScene->mMeshes[meshIdx]->mNumVertices; ++vertIdx, fpj += 2) {
+            pScene->mMeshes[meshIdx]->mTextureCoords[uvSlotIdx][vertIdx].x = floatPtr[fpj];
+            pScene->mMeshes[meshIdx]->mTextureCoords[uvSlotIdx][vertIdx].y = floatPtr[fpj + 1];
+        }
+    }
+}
+
+static aiColor3D *ownedColorPtrFor(const std::array<float, 3> &color) {
+    aiColor3D *colorPtr = new aiColor3D();
+    colorPtr->r = color[0];
+    colorPtr->g = color[1];
+    colorPtr->b = color[2];
+    return colorPtr;
+}
+
+static std::string nameForTextureWithId(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        const int targetId) {
+    stringstream ss;
+    std::string texName;
+    for (const auto &image : render_scene.images) {
+        if (image.buffer_id == targetId) {
+            texName = image.asset_identifier;
+            ss.str("");
+            ss << "nameForTextureWithId(): found texture " << texName << " with target id " << targetId;
+            TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+            break;
+        }
+    }
+    ss.str("");
+    ss << "nameForTextureWithId(): ERROR!  Failed to find texture with target id " << targetId;
+    TINYUSDZLOGE(TAG, "%s", ss.str().c_str());
+    return texName;
+}
+
+static void assignTexture(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        const tinyusdz::tydra::RenderMaterial &material,
+        aiMaterial *mat,
+        const int textureId,
+        const int aiTextureType) {
+    UNUSED(material);
+    std::string name = nameForTextureWithId(render_scene, textureId);
+    aiString *texName = new aiString();
+    texName->Set(name);
+    stringstream ss;
+    ss.str("");
+    ss << "assignTexture(): name: " << name;
+    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+    // TODO: verify hard-coded '0' index is correct
+    mat->AddProperty(texName, _AI_MATKEY_TEXTURE_BASE, aiTextureType, 0);
+}
+
+void USDImporterImplTinyusdz::materials(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        aiScene *pScene,
+        const std::string &nameWExt) {
+    const size_t numMaterials{render_scene.materials.size()};
+    (void) numMaterials; // Ignore unused variable when -Werror enabled
+    stringstream ss;
+    ss.str("");
+    ss << "materials(): model" << nameWExt << ", numMaterials: " << numMaterials;
+    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+    pScene->mNumMaterials = 0;
+    if (render_scene.materials.empty()) {
+        return;
+    }
+    pScene->mMaterials = new aiMaterial *[render_scene.materials.size()];
+    for (const auto &material : render_scene.materials) {
+        ss.str("");
+        ss << "    material[" << pScene->mNumMaterials << "]: name: |" << material.name << "|, disp name: |" << material.display_name << "|";
+        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+        aiMaterial *mat = new aiMaterial;
+
+        aiString *materialName = new aiString();
+        materialName->Set(material.name);
+        mat->AddProperty(materialName, AI_MATKEY_NAME);
+
+        mat->AddProperty(
+                ownedColorPtrFor(material.surfaceShader.diffuseColor.value),
+                1, AI_MATKEY_COLOR_DIFFUSE);
+        mat->AddProperty(
+                ownedColorPtrFor(material.surfaceShader.specularColor.value),
+                1, AI_MATKEY_COLOR_SPECULAR);
+        mat->AddProperty(
+                ownedColorPtrFor(material.surfaceShader.emissiveColor.value),
+                1, AI_MATKEY_COLOR_EMISSIVE);
+
+        ss.str("");
+        if (material.surfaceShader.diffuseColor.is_texture()) {
+            assignTexture(render_scene, material, mat, material.surfaceShader.diffuseColor.texture_id, aiTextureType_DIFFUSE);
+            ss << "    material[" << pScene->mNumMaterials << "]: diff tex id " << material.surfaceShader.diffuseColor.texture_id << "\n";
+        }
+        if (material.surfaceShader.specularColor.is_texture()) {
+            assignTexture(render_scene, material, mat, material.surfaceShader.specularColor.texture_id, aiTextureType_SPECULAR);
+            ss << "    material[" << pScene->mNumMaterials << "]: spec tex id " << material.surfaceShader.specularColor.texture_id << "\n";
+        }
+        if (material.surfaceShader.normal.is_texture()) {
+            assignTexture(render_scene, material, mat, material.surfaceShader.normal.texture_id, aiTextureType_NORMALS);
+            ss << "    material[" << pScene->mNumMaterials << "]: normal tex id " << material.surfaceShader.normal.texture_id << "\n";
+        }
+        if (material.surfaceShader.emissiveColor.is_texture()) {
+            assignTexture(render_scene, material, mat, material.surfaceShader.emissiveColor.texture_id, aiTextureType_EMISSIVE);
+            ss << "    material[" << pScene->mNumMaterials << "]: emissive tex id " << material.surfaceShader.emissiveColor.texture_id << "\n";
+        }
+        if (material.surfaceShader.occlusion.is_texture()) {
+            assignTexture(render_scene, material, mat, material.surfaceShader.occlusion.texture_id, aiTextureType_LIGHTMAP);
+            ss << "    material[" << pScene->mNumMaterials << "]: lightmap (occlusion) tex id " << material.surfaceShader.occlusion.texture_id << "\n";
+        }
+        if (material.surfaceShader.metallic.is_texture()) {
+            assignTexture(render_scene, material, mat, material.surfaceShader.metallic.texture_id, aiTextureType_METALNESS);
+            ss << "    material[" << pScene->mNumMaterials << "]: metallic tex id " << material.surfaceShader.metallic.texture_id << "\n";
+        }
+        if (material.surfaceShader.roughness.is_texture()) {
+            assignTexture(render_scene, material, mat, material.surfaceShader.roughness.texture_id, aiTextureType_DIFFUSE_ROUGHNESS);
+            ss << "    material[" << pScene->mNumMaterials << "]: roughness tex id " << material.surfaceShader.roughness.texture_id << "\n";
+        }
+        if (material.surfaceShader.clearcoat.is_texture()) {
+            assignTexture(render_scene, material, mat, material.surfaceShader.clearcoat.texture_id, aiTextureType_CLEARCOAT);
+            ss << "    material[" << pScene->mNumMaterials << "]: clearcoat tex id " << material.surfaceShader.clearcoat.texture_id << "\n";
+        }
+        if (material.surfaceShader.opacity.is_texture()) {
+            assignTexture(render_scene, material, mat, material.surfaceShader.opacity.texture_id, aiTextureType_OPACITY);
+            ss << "    material[" << pScene->mNumMaterials << "]: opacity tex id " << material.surfaceShader.opacity.texture_id << "\n";
+        }
+        if (material.surfaceShader.displacement.is_texture()) {
+            assignTexture(render_scene, material, mat, material.surfaceShader.displacement.texture_id, aiTextureType_DISPLACEMENT);
+            ss << "    material[" << pScene->mNumMaterials << "]: displacement tex id " << material.surfaceShader.displacement.texture_id << "\n";
+        }
+        if (material.surfaceShader.clearcoatRoughness.is_texture()) {
+            ss << "    material[" << pScene->mNumMaterials << "]: clearcoatRoughness tex id " << material.surfaceShader.clearcoatRoughness.texture_id << "\n";
+        }
+        if (material.surfaceShader.opacityThreshold.is_texture()) {
+            ss << "    material[" << pScene->mNumMaterials << "]: opacityThreshold tex id " << material.surfaceShader.opacityThreshold.texture_id << "\n";
+        }
+        if (material.surfaceShader.ior.is_texture()) {
+            ss << "    material[" << pScene->mNumMaterials << "]: ior tex id " << material.surfaceShader.ior.texture_id << "\n";
+        }
+        if (!ss.str().empty()) {
+            TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+        }
+
+        pScene->mMaterials[pScene->mNumMaterials] = mat;
+        ++pScene->mNumMaterials;
+    }
+}
+
+void USDImporterImplTinyusdz::textures(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        aiScene *pScene,
+        const std::string &nameWExt) {
+    UNUSED(pScene);
+    const size_t numTextures{render_scene.textures.size()};
+    UNUSED(numTextures); // Ignore unused variable when -Werror enabled
+    stringstream ss;
+    ss.str("");
+    ss << "textures(): model" << nameWExt << ", numTextures: " << numTextures;
+    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+    size_t i{0};
+    UNUSED(i);
+    for (const auto &texture : render_scene.textures) {
+        UNUSED(texture);
+        ss.str("");
+        ss << "    texture[" << i << "]: id: " << texture.texture_image_id << ", disp name: |" << texture.display_name << "|, varname_uv: " <<
+                texture.varname_uv << ", prim_name: |" << texture.prim_name << "|, abs_path: |" << texture.abs_path << "|";
+        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+        ++i;
+    }
+}
+
+/**
+ * "owned" as in, used "new" to allocate and aiScene now responsible for "delete"
+ *
+ * @param render_scene  renderScene object
+ * @param image         textureImage object
+ * @param nameWExt      filename w/ext (use to extract file type hint)
+ * @return              aiTexture ptr
+ */
+static aiTexture *ownedEmbeddedTextureFor(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        const tinyusdz::tydra::TextureImage &image,
+        const std::string &nameWExt) {
+    UNUSED(nameWExt);
+    stringstream ss;
+    aiTexture *tex = new aiTexture();
+    size_t pos = image.asset_identifier.find_last_of('/');
+    string embTexName{image.asset_identifier.substr(pos + 1)};
+    tex->mFilename.Set(image.asset_identifier.c_str());
+    tex->mHeight = image.height;
+
+    tex->mWidth = image.width;
+    if (tex->mHeight == 0) {
+        pos = embTexName.find_last_of('.');
+        strncpy(tex->achFormatHint, embTexName.substr(pos + 1).c_str(), 3);
+        const size_t imageBytesCount{render_scene.buffers[image.buffer_id].data.size()};
+        tex->pcData = (aiTexel *) new char[imageBytesCount];
+        memcpy(tex->pcData, &render_scene.buffers[image.buffer_id].data[0], imageBytesCount);
+    } else {
+        string formatHint{"rgba8888"};
+        strncpy(tex->achFormatHint, formatHint.c_str(), 8);
+        const size_t imageTexelsCount{tex->mWidth * tex->mHeight};
+        tex->pcData = (aiTexel *) new char[imageTexelsCount * image.channels];
+        const float *floatPtr = reinterpret_cast<const float *>(&render_scene.buffers[image.buffer_id].data[0]);
+        ss.str("");
+        ss << "ownedEmbeddedTextureFor(): manual fill...";
+        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+        for (size_t i = 0, fpi = 0; i < imageTexelsCount; ++i, fpi += 4) {
+            tex->pcData[i].b = static_cast<uint8_t>(floatPtr[fpi]     * 255);
+            tex->pcData[i].g = static_cast<uint8_t>(floatPtr[fpi + 1] * 255);
+            tex->pcData[i].r = static_cast<uint8_t>(floatPtr[fpi + 2] * 255);
+            tex->pcData[i].a = static_cast<uint8_t>(floatPtr[fpi + 3] * 255);
+        }
+        ss.str("");
+        ss << "ownedEmbeddedTextureFor(): imageTexelsCount: " << imageTexelsCount << ", channels: " << image.channels;
+        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+    }
+    return tex;
+}
+
+void USDImporterImplTinyusdz::textureImages(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        aiScene *pScene,
+        const std::string &nameWExt) {
+    stringstream ss;
+    const size_t numTextureImages{render_scene.images.size()};
+    UNUSED(numTextureImages); // Ignore unused variable when -Werror enabled
+    ss.str("");
+    ss << "textureImages(): model" << nameWExt << ", numTextureImages: " << numTextureImages;
+    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+    pScene->mTextures = nullptr; // Need to iterate over images before knowing if valid textures available
+    pScene->mNumTextures = 0;
+    for (const auto &image : render_scene.images) {
+        ss.str("");
+        ss << "    image[" << pScene->mNumTextures << "]: |" << image.asset_identifier << "| w: " << image.width << ", h: " << image.height <<
+           ", channels: " << image.channels << ", miplevel: " << image.miplevel << ", buffer id: " << image.buffer_id << "\n" <<
+           "    buffers.size(): " << render_scene.buffers.size() << ", data empty? " << render_scene.buffers[image.buffer_id].data.empty();
+        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+        if (image.buffer_id > -1 &&
+            image.buffer_id < static_cast<long int>(render_scene.buffers.size()) &&
+            !render_scene.buffers[image.buffer_id].data.empty()) {
+            aiTexture *tex = ownedEmbeddedTextureFor(
+                    render_scene,
+                    image,
+                    nameWExt);
+            if (pScene->mTextures == nullptr) {
+                ss.str("");
+                ss << "    Init pScene->mTextures[" << render_scene.images.size() << "]";
+                TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+                pScene->mTextures = new aiTexture *[render_scene.images.size()];
+            }
+            ss.str("");
+            ss << "    pScene->mTextures[" << pScene->mNumTextures << "] name: |" << tex->mFilename.C_Str() <<
+                    "|, w: " << tex->mWidth << ", h: " << tex->mHeight << ", hint: " << tex->achFormatHint;
+            TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+            pScene->mTextures[pScene->mNumTextures++] = tex;
+        }
+    }
+}
+
+void USDImporterImplTinyusdz::buffers(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        aiScene *pScene,
+        const std::string &nameWExt) {
+    const size_t numBuffers{render_scene.buffers.size()};
+    UNUSED(pScene); UNUSED(numBuffers); // Ignore unused variable when -Werror enabled
+    stringstream ss;
+    ss.str("");
+    ss << "buffers(): model" << nameWExt << ", numBuffers: " << numBuffers;
+    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+    size_t i = 0;
+    for (const auto &buffer : render_scene.buffers) {
+        ss.str("");
+        ss << "    buffer[" << i << "]: count: " << buffer.data.size() << ", type: " << to_string(buffer.componentType);
+        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+        ++i;
+    }
+}
+
+using Assimp::tinyusdzNodeTypeFor;
+using Assimp::tinyUsdzMat4ToAiMat4;
+using tinyusdz::tydra::NodeType;
+aiNode *USDImporterImplTinyusdz::nodesRecursive(
+        aiNode *pNodeParent,
+        const tinyusdz::tydra::Node &node,
+        const std::vector<tinyusdz::tydra::SkelHierarchy> &skeletons) {
+    stringstream ss;
+    aiNode *cNode = new aiNode();
+    cNode->mParent = pNodeParent;
+    cNode->mName.Set(node.prim_name);
+    cNode->mTransformation = tinyUsdzMat4ToAiMat4(node.local_matrix.m);
+
+    if (node.nodeType == NodeType::Mesh) {
+        cNode->mNumMeshes = 1;
+        cNode->mMeshes = new unsigned int[cNode->mNumMeshes];
+        cNode->mMeshes[0] = node.id;
+    }
+
+    ss.str("");
+    ss << "nodesRecursive(): node " << cNode->mName.C_Str() <<
+            " type: |" << tinyusdzNodeTypeFor(node.nodeType) <<
+            "|, disp " << node.display_name << ", abs " << node.abs_path;
+    if (cNode->mParent != nullptr) {
+        ss << " (parent " << cNode->mParent->mName.C_Str() << ")";
+    }
+    ss << " has " << node.children.size() << " children";
+    if (node.nodeType == NodeType::Mesh) {
+        ss << "\n    node mesh id: " << node.id << " (node type: " << tinyusdzNodeTypeFor(node.nodeType) << ")";
+    }
+    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+
+    unsigned int numChildren = unsigned(node.children.size());
+
+    // Find any tinyusdz skeletons which might begin at this node
+    // Add the skeleton bones as child nodes
+    const tinyusdz::tydra::SkelNode *skelNode = nullptr;
+    for (const auto &skeleton : skeletons) {
+        if (skeleton.abs_path == node.abs_path) {
+            // Add this skeleton's bones as child nodes
+            ++numChildren;
+            skelNode = &skeleton.root_node;
+            break;
+        }
+    }
+
+    cNode->mNumChildren = numChildren;
+
+    // Done. No more children.
+    if (numChildren == 0) {
+        return cNode;
+    }
+
+    cNode->mChildren = new aiNode *[cNode->mNumChildren];
+
+    size_t i{ 0 };
+    for (const auto &childNode : node.children) {
+        cNode->mChildren[i] = nodesRecursive(cNode, childNode, skeletons);
+        ++i;
+    }
+
+    if (skelNode != nullptr) {
+        // Convert USD skeleton into an Assimp node and make it the last child
+        cNode->mChildren[cNode->mNumChildren-1] = skeletonNodesRecursive(cNode, *skelNode);
+    }
+
+    return cNode;
+}
+
+aiNode *USDImporterImplTinyusdz::skeletonNodesRecursive(
+        aiNode* pNodeParent,
+        const tinyusdz::tydra::SkelNode& joint) {
+    auto *cNode = new aiNode(joint.joint_path);
+    cNode->mParent = pNodeParent;
+    cNode->mNumMeshes = 0; // not a mesh node
+    cNode->mTransformation = tinyUsdzMat4ToAiMat4(joint.rest_transform.m);
+
+    // Done. No more children.
+    if (joint.children.empty()) {
+        return cNode;
+    }
+
+    cNode->mNumChildren = static_cast<unsigned int>(joint.children.size());
+    cNode->mChildren = new aiNode *[cNode->mNumChildren];
+
+    for (unsigned i = 0; i < cNode->mNumChildren; ++i) {
+        const tinyusdz::tydra::SkelNode &childJoint = joint.children[i];
+        cNode->mChildren[i] = skeletonNodesRecursive(cNode, childJoint);
+    }
+
+    return cNode;
+}
+
+void USDImporterImplTinyusdz::sanityCheckNodesRecursive(
+        aiNode *cNode) {
+    stringstream ss;
+    ss.str("");
+    ss << "sanityCheckNodesRecursive(): node " << cNode->mName.C_Str();
+    if (cNode->mParent != nullptr) {
+        ss << " (parent " << cNode->mParent->mName.C_Str() << ")";
+    }
+    ss << " has " << cNode->mNumChildren << " children";
+    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+    for (size_t i = 0; i < cNode->mNumChildren; ++i) {
+        sanityCheckNodesRecursive(cNode->mChildren[i]);
+    }
+}
+
+void USDImporterImplTinyusdz::setupBlendShapes(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        aiScene *pScene,
+        const std::string &nameWExt) {
+    stringstream ss;
+    ss.str("");
+    ss << "setupBlendShapes(): iterating over " << pScene->mNumMeshes << " meshes for model" << nameWExt;
+    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+    for (size_t meshIdx = 0; meshIdx < pScene->mNumMeshes; meshIdx++) {
+         blendShapesForMesh(render_scene, pScene, meshIdx, nameWExt);
+    }
+}
+
+void USDImporterImplTinyusdz::blendShapesForMesh(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        aiScene *pScene,
+        size_t meshIdx,
+        const std::string &nameWExt) {
+    UNUSED(nameWExt);
+    stringstream ss;
+    const unsigned int numBlendShapeTargets{static_cast<unsigned int>(render_scene.meshes[meshIdx].targets.size())};
+    UNUSED(numBlendShapeTargets); // Ignore unused variable when -Werror enabled
+    ss.str("");
+    ss << "    blendShapesForMesh(): mesh[" << meshIdx << "], numBlendShapeTargets: " << numBlendShapeTargets;
+    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+    if (numBlendShapeTargets > 0) {
+        pScene->mMeshes[meshIdx]->mNumAnimMeshes = numBlendShapeTargets;
+        pScene->mMeshes[meshIdx]->mAnimMeshes = new aiAnimMesh *[pScene->mMeshes[meshIdx]->mNumAnimMeshes];
+    }
+    auto mapIter = render_scene.meshes[meshIdx].targets.begin();
+    size_t animMeshIdx{0};
+    for (; mapIter != render_scene.meshes[meshIdx].targets.end(); ++mapIter) {
+        const std::string name{mapIter->first};
+        const tinyusdz::tydra::ShapeTarget shapeTarget{mapIter->second};
+        pScene->mMeshes[meshIdx]->mAnimMeshes[animMeshIdx] = aiCreateAnimMesh(pScene->mMeshes[meshIdx]);
+        ss.str("");
+        ss << "        mAnimMeshes[" << animMeshIdx << "]: mNumVertices: " << pScene->mMeshes[meshIdx]->mAnimMeshes[animMeshIdx]->mNumVertices <<
+                ", target: " << shapeTarget.pointIndices.size() << " pointIndices, " << shapeTarget.pointOffsets.size() <<
+                " pointOffsets, " << shapeTarget.normalOffsets.size() << " normalOffsets";
+        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+        for (size_t iVert = 0; iVert < shapeTarget.pointOffsets.size(); ++iVert) {
+            pScene->mMeshes[meshIdx]->mAnimMeshes[animMeshIdx]->mVertices[shapeTarget.pointIndices[iVert]] +=
+                    tinyUsdzScaleOrPosToAssimp(shapeTarget.pointOffsets[iVert]);
+        }
+        for (size_t iVert = 0; iVert < shapeTarget.normalOffsets.size(); ++iVert) {
+            pScene->mMeshes[meshIdx]->mAnimMeshes[animMeshIdx]->mNormals[shapeTarget.pointIndices[iVert]] +=
+                    tinyUsdzScaleOrPosToAssimp(shapeTarget.normalOffsets[iVert]);
+        }
+        ss.str("");
+        ss << "        target[" << animMeshIdx << "]: name: " << name << ", prim_name: " <<
+                shapeTarget.prim_name << ", abs_path: " << shapeTarget.abs_path <<
+                ", display_name: " << shapeTarget.display_name << ", " << shapeTarget.pointIndices.size() <<
+                " pointIndices, " << shapeTarget.pointOffsets.size() << " pointOffsets, " <<
+                shapeTarget.normalOffsets.size() << " normalOffsets, " << shapeTarget.inbetweens.size() <<
+                " inbetweens";
+        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+        ++animMeshIdx;
+    }
+}
+
+} // namespace Assimp
+
+#endif // !! ASSIMP_BUILD_NO_USD_IMPORTER
diff --git a/code/AssetLib/USD/USDLoaderImplTinyusdz.h b/code/AssetLib/USD/USDLoaderImplTinyusdz.h
new file mode 100644
index 000000000..c79f81d5d
--- /dev/null
+++ b/code/AssetLib/USD/USDLoaderImplTinyusdz.h
@@ -0,0 +1,151 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software 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 the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+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.
+
+----------------------------------------------------------------------
+*/
+
+/** @file  USDLoader.h
+ *  @brief Declaration of the USD importer class.
+ */
+#pragma once
+#ifndef AI_USDLOADER_IMPL_TINYUSDZ_H_INCLUDED
+#define AI_USDLOADER_IMPL_TINYUSDZ_H_INCLUDED
+
+#include <assimp/BaseImporter.h>
+#include <assimp/scene.h>
+#include <assimp/types.h>
+#include <vector>
+#include <cstdint>
+#include "tinyusdz.hh"
+#include "tydra/render-data.hh"
+
+namespace Assimp {
+class USDImporterImplTinyusdz {
+public:
+    USDImporterImplTinyusdz() = default;
+    ~USDImporterImplTinyusdz() = default;
+
+    void InternReadFile(
+            const std::string &pFile,
+            aiScene *pScene,
+            IOSystem *pIOHandler);
+
+    void animations(
+            const tinyusdz::tydra::RenderScene &render_scene,
+            aiScene *pScene);
+
+    void meshes(
+            const tinyusdz::tydra::RenderScene &render_scene,
+            aiScene *pScene,
+            const std::string &nameWExt);
+
+    void verticesForMesh(
+            const tinyusdz::tydra::RenderScene &render_scene,
+            aiScene *pScene,
+            size_t meshIdx,
+            const std::string &nameWExt);
+
+    void facesForMesh(
+            const tinyusdz::tydra::RenderScene &render_scene,
+            aiScene *pScene,
+            size_t meshIdx,
+            const std::string &nameWExt);
+
+    void normalsForMesh(
+            const tinyusdz::tydra::RenderScene &render_scene,
+            aiScene *pScene,
+            size_t meshIdx,
+            const std::string &nameWExt);
+
+    void materialsForMesh(
+            const tinyusdz::tydra::RenderScene &render_scene,
+            aiScene *pScene,
+            size_t meshIdx,
+            const std::string &nameWExt);
+
+    void uvsForMesh(
+            const tinyusdz::tydra::RenderScene &render_scene,
+            aiScene *pScene,
+            size_t meshIdx,
+            const std::string &nameWExt);
+
+    void materials(
+            const tinyusdz::tydra::RenderScene &render_scene,
+            aiScene *pScene,
+            const std::string &nameWExt);
+
+    void textures(
+            const tinyusdz::tydra::RenderScene &render_scene,
+            aiScene *pScene,
+            const std::string &nameWExt);
+
+    void textureImages(
+            const tinyusdz::tydra::RenderScene &render_scene,
+            aiScene *pScene,
+            const std::string &nameWExt);
+
+    void buffers(
+            const tinyusdz::tydra::RenderScene &render_scene,
+            aiScene *pScene,
+            const std::string &nameWExt);
+
+    aiNode *nodesRecursive(
+            aiNode *pNodeParent,
+            const tinyusdz::tydra::Node &node,
+            const std::vector<tinyusdz::tydra::SkelHierarchy> &skeletons);
+
+    aiNode *skeletonNodesRecursive(
+            aiNode *pNodeParent,
+            const tinyusdz::tydra::SkelNode &joint);
+
+    void sanityCheckNodesRecursive(
+            aiNode *pNode);
+
+    void setupBlendShapes(
+            const tinyusdz::tydra::RenderScene &render_scene,
+            aiScene *pScene,
+            const std::string &nameWExt);
+
+    void blendShapesForMesh(
+            const tinyusdz::tydra::RenderScene &render_scene,
+            aiScene *pScene,
+            size_t meshIdx,
+            const std::string &nameWExt);
+};
+} // namespace Assimp
+#endif // AI_USDLOADER_IMPL_TINYUSDZ_H_INCLUDED
diff --git a/code/AssetLib/USD/USDLoaderImplTinyusdzHelper.cpp b/code/AssetLib/USD/USDLoaderImplTinyusdzHelper.cpp
new file mode 100644
index 000000000..1dcb2a30e
--- /dev/null
+++ b/code/AssetLib/USD/USDLoaderImplTinyusdzHelper.cpp
@@ -0,0 +1,114 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software 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 the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+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.
+
+----------------------------------------------------------------------
+*/
+
+#ifndef ASSIMP_BUILD_NO_USD_IMPORTER
+#include "USDLoaderImplTinyusdzHelper.h"
+
+#include "../../../contrib/tinyusdz/assimp_tinyusdz_logging.inc"
+
+namespace {
+//const char *const TAG = "tinyusdz helper";
+}
+
+using ChannelType = tinyusdz::tydra::AnimationChannel::ChannelType;
+std::string Assimp::tinyusdzAnimChannelTypeFor(ChannelType animChannel) {
+    switch (animChannel) {
+    case ChannelType::Transform: {
+        return "Transform";
+    }
+    case ChannelType::Translation: {
+        return "Translation";
+    }
+    case ChannelType::Rotation: {
+        return "Rotation";
+    }
+    case ChannelType::Scale: {
+        return "Scale";
+    }
+    case ChannelType::Weight: {
+        return "Weight";
+    }
+    default:
+        return "Invalid";
+    }
+}
+
+using tinyusdz::tydra::NodeType;
+std::string Assimp::tinyusdzNodeTypeFor(NodeType type) {
+    switch (type) {
+    case NodeType::Xform: {
+        return "Xform";
+    }
+    case NodeType::Mesh: {
+        return "Mesh";
+    }
+    case NodeType::Camera: {
+        return "Camera";
+    }
+    case NodeType::Skeleton: {
+        return "Skeleton";
+    }
+    case NodeType::PointLight: {
+        return "PointLight";
+    }
+    case NodeType::DirectionalLight: {
+        return "DirectionalLight";
+    }
+    case NodeType::EnvmapLight: {
+        return "EnvmapLight";
+    }
+    default:
+        return "Invalid";
+    }
+}
+
+aiVector3D Assimp::tinyUsdzScaleOrPosToAssimp(const std::array<float, 3> &scaleOrPosIn) {
+    return aiVector3D(scaleOrPosIn[0], scaleOrPosIn[1], scaleOrPosIn[2]);
+}
+
+aiQuaternion Assimp::tinyUsdzQuatToAiQuat(const std::array<float, 4> &quatIn) {
+    // tinyusdz "quat" is x,y,z,w
+    // aiQuaternion is w,x,y,z
+    return aiQuaternion(
+            quatIn[3], quatIn[0], quatIn[1], quatIn[2]);
+}
+
+#endif // !! ASSIMP_BUILD_NO_USD_IMPORTER
diff --git a/code/AssetLib/USD/USDLoaderImplTinyusdzHelper.h b/code/AssetLib/USD/USDLoaderImplTinyusdzHelper.h
new file mode 100644
index 000000000..37edeb941
--- /dev/null
+++ b/code/AssetLib/USD/USDLoaderImplTinyusdzHelper.h
@@ -0,0 +1,92 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software 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 the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+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.
+
+----------------------------------------------------------------------
+*/
+
+#pragma once
+#ifndef AI_USDLOADER_IMPL_TINYUSDZ_HELPER_H_INCLUDED
+#define AI_USDLOADER_IMPL_TINYUSDZ_HELPER_H_INCLUDED
+
+#include <assimp/BaseImporter.h>
+#include <assimp/scene.h>
+#include <assimp/types.h>
+#include "tinyusdz.hh"
+#include "tydra/render-data.hh"
+#include <type_traits>
+
+namespace Assimp {
+
+std::string tinyusdzAnimChannelTypeFor(
+        tinyusdz::tydra::AnimationChannel::ChannelType animChannel);
+std::string tinyusdzNodeTypeFor(tinyusdz::tydra::NodeType type);
+
+template <typename T>
+aiMatrix4x4 tinyUsdzMat4ToAiMat4(const T matIn[4][4]) {
+    static_assert(std::is_floating_point_v<T>, "Only floating-point types are allowed.");
+    aiMatrix4x4 matOut;
+    matOut.a1 = ai_real(matIn[0][0]);
+    matOut.a2 = ai_real(matIn[1][0]);
+    matOut.a3 = ai_real(matIn[2][0]);
+    matOut.a4 = ai_real(matIn[3][0]);
+    matOut.b1 = ai_real(matIn[0][1]);
+    matOut.b2 = ai_real(matIn[1][1]);
+    matOut.b3 = ai_real(matIn[2][1]);
+    matOut.b4 = ai_real(matIn[3][1]);
+    matOut.c1 = ai_real(matIn[0][2]);
+    matOut.c2 = ai_real(matIn[1][2]);
+    matOut.c3 = ai_real(matIn[2][2]);
+    matOut.c4 = ai_real(matIn[3][2]);
+    matOut.d1 = ai_real(matIn[0][3]);
+    matOut.d2 = ai_real(matIn[1][3]);
+    matOut.d3 = ai_real(matIn[2][3]);
+    matOut.d4 = ai_real(matIn[3][3]);
+    return matOut;
+}
+aiVector3D tinyUsdzScaleOrPosToAssimp(const std::array<float, 3> &scaleOrPosIn);
+
+/**
+ * Convert quaternion from tinyusdz "quat" to assimp "aiQuaternion" type
+ *
+ * @param quatIn tinyusdz float[4] in x,y,z,w order
+ * @return assimp aiQuaternion converted from input
+ */
+aiQuaternion tinyUsdzQuatToAiQuat(const std::array<float, 4> &quatIn);
+
+} // namespace Assimp
+#endif // AI_USDLOADER_IMPL_TINYUSDZ_HELPER_H_INCLUDED
diff --git a/code/AssetLib/USD/USDLoaderUtil.cpp b/code/AssetLib/USD/USDLoaderUtil.cpp
new file mode 100644
index 000000000..e1531a7a4
--- /dev/null
+++ b/code/AssetLib/USD/USDLoaderUtil.cpp
@@ -0,0 +1,116 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software 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 the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+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.
+
+----------------------------------------------------------------------
+*/
+
+/** @file  USDLoader.cpp
+ *  @brief Implementation of the USD importer class
+ */
+
+#ifndef ASSIMP_BUILD_NO_USD_IMPORTER
+#include <memory>
+
+// internal headers
+#include <assimp/ai_assert.h>
+#include <assimp/anim.h>
+#include <assimp/DefaultIOSystem.h>
+#include <assimp/DefaultLogger.hpp>
+#include <assimp/fast_atof.h>
+#include <assimp/Importer.hpp>
+#include <assimp/importerdesc.h>
+#include <assimp/IOStreamBuffer.h>
+#include <assimp/IOSystem.hpp>
+#include <assimp/scene.h>
+#include <assimp/StringUtils.h>
+#include <assimp/StreamReader.h>
+
+#include "USDLoaderUtil.h"
+
+namespace Assimp {
+using namespace std;
+bool isUsda(const std::string &pFile) {
+    size_t pos = pFile.find_last_of('.');
+    if (pos == string::npos) {
+        return false;
+    }
+    string ext = pFile.substr(pos + 1);
+    if (ext.size() != 4) {
+        return false;
+    }
+    return (ext[0] == 'u' || ext[0] == 'U') && (ext[1] == 's' || ext[1] == 'S') && (ext[2] == 'd' || ext[2] == 'D') && (ext[3] == 'a' || ext[3] == 'A');
+}
+
+bool isUsdc(const std::string &pFile) {
+    size_t pos = pFile.find_last_of('.');
+    if (pos == string::npos) {
+        return false;
+    }
+    string ext = pFile.substr(pos + 1);
+    if (ext.size() != 4) {
+        return false;
+    }
+    return (ext[0] == 'u' || ext[0] == 'U') && (ext[1] == 's' || ext[1] == 'S') && (ext[2] == 'd' || ext[2] == 'D') && (ext[3] == 'c' || ext[3] == 'C');
+}
+
+bool isUsdz(const std::string &pFile) {
+    size_t pos = pFile.find_last_of('.');
+    if (pos == string::npos) {
+        return false;
+    }
+    string ext = pFile.substr(pos + 1);
+    if (ext.size() != 4) {
+        return false;
+    }
+    return (ext[0] == 'u' || ext[0] == 'U') && (ext[1] == 's' || ext[1] == 'S') && (ext[2] == 'd' || ext[2] == 'D') && (ext[3] == 'z' || ext[3] == 'Z');
+}
+
+bool isUsd(const std::string &pFile) {
+    size_t pos = pFile.find_last_of('.');
+    if (pos == string::npos) {
+        return false;
+    }
+    string ext = pFile.substr(pos + 1);
+    if (ext.size() != 3) {
+        return false;
+    }
+    return (ext[0] == 'u' || ext[0] == 'U') && (ext[1] == 's' || ext[1] == 'S') && (ext[2] == 'd' || ext[2] == 'D');
+}
+} // namespace Assimp
+
+#endif // !! ASSIMP_BUILD_NO_USD_IMPORTER
diff --git a/code/AssetLib/USD/USDLoaderUtil.h b/code/AssetLib/USD/USDLoaderUtil.h
new file mode 100644
index 000000000..a19269856
--- /dev/null
+++ b/code/AssetLib/USD/USDLoaderUtil.h
@@ -0,0 +1,60 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software 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 the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+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.
+
+----------------------------------------------------------------------
+*/
+
+/** @file  USDLoader.h
+ *  @brief Declaration of the USD importer class.
+ */
+#pragma once
+#ifndef AI_USDLOADER_UTIL_H_INCLUDED
+#define AI_USDLOADER_UTIL_H_INCLUDED
+
+#include <string>
+
+namespace Assimp {
+
+bool isUsda(const std::string &pFile);
+bool isUsdc(const std::string &pFile);
+bool isUsdz(const std::string &pFile);
+bool isUsd(const std::string &pFile);
+
+} // namespace Assimp
+
+#endif // AI_USDLOADER_UTIL_H_INCLUDED
diff --git a/code/AssetLib/USD/USDPreprocessor.h b/code/AssetLib/USD/USDPreprocessor.h
new file mode 100644
index 000000000..8defc7936
--- /dev/null
+++ b/code/AssetLib/USD/USDPreprocessor.h
@@ -0,0 +1,50 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+                          All rights reserved.
+
+                          Redistribution and use of this software 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 the assimp team, nor the names of its
+                contributors may be used to endorse or promote products
+                   derived from this software without specific prior
+                   written permission of the assimp team.
+
+                   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.
+                ----------------------------------------------------------------------
+                */
+
+/** @file  USDLoader.h
+ *  @brief Declaration of the USD importer class.
+ */
+#pragma once
+#ifndef AI_USDPREPROCESSOR_H_INCLUDED
+#define AI_USDPREPROCESSOR_H_INCLUDED
+
+#define UNUSED(x) (void) x
+
+#endif // AI_USDPREPROCESSOR_H_INCLUDED
diff --git a/code/AssetLib/Unreal/UnrealLoader.cpp b/code/AssetLib/Unreal/UnrealLoader.cpp
index 5f622da42..b35a5b1b6 100644
--- a/code/AssetLib/Unreal/UnrealLoader.cpp
+++ b/code/AssetLib/Unreal/UnrealLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -67,32 +67,26 @@ namespace Assimp {
 
 namespace Unreal {
 
-/*
-    0 = Normal one-sided
-    1 = Normal two-sided
-    2 = Translucent two-sided
-    3 = Masked two-sided
-    4 = Modulation blended two-sided
-    8 = Placeholder triangle for weapon positioning (invisible)
-*/
+// Mesh-specific fags.
 enum MeshFlags {
-    MF_NORMAL_OS = 0,
-    MF_NORMAL_TS = 1,
-    MF_NORMAL_TRANS_TS = 2,
-    MF_NORMAL_MASKED_TS = 3,
-    MF_NORMAL_MOD_TS = 4,
-    MF_WEAPON_PLACEHOLDER = 8
+    MF_INVALID = -1,            // Not set
+    MF_NORMAL_OS = 0,           // Normal one-sided
+    MF_NORMAL_TS = 1,           // Normal two-sided
+    MF_NORMAL_TRANS_TS = 2,     // Translucent two-sided
+    MF_NORMAL_MASKED_TS = 3,    // Masked two-sided
+    MF_NORMAL_MOD_TS = 4,       // Modulation blended two-sided
+    MF_WEAPON_PLACEHOLDER = 8   // Placeholder triangle for weapon positioning (invisible)
 };
 
 // a single triangle
 struct Triangle {
-    uint16_t mVertex[3]; // Vertex indices
-    char mType; // James' Mesh Type
-    char mColor; // Color for flat and Gourand Shaded
-    unsigned char mTex[3][2]; // Texture UV coordinates
-    unsigned char mTextureNum; // Source texture offset
-    char mFlags; // Unreal Mesh Flags (unused)
-    unsigned int matIndex;
+    uint16_t mVertex[3];        // Vertex indices
+    char mType;                 // James' Mesh Type
+    char mColor;                // Color for flat and Gourand Shaded
+    unsigned char mTex[3][2];   // Texture UV coordinates
+    unsigned char mTextureNum;  // Source texture offset
+    char mFlags;                // Unreal Mesh Flags (unused)
+    unsigned int matIndex;      // Material index
 };
 
 // temporary representation for a material
@@ -118,6 +112,7 @@ struct TempMat {
     }
 };
 
+// A single vertex in an unsigned int 32 bit
 struct Vertex {
     int32_t X : 11;
     int32_t Y : 11;
@@ -172,10 +167,6 @@ UnrealImporter::UnrealImporter() :
     // empty
 }
 
-// ------------------------------------------------------------------------------------------------
-// Destructor, private as well
-UnrealImporter::~UnrealImporter() = default;
-
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool UnrealImporter::CanRead(const std::string &filename, IOSystem * /*pIOHandler*/, bool /*checkSig*/) const {
@@ -243,8 +234,9 @@ void UnrealImporter::InternReadFile(const std::string &pFile,
     const uint16_t numTris = d_reader.GetI2();
     const uint16_t numVert = d_reader.GetI2();
     d_reader.IncPtr(44);
-    if (!numTris || numVert < 3)
+    if (!numTris || numVert < 3) {
         throw DeadlyImportError("UNREAL: Invalid number of vertices/triangles");
+    }
 
     // maximum texture index
     unsigned int maxTexIdx = 0;
@@ -253,7 +245,6 @@ void UnrealImporter::InternReadFile(const std::string &pFile,
     std::vector<Unreal::Triangle> triangles(numTris);
     for (auto &tri : triangles) {
         for (unsigned int i = 0; i < 3; ++i) {
-
             tri.mVertex[i] = d_reader.GetI2();
             if (tri.mVertex[i] >= numTris) {
                 ASSIMP_LOG_WARN("UNREAL: vertex index out of range");
@@ -263,18 +254,20 @@ void UnrealImporter::InternReadFile(const std::string &pFile,
         tri.mType = d_reader.GetI1();
 
         // handle mesh flagss?
-        if (mConfigHandleFlags)
+        if (mConfigHandleFlags) {
             tri.mType = Unreal::MF_NORMAL_OS;
-        else {
+        } else {
             // ignore MOD and MASKED for the moment, treat them as two-sided
             if (tri.mType == Unreal::MF_NORMAL_MOD_TS || tri.mType == Unreal::MF_NORMAL_MASKED_TS)
                 tri.mType = Unreal::MF_NORMAL_TS;
         }
         d_reader.IncPtr(1);
 
-        for (unsigned int i = 0; i < 3; ++i)
-            for (unsigned int i2 = 0; i2 < 2; ++i2)
+        for (unsigned int i = 0; i < 3; ++i) {
+            for (unsigned int i2 = 0; i2 < 2; ++i2) {
                 tri.mTex[i][i2] = d_reader.GetI1();
+            }
+        }
 
         tri.mTextureNum = d_reader.GetI1();
         maxTexIdx = std::max(maxTexIdx, (unsigned int)tri.mTextureNum);
@@ -282,8 +275,9 @@ void UnrealImporter::InternReadFile(const std::string &pFile,
     }
 
     p.reset(pIOHandler->Open(a_path));
-    if (!p)
+    if (!p) {
         throw DeadlyImportError("UNREAL: Unable to open _a file");
+    }
     StreamReaderLE a_reader(pIOHandler->Open(a_path));
 
     // read number of frames
@@ -292,9 +286,10 @@ void UnrealImporter::InternReadFile(const std::string &pFile,
         throw DeadlyImportError("UNREAL: The requested frame does not exist");
     }
 
-    uint32_t st = a_reader.GetI2();
-    if (st != numVert * 4u)
+    // read aniv file length
+    if (uint32_t st = a_reader.GetI2(); st != numVert * 4u) {
         throw DeadlyImportError("UNREAL: Unexpected aniv file length");
+    }
 
     // skip to our frame
     a_reader.IncPtr(mConfigFrameID * numVert * 4);
@@ -320,17 +315,18 @@ void UnrealImporter::InternReadFile(const std::string &pFile,
         std::vector<char> _data;
         TextFileToBuffer(pb.get(), _data);
         const char *data = &_data[0];
+        const char *end = &_data[_data.size() - 1] + 1;
 
         std::vector<std::pair<std::string, std::string>> tempTextures;
 
         // do a quick search in the UC file for some known, usually texture-related, tags
         for (; *data; ++data) {
             if (TokenMatchI(data, "#exec", 5)) {
-                SkipSpacesAndLineEnd(&data);
+                SkipSpacesAndLineEnd(&data, end);
 
                 // #exec TEXTURE IMPORT [...] NAME=jjjjj [...] FILE=jjjj.pcx [...]
                 if (TokenMatchI(data, "TEXTURE", 7)) {
-                    SkipSpacesAndLineEnd(&data);
+                    SkipSpacesAndLineEnd(&data, end);
 
                     if (TokenMatchI(data, "IMPORT", 6)) {
                         tempTextures.emplace_back();
@@ -348,14 +344,15 @@ void UnrealImporter::InternReadFile(const std::string &pFile,
                                 me.second = std::string(d, (size_t)(data - d));
                             }
                         }
-                        if (!me.first.length() || !me.second.length())
+                        if (!me.first.length() || !me.second.length()) {
                             tempTextures.pop_back();
+                        }
                     }
                 }
                 // #exec MESHMAP SETTEXTURE MESHMAP=box NUM=1 TEXTURE=Jtex1
                 // #exec MESHMAP SCALE MESHMAP=box X=0.1 Y=0.1 Z=0.2
                 else if (TokenMatchI(data, "MESHMAP", 7)) {
-                    SkipSpacesAndLineEnd(&data);
+                    SkipSpacesAndLineEnd(&data, end);
 
                     if (TokenMatchI(data, "SETTEXTURE", 10)) {
 
@@ -369,8 +366,7 @@ void UnrealImporter::InternReadFile(const std::string &pFile,
                             } else if (!ASSIMP_strincmp(data, "TEXTURE=", 8)) {
                                 data += 8;
                                 const char *d = data;
-                                for (; !IsSpaceOrNewLine(*data); ++data)
-                                    ;
+                                for (; !IsSpaceOrNewLine(*data); ++data);
                                 me.second = std::string(d, (size_t)(data - d));
 
                                 // try to find matching path names, doesn't care if we don't find them
@@ -406,9 +402,9 @@ void UnrealImporter::InternReadFile(const std::string &pFile,
     materials.reserve(textures.size() * 2 + 5);
 
     // find out how many output meshes and materials we'll have and build material indices
-    for (Unreal::Triangle &tri : triangles) {
+    for (auto &tri : triangles) {
         Unreal::TempMat mat(tri);
-        std::vector<Unreal::TempMat>::iterator nt = std::find(materials.begin(), materials.end(), mat);
+        auto nt = std::find(materials.begin(), materials.end(), mat);
         if (nt == materials.end()) {
             // add material
             tri.matIndex = static_cast<unsigned int>(materials.size());
@@ -451,7 +447,7 @@ void UnrealImporter::InternReadFile(const std::string &pFile,
         aiColor3D color(1.f, 1.f, 1.f);
 
         aiString s;
-        ::ai_snprintf(s.data, MAXLEN, "mat%u_tx%u_", i, materials[i].tex);
+        ::ai_snprintf(s.data, AI_MAXLEN, "mat%u_tx%u_", i, materials[i].tex);
 
         // set the two-sided flag
         if (materials[i].type == Unreal::MF_NORMAL_TS) {
@@ -471,7 +467,7 @@ void UnrealImporter::InternReadFile(const std::string &pFile,
 
         // a special name for the weapon attachment point
         if (materials[i].type == Unreal::MF_WEAPON_PLACEHOLDER) {
-            s.length = ::ai_snprintf(s.data, MAXLEN, "$WeaponTag$");
+            s.length = ::ai_snprintf(s.data, AI_MAXLEN, "$WeaponTag$");
             color = aiColor3D(0.f, 0.f, 0.f);
         }
 
@@ -482,7 +478,7 @@ void UnrealImporter::InternReadFile(const std::string &pFile,
 
         // set texture, if any
         const unsigned int tex = materials[i].tex;
-        for (std::vector<std::pair<unsigned int, std::string>>::const_iterator it = textures.begin(); it != textures.end(); ++it) {
+        for (auto it = textures.begin(); it != textures.end(); ++it) {
             if ((*it).first == tex) {
                 s.Set((*it).second);
                 mat->AddProperty(&s, AI_MATKEY_TEXTURE_DIFFUSE(0));
@@ -494,7 +490,7 @@ void UnrealImporter::InternReadFile(const std::string &pFile,
     // fill them.
     for (const Unreal::Triangle &tri : triangles) {
         Unreal::TempMat mat(tri);
-        std::vector<Unreal::TempMat>::iterator nt = std::find(materials.begin(), materials.end(), mat);
+        auto nt = std::find(materials.begin(), materials.end(), mat);
 
         aiMesh *mesh = pScene->mMeshes[nt - materials.begin()];
         aiFace &f = mesh->mFaces[mesh->mNumFaces++];
diff --git a/code/AssetLib/Unreal/UnrealLoader.h b/code/AssetLib/Unreal/UnrealLoader.h
index fda784cfb..33abe037c 100644
--- a/code/AssetLib/Unreal/UnrealLoader.h
+++ b/code/AssetLib/Unreal/UnrealLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -55,8 +55,15 @@ namespace Assimp {
  */
 class UnrealImporter : public BaseImporter {
 public:
+    /**
+     *  @brief The class constructor.
+     */
     UnrealImporter();
-    ~UnrealImporter() override;
+
+    /**
+     *  @brief The class destructor.
+     */
+    ~UnrealImporter() override = default;
 
     // -------------------------------------------------------------------
     /** @brief Returns whether we can handle the format of the given file
diff --git a/code/AssetLib/VRML/README.md b/code/AssetLib/VRML/README.md
new file mode 100644
index 000000000..3c84707ad
--- /dev/null
+++ b/code/AssetLib/VRML/README.md
@@ -0,0 +1,21 @@
+# WRL/X3DV to X3D file format converter
+
+## VRML and X3D 3D model formats background
+"VRML" 3D model files use either `VRML97` (`.wrl`) or "Classic VRML" (`.x3dv`)
+file formats.
+
+The X3D model specification was introduced after these formats, as a superset of both WRL and X3DV.
+While X3D can understand the _content_ of WRL/X3DV files, it can't directly parse them because
+X3D uses `.xml` files, rather than `VRML97` or "Classic VRML" format.
+
+But, if a converter is available to migrate just the file format (preserving the content), so that
+the `.wrl`/`.x3dv` files can be converted to an X3D-compatible `.xml` file, then the X3D importer
+will be able to load the resulting model file.
+
+## How this code is used
+The sole purpose of `Parser`/`Scanner` (adopted from the `meshlab` project) is to take a
+`VRML97` (`.wrl`) or "Classic VRML" (`.x3dv`) file as input, and convert to an X3D `.xml` file.
+That's it.
+
+By passing the converted in-memory `.xml` file content to the `X3DImporter`, the `.wrl` or `x3dv`
+model can be loaded via assimp.
diff --git a/code/AssetLib/VRML/VrmlConverter.cpp b/code/AssetLib/VRML/VrmlConverter.cpp
new file mode 100644
index 000000000..d8993d218
--- /dev/null
+++ b/code/AssetLib/VRML/VrmlConverter.cpp
@@ -0,0 +1,103 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software 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 the assimp team, nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of the assimp team.
+
+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.
+
+----------------------------------------------------------------------
+*/
+/// \file   VrmlImporter.cpp
+/// \brief  Convert VRML-formatted (.wrl, .x3dv) files to X3D .xml format
+/// \date   2024
+/// \author tellypresence
+
+#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
+
+#include <memory> // std::unique_ptr
+#include "VrmlConverter.hpp"
+
+namespace Assimp {
+
+bool isFileWrlVrml97Ext(const std::string &pFile) {
+    size_t pos = pFile.find_last_of('.');
+    if (pos == std::string::npos) {
+        return false;
+    }
+    std::string ext = pFile.substr(pos + 1);
+    if (ext.size() != 3) {
+        return false;
+    }
+    return (ext[0] == 'w' || ext[0] == 'W') && (ext[1] == 'r' || ext[1] == 'R') && (ext[2] == 'l' || ext[2] == 'L');
+}
+
+bool isFileX3dvClassicVrmlExt(const std::string &pFile) {
+    size_t pos = pFile.find_last_of('.');
+    if (pos == std::string::npos) {
+        return false;
+    }
+    std::string ext = pFile.substr(pos + 1);
+    if (ext.size() != 4) {
+        return false;
+    }
+    return (ext[0] == 'x' || ext[0] == 'X') && (ext[1] == '3') && (ext[2] == 'd' || ext[2] == 'D') && (ext[3] == 'v' || ext[3] == 'V');
+}
+
+#if !defined(ASSIMP_BUILD_NO_VRML_IMPORTER)
+static VrmlTranslator::Scanner createScanner(const std::string &pFile) {
+    std::unique_ptr<wchar_t[]> wide_stringPtr{ new wchar_t[ pFile.length() + 1 ] };
+    std::copy(pFile.begin(), pFile.end(), wide_stringPtr.get());
+    wide_stringPtr[ pFile.length() ] = 0;
+
+    return VrmlTranslator::Scanner(wide_stringPtr.get());
+} // wide_stringPtr auto-deleted when leaving scope
+#endif // #if !defined(ASSIMP_BUILD_NO_VRML_IMPORTER)
+
+std::stringstream ConvertVrmlFileToX3dXmlFile(const std::string &pFile) {
+    std::stringstream ss;
+    if (isFileWrlVrml97Ext(pFile) || isFileX3dvClassicVrmlExt(pFile)) {
+#if !defined(ASSIMP_BUILD_NO_VRML_IMPORTER)
+        VrmlTranslator::Scanner scanner = createScanner(pFile);
+        VrmlTranslator::Parser parser(&scanner);
+        parser.Parse();
+        ss.str("");
+        parser.doc_.save(ss);
+#endif // #if !defined(ASSIMP_BUILD_NO_VRML_IMPORTER)
+    }
+    return ss;
+}
+
+} // namespace Assimp
+
+#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
diff --git a/code/AssetLib/VRML/VrmlConverter.hpp b/code/AssetLib/VRML/VrmlConverter.hpp
new file mode 100644
index 000000000..f07e8ed0f
--- /dev/null
+++ b/code/AssetLib/VRML/VrmlConverter.hpp
@@ -0,0 +1,57 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software 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 the assimp team, nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of the assimp team.
+
+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.
+
+----------------------------------------------------------------------
+*/
+
+#pragma once
+
+#include <sstream>
+#include <string>
+
+#if !defined(ASSIMP_BUILD_NO_VRML_IMPORTER)
+#include "contrib/meshlab/autoclone/meshlab_repo-src/src/meshlabplugins/io_x3d/vrml/Parser.h"
+#endif // #if !defined(ASSIMP_BUILD_NO_VRML_IMPORTER)
+
+namespace Assimp {
+
+bool isFileWrlVrml97Ext(const std::string &pFile);
+bool isFileX3dvClassicVrmlExt(const std::string &pFile);
+
+std::stringstream ConvertVrmlFileToX3dXmlFile(const std::string &pFile);
+} // namespace Assimp
diff --git a/code/AssetLib/X/XFileExporter.cpp b/code/AssetLib/X/XFileExporter.cpp
index f0b1608c1..1c4a4f2c3 100644
--- a/code/AssetLib/X/XFileExporter.cpp
+++ b/code/AssetLib/X/XFileExporter.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/X/XFileExporter.h b/code/AssetLib/X/XFileExporter.h
index 1d9a5ae77..7e2c56c8a 100644
--- a/code/AssetLib/X/XFileExporter.h
+++ b/code/AssetLib/X/XFileExporter.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/X/XFileHelper.h b/code/AssetLib/X/XFileHelper.h
index 4b95672f3..fae6cac7a 100644
--- a/code/AssetLib/X/XFileHelper.h
+++ b/code/AssetLib/X/XFileHelper.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/X/XFileImporter.cpp b/code/AssetLib/X/XFileImporter.cpp
index 00f44b34b..15194f934 100644
--- a/code/AssetLib/X/XFileImporter.cpp
+++ b/code/AssetLib/X/XFileImporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -44,8 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_X_IMPORTER
 
-#include "AssetLib/X/XFileImporter.h"
-#include "AssetLib/X/XFileParser.h"
+#include "XFileImporter.h"
+#include "XFileParser.h"
 #include "PostProcessing/ConvertToLHProcess.h"
 
 #include <assimp/TinyFormatter.h>
@@ -77,7 +77,7 @@ static constexpr aiImporterDesc desc = {
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool XFileImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    static const uint32_t token[] = { AI_MAKE_MAGIC("xof ") };
+    static constexpr uint32_t token[] = { AI_MAKE_MAGIC("xof ") };
     return CheckMagicToken(pIOHandler, pFile, token, AI_COUNT_OF(token));
 }
 
@@ -359,10 +359,18 @@ void XFileImporter::CreateMeshes(aiScene *pScene, aiNode *pNode, const std::vect
                 // set up a vertex-linear array of the weights for quick searching if a bone influences a vertex
                 std::vector<ai_real> oldWeights(sourceMesh->mPositions.size(), 0.0);
                 for (unsigned int d = 0; d < obone.mWeights.size(); ++d) {
-                    const unsigned int boneIdx = obone.mWeights[d].mVertex;
-                    if (boneIdx < obone.mWeights.size()) {
+                    // TODO  The conditional against boneIdx which was added in commit f844c33
+                    // TODO      (https://github.com/assimp/assimp/commit/f844c3397d7726477ab0fdca8efd3df56c18366b)
+                    // TODO  causes massive breakage as detailed in:
+                    // TODO      https://github.com/assimp/assimp/issues/5332
+                    // TODO  In cases like this unit tests are less useful, since the model still has
+                    // TODO  meshes, textures, animations etc. and asserts against these values may pass;
+                    // TODO  when touching importer code, it is crucial that developers also run manual, visual
+                    // TODO  checks to ensure there's no obvious breakage _before_ commiting to main branch
+                    //const unsigned int boneIdx = obone.mWeights[d].mVertex;
+                    //if (boneIdx < obone.mWeights.size()) {
                         oldWeights[obone.mWeights[d].mVertex] = obone.mWeights[d].mWeight;
-                    }
+                    //}
                 }
 
                 // collect all vertex weights that influence a vertex in the new mesh
diff --git a/code/AssetLib/X/XFileImporter.h b/code/AssetLib/X/XFileImporter.h
index 7be9cc8ec..372552252 100644
--- a/code/AssetLib/X/XFileImporter.h
+++ b/code/AssetLib/X/XFileImporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -55,7 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct aiNode;
 
-namespace Assimp    {
+namespace Assimp {
 
 namespace XFile {
     struct Scene;
diff --git a/code/AssetLib/X/XFileParser.cpp b/code/AssetLib/X/XFileParser.cpp
index 770c75a77..ac2e32f5b 100644
--- a/code/AssetLib/X/XFileParser.cpp
+++ b/code/AssetLib/X/XFileParser.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/X/XFileParser.h b/code/AssetLib/X/XFileParser.h
index 36eac2ada..35e6086b3 100644
--- a/code/AssetLib/X/XFileParser.h
+++ b/code/AssetLib/X/XFileParser.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/X3D/X3DGeoHelper.cpp b/code/AssetLib/X3D/X3DGeoHelper.cpp
index 0a62ff9b0..1c962a460 100644
--- a/code/AssetLib/X3D/X3DGeoHelper.cpp
+++ b/code/AssetLib/X3D/X3DGeoHelper.cpp
@@ -188,6 +188,51 @@ mg_m_err:
     pFaces.clear();
 }
 
+void X3DGeoHelper::coordIdx_str2lines_arr(const std::vector<int32_t> &pCoordIdx, std::vector<aiFace> &pFaces) {
+    std::vector<int32_t> f_data(pCoordIdx);
+
+    if (f_data.back() != (-1)) {
+        f_data.push_back(-1);
+    }
+
+    // reserve average size.
+    pFaces.reserve(f_data.size() / 2);
+    for (std::vector<int32_t>::const_iterator startIt = f_data.cbegin(), endIt = f_data.cbegin(); endIt != f_data.cend(); ++endIt) {
+        // check for end of current polyline
+        if (*endIt != -1)
+            continue;
+
+        // found end of polyline, check if this is a valid polyline
+        std::size_t numIndices = std::distance(startIt, endIt);
+        if (numIndices <= 1)
+            goto mg_m_err;
+
+        // create line faces out of polyline indices
+        for (int32_t idx0 = *startIt++; startIt != endIt; ++startIt) {
+            int32_t idx1 = *startIt;
+
+            aiFace tface;
+            tface.mNumIndices = 2;
+            tface.mIndices = new unsigned int[2];
+            tface.mIndices[0] = idx0;
+            tface.mIndices[1] = idx1;
+            pFaces.push_back(tface);
+
+            idx0 = idx1;
+        }
+
+        ++startIt;
+    }
+
+    return;
+
+mg_m_err:
+    for (size_t i = 0, i_e = pFaces.size(); i < i_e; i++)
+        delete[] pFaces[i].mIndices;
+
+    pFaces.clear();
+}
+
 void X3DGeoHelper::add_color(aiMesh &pMesh, const std::list<aiColor3D> &pColors, const bool pColorPerVertex) {
     std::list<aiColor4D> tcol;
 
@@ -528,4 +573,40 @@ aiMesh *X3DGeoHelper::make_mesh(const std::vector<int32_t> &pCoordIdx, const std
     return tmesh;
 }
 
+aiMesh *X3DGeoHelper::make_line_mesh(const std::vector<int32_t> &pCoordIdx, const std::list<aiVector3D> &pVertices) {
+    std::vector<aiFace> faces;
+
+    // create faces array from input string with vertices indices.
+    X3DGeoHelper::coordIdx_str2lines_arr(pCoordIdx, faces);
+    if (!faces.size()) {
+        throw DeadlyImportError("Failed to create mesh, faces list is empty.");
+    }
+
+    //
+    // Create new mesh and copy geometry data.
+    //
+    aiMesh *tmesh = new aiMesh;
+    size_t ts = faces.size();
+    // faces
+    tmesh->mFaces = new aiFace[ts];
+    tmesh->mNumFaces = static_cast<unsigned int>(ts);
+    for (size_t i = 0; i < ts; i++)
+        tmesh->mFaces[i] = faces[i];
+
+    // vertices
+    std::list<aiVector3D>::const_iterator vit = pVertices.begin();
+
+    ts = pVertices.size();
+    tmesh->mVertices = new aiVector3D[ts];
+    tmesh->mNumVertices = static_cast<unsigned int>(ts);
+    for (size_t i = 0; i < ts; i++) {
+        tmesh->mVertices[i] = *vit++;
+    }
+
+    // set primitive type and return result.
+    tmesh->mPrimitiveTypes = aiPrimitiveType_LINE;
+
+    return tmesh;
+}
+
 } // namespace Assimp
diff --git a/code/AssetLib/X3D/X3DGeoHelper.h b/code/AssetLib/X3D/X3DGeoHelper.h
index 78e57f9da..c740b4288 100644
--- a/code/AssetLib/X3D/X3DGeoHelper.h
+++ b/code/AssetLib/X3D/X3DGeoHelper.h
@@ -21,6 +21,7 @@ public:
     static void polylineIdx_to_lineIdx(const std::list<int32_t> &pPolylineCoordIdx, std::list<int32_t> &pLineCoordIdx);
     static void rect_parallel_epiped(const aiVector3D &pSize, std::list<aiVector3D> &pVertices);
     static void coordIdx_str2faces_arr(const std::vector<int32_t> &pCoordIdx, std::vector<aiFace> &pFaces, unsigned int &pPrimitiveTypes);
+    static void coordIdx_str2lines_arr(const std::vector<int32_t> &pCoordIdx, std::vector<aiFace> &pFaces);
     static void add_color(aiMesh &pMesh, const std::list<aiColor3D> &pColors, const bool pColorPerVertex);
     static void add_color(aiMesh &pMesh, const std::list<aiColor4D> &pColors, const bool pColorPerVertex);
     static void add_color(aiMesh &pMesh, const std::vector<int32_t> &pCoordIdx, const std::vector<int32_t> &pColorIdx,
@@ -34,6 +35,7 @@ public:
             const std::list<aiVector2D> &pTexCoords);
     static void add_tex_coord(aiMesh &pMesh, const std::list<aiVector2D> &pTexCoords);
     static aiMesh *make_mesh(const std::vector<int32_t> &pCoordIdx, const std::list<aiVector3D> &pVertices);
+    static aiMesh *make_line_mesh(const std::vector<int32_t> &pCoordIdx, const std::list<aiVector3D> &pVertices);
 };
 
 } // namespace Assimp
diff --git a/code/AssetLib/X3D/X3DImporter.cpp b/code/AssetLib/X3D/X3DImporter.cpp
index eeb20b7c1..d2ff7f988 100644
--- a/code/AssetLib/X3D/X3DImporter.cpp
+++ b/code/AssetLib/X3D/X3DImporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
 
+#include "AssetLib/VRML/VrmlConverter.hpp"
 #include "X3DImporter.hpp"
 #include "X3DImporter_Macro.hpp"
 
@@ -54,11 +55,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <iterator>
 #include <memory>
 
+#if defined(ASSIMP_BUILD_NO_VRML_IMPORTER)
+#define X3D_FORMATS_DESCR_STR "Extensible 3D(X3D, X3DB) Importer"
+#define X3D_FORMATS_EXTENSIONS_STR "x3d x3db"
+#else
+#define X3D_FORMATS_DESCR_STR "VRML(WRL, X3DV) and Extensible 3D(X3D, X3DB) Importer"
+#define X3D_FORMATS_EXTENSIONS_STR "wrl x3d x3db x3dv"
+#endif // #if defined(ASSIMP_BUILD_NO_VRML_IMPORTER)
+
 namespace Assimp {
 
 /// Constant which holds the importer description
 const aiImporterDesc X3DImporter::Description = {
-    "Extensible 3D(X3D) Importer",
+    X3D_FORMATS_DESCR_STR,
     "smalcom",
     "",
     "See documentation in source code. Chapter: Limitations.",
@@ -67,7 +76,7 @@ const aiImporterDesc X3DImporter::Description = {
     0,
     0,
     0,
-    "x3d x3db"
+    X3D_FORMATS_EXTENSIONS_STR
 };
 
 bool X3DImporter::isNodeEmpty(XmlNode &node) {
@@ -80,7 +89,7 @@ void X3DImporter::checkNodeMustBeEmpty(XmlNode &node) {
 
 void X3DImporter::skipUnsupportedNode(const std::string &pParentNodeName, XmlNode &node) {
     static const size_t Uns_Skip_Len = 192;
-    static const char *Uns_Skip[Uns_Skip_Len] = {
+    static constexpr char const * Uns_Skip[Uns_Skip_Len] = {
         // CAD geometry component
         "CADAssembly", "CADFace", "CADLayer", "CADPart", "IndexedQuadSet", "QuadSet",
         // Core
@@ -215,7 +224,19 @@ void X3DImporter::ParseFile(const std::string &file, IOSystem *pIOHandler) {
     if (!theParser.parse(fileStream.get())) {
         return;
     }
+    ParseFile(theParser);
+}
 
+void X3DImporter::ParseFile(std::istream &myIstream) {
+    XmlParser theParser;
+    if (!theParser.parse(myIstream)) {
+        LogInfo("ParseFile(): ERROR: failed to convert VRML istream to xml");
+        return;
+    }
+    ParseFile(theParser);
+}
+
+void X3DImporter::ParseFile(XmlParser &theParser) {
     XmlNode *node = theParser.findNode("X3D");
     if (nullptr == node) {
         return;
@@ -246,9 +267,13 @@ void X3DImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     mpIOHandler = pIOHandler;
 
     Clear();
-    std::shared_ptr<IOStream> stream(pIOHandler->Open(pFile, "rb"));
-    if (!stream) {
-        throw DeadlyImportError("Could not open file for reading");
+    std::stringstream ss = ConvertVrmlFileToX3dXmlFile(pFile);
+    const bool isReadFromMem{ ss.str().length() > 0 };
+    if (!isReadFromMem) {
+        std::shared_ptr<IOStream> stream(pIOHandler->Open(pFile, "rb"));
+        if (!stream) {
+            throw DeadlyImportError("Could not open file for reading");
+        }
     }
     std::string::size_type slashPos = pFile.find_last_of("\\/");
 
@@ -257,9 +282,13 @@ void X3DImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     pScene->mRootNode->mParent = nullptr;
     pScene->mFlags |= AI_SCENE_FLAGS_ALLOW_SHARED;
 
-    pIOHandler->PushDirectory(slashPos == std::string::npos ? std::string() : pFile.substr(0, slashPos + 1));
-    ParseFile(pFile, pIOHandler);
-    pIOHandler->PopDirectory();
+    if (isReadFromMem) {
+        ParseFile(ss);
+    } else {
+        pIOHandler->PushDirectory(slashPos == std::string::npos ? std::string() : pFile.substr(0, slashPos + 1));
+        ParseFile(pFile, pIOHandler);
+        pIOHandler->PopDirectory();
+    }
 
     //search for root node element
 
diff --git a/code/AssetLib/X3D/X3DImporter.hpp b/code/AssetLib/X3D/X3DImporter.hpp
index 705a2472e..3d0aedc98 100644
--- a/code/AssetLib/X3D/X3DImporter.hpp
+++ b/code/AssetLib/X3D/X3DImporter.hpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -275,7 +275,9 @@ public:
     /// Also exception can be thrown if trouble will found.
     /// \param [in] pFile - name of file to be parsed.
     /// \param [in] pIOHandler - pointer to IO helper object.
-    void ParseFile(const std::string &pFile, IOSystem *pIOHandler);
+    void ParseFile(const std::string &file, IOSystem *pIOHandler);
+    void ParseFile(std::istream &myIstream);
+    void ParseFile(XmlParser &theParser);
     bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool pCheckSig) const;
     void InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler);
     const aiImporterDesc *GetInfo() const;
diff --git a/code/AssetLib/X3D/X3DImporter_Geometry2D.cpp b/code/AssetLib/X3D/X3DImporter_Geometry2D.cpp
index 240ff14a8..ee96c1423 100644
--- a/code/AssetLib/X3D/X3DImporter_Geometry2D.cpp
+++ b/code/AssetLib/X3D/X3DImporter_Geometry2D.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/X3D/X3DImporter_Geometry3D.cpp b/code/AssetLib/X3D/X3DImporter_Geometry3D.cpp
index b9fc2a4d8..e39a37b09 100644
--- a/code/AssetLib/X3D/X3DImporter_Geometry3D.cpp
+++ b/code/AssetLib/X3D/X3DImporter_Geometry3D.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2019, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/code/AssetLib/X3D/X3DImporter_Group.cpp b/code/AssetLib/X3D/X3DImporter_Group.cpp
index e7a2e917e..c2d7c562e 100644
--- a/code/AssetLib/X3D/X3DImporter_Group.cpp
+++ b/code/AssetLib/X3D/X3DImporter_Group.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2019, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/code/AssetLib/X3D/X3DImporter_Light.cpp b/code/AssetLib/X3D/X3DImporter_Light.cpp
index f1ed5e4cd..9d38b1468 100644
--- a/code/AssetLib/X3D/X3DImporter_Light.cpp
+++ b/code/AssetLib/X3D/X3DImporter_Light.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2019, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/code/AssetLib/X3D/X3DImporter_Macro.hpp b/code/AssetLib/X3D/X3DImporter_Macro.hpp
index 26b949cfa..030550616 100644
--- a/code/AssetLib/X3D/X3DImporter_Macro.hpp
+++ b/code/AssetLib/X3D/X3DImporter_Macro.hpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2019, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/code/AssetLib/X3D/X3DImporter_Metadata.cpp b/code/AssetLib/X3D/X3DImporter_Metadata.cpp
index 8e07d8bb8..36b493bd9 100644
--- a/code/AssetLib/X3D/X3DImporter_Metadata.cpp
+++ b/code/AssetLib/X3D/X3DImporter_Metadata.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2019, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/code/AssetLib/X3D/X3DImporter_Networking.cpp b/code/AssetLib/X3D/X3DImporter_Networking.cpp
index f2b471692..fe69a2701 100644
--- a/code/AssetLib/X3D/X3DImporter_Networking.cpp
+++ b/code/AssetLib/X3D/X3DImporter_Networking.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2019, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/code/AssetLib/X3D/X3DImporter_Node.hpp b/code/AssetLib/X3D/X3DImporter_Node.hpp
index 62bf857e4..54ac1a175 100644
--- a/code/AssetLib/X3D/X3DImporter_Node.hpp
+++ b/code/AssetLib/X3D/X3DImporter_Node.hpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2019, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/code/AssetLib/X3D/X3DImporter_Postprocess.cpp b/code/AssetLib/X3D/X3DImporter_Postprocess.cpp
index 87121ef5f..8517aab25 100644
--- a/code/AssetLib/X3D/X3DImporter_Postprocess.cpp
+++ b/code/AssetLib/X3D/X3DImporter_Postprocess.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2019, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -320,7 +319,7 @@ void X3DImporter::Postprocess_BuildMesh(const X3DNodeElementBase &pNodeElement,
         // at first search for <Coordinate> node and create mesh.
         for (std::list<X3DNodeElementBase *>::iterator ch_it = tnemesh.Children.begin(); ch_it != tnemesh.Children.end(); ++ch_it) {
             if ((*ch_it)->Type == X3DElemType::ENET_Coordinate) {
-                *pMesh = X3DGeoHelper::make_mesh(tnemesh.CoordIndex, ((X3DNodeElementCoordinate *)*ch_it)->Value);
+                *pMesh = X3DGeoHelper::make_line_mesh(tnemesh.CoordIndex, ((X3DNodeElementCoordinate *)*ch_it)->Value);
             }
         }
 
diff --git a/code/AssetLib/X3D/X3DImporter_Rendering.cpp b/code/AssetLib/X3D/X3DImporter_Rendering.cpp
index 66a30a916..c5b2d4de9 100644
--- a/code/AssetLib/X3D/X3DImporter_Rendering.cpp
+++ b/code/AssetLib/X3D/X3DImporter_Rendering.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2019, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/code/AssetLib/X3D/X3DImporter_Shape.cpp b/code/AssetLib/X3D/X3DImporter_Shape.cpp
index 1c472e14b..66cc59f1f 100644
--- a/code/AssetLib/X3D/X3DImporter_Shape.cpp
+++ b/code/AssetLib/X3D/X3DImporter_Shape.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2019, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/code/AssetLib/X3D/X3DImporter_Texturing.cpp b/code/AssetLib/X3D/X3DImporter_Texturing.cpp
index 32c1a90d7..067c55cae 100644
--- a/code/AssetLib/X3D/X3DImporter_Texturing.cpp
+++ b/code/AssetLib/X3D/X3DImporter_Texturing.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2019, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/code/AssetLib/XGL/XGLLoader.cpp b/code/AssetLib/XGL/XGLLoader.cpp
index 9efd5d628..0d73d5cb8 100644
--- a/code/AssetLib/XGL/XGLLoader.cpp
+++ b/code/AssetLib/XGL/XGLLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2023, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -249,7 +249,7 @@ aiNode *XGLImporter::ReadObject(XmlNode &node, TempScope &scope) {
 					for (size_t i = 0; i < newc - prev; ++i) {
 						meshes.push_back(static_cast<unsigned int>(i + prev));
 					}
-				} 
+				}
 			} else if (s == "mat") {
 				const uint32_t matId = ReadMaterial(child, scope);
                 if (matId == ErrorId) {
@@ -700,13 +700,14 @@ unsigned int XGLImporter::ReadIDAttr(XmlNode &node) {
 float XGLImporter::ReadFloat(XmlNode &node) {
     std::string v;
     XmlParser::getValueAsString(node, v);
-    const char *s = v.c_str(), *se;
-	if (!SkipSpaces(&s)) {
+    const char *s = v.c_str();
+    const char *end = v.c_str() + v.size();
+	if (!SkipSpaces(&s, end)) {
 		LogError("unexpected EOL, failed to parse index element");
 		return 0.f;
 	}
-	float t;
-	se = fast_atoreal_move(s, t);
+    float t{ 0.0f };
+	const char *se = fast_atoreal_move(s, t);
 	if (se == s) {
 		LogError("failed to read float text");
 		return 0.f;
@@ -720,7 +721,8 @@ unsigned int XGLImporter::ReadIndexFromText(XmlNode &node) {
     std::string v;
     XmlParser::getValueAsString(node, v);
     const char *s = v.c_str();
-	if (!SkipSpaces(&s)) {
+    const char *end = v.c_str() + v.size();
+    if (!SkipSpaces(&s, end)) {
 		LogError("unexpected EOL, failed to parse index element");
         return ErrorId;
 	}
@@ -741,16 +743,17 @@ aiVector2D XGLImporter::ReadVec2(XmlNode &node) {
     std::string val;
     XmlParser::getValueAsString(node, val);
     const char *s = val.c_str();
+    const char *end = val.c_str() + val.size();
     ai_real v[2] = {};
 	for (int i = 0; i < 2; ++i) {
-		if (!SkipSpaces(&s)) {
+		if (!SkipSpaces(&s, end)) {
 			LogError("unexpected EOL, failed to parse vec2");
 			return vec;
 		}
 
 		v[i] = fast_atof(&s);
 
-		SkipSpaces(&s);
+		SkipSpaces(&s, end);
 		if (i != 1 && *s != ',') {
 			LogError("expected comma, failed to parse vec2");
 			return vec;
@@ -769,14 +772,15 @@ aiVector3D XGLImporter::ReadVec3(XmlNode &node) {
     std::string v;
     XmlParser::getValueAsString(node, v);
 	const char *s = v.c_str();
+    const char *end = v.c_str() + v.size();
 	for (int i = 0; i < 3; ++i) {
-		if (!SkipSpaces(&s)) {
+		if (!SkipSpaces(&s, end)) {
 			LogError("unexpected EOL, failed to parse vec3");
 			return vec;
 		}
 		vec[i] = fast_atof(&s);
 
-		SkipSpaces(&s);
+		SkipSpaces(&s, end);
 		if (i != 2 && *s != ',') {
 			LogError("expected comma, failed to parse vec3");
 			return vec;
diff --git a/code/AssetLib/XGL/XGLLoader.h b/code/AssetLib/XGL/XGLLoader.h
index f620561d1..3e2420233 100644
--- a/code/AssetLib/XGL/XGLLoader.h
+++ b/code/AssetLib/XGL/XGLLoader.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/glTF/glTFAsset.h b/code/AssetLib/glTF/glTFAsset.h
index b5e6375ad..9fec70ea2 100644
--- a/code/AssetLib/glTF/glTFAsset.h
+++ b/code/AssetLib/glTF/glTFAsset.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -51,12 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF1_IMPORTER)
 
-#include "glTFCommon.h"
+#include "AssetLib/glTFCommon/glTFCommon.h"
 #include <assimp/Exceptional.h>
-#include <algorithm>
 #include <list>
-#include <map>
-#include <stdexcept>
 #include <string>
 #include <vector>
 
@@ -103,7 +100,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // clang-format on
 
-#include "AssetLib/glTF/glTFCommon.h"
+#include "AssetLib/glTFCommon/glTFCommon.h"
 
 namespace glTF {
 
diff --git a/code/AssetLib/glTF/glTFAsset.inl b/code/AssetLib/glTF/glTFAsset.inl
index eddbf5706..87a2dbfa1 100644
--- a/code/AssetLib/glTF/glTFAsset.inl
+++ b/code/AssetLib/glTF/glTFAsset.inl
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/glTF/glTFAssetWriter.h b/code/AssetLib/glTF/glTFAssetWriter.h
index 6dbc42420..d9412ff51 100644
--- a/code/AssetLib/glTF/glTFAssetWriter.h
+++ b/code/AssetLib/glTF/glTFAssetWriter.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/glTF/glTFAssetWriter.inl b/code/AssetLib/glTF/glTFAssetWriter.inl
index 2d80598ac..19c31df28 100644
--- a/code/AssetLib/glTF/glTFAssetWriter.inl
+++ b/code/AssetLib/glTF/glTFAssetWriter.inl
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/AssetLib/glTF/glTFExporter.cpp b/code/AssetLib/glTF/glTFExporter.cpp
index 91d88f1ae..16c0688db 100644
--- a/code/AssetLib/glTF/glTFExporter.cpp
+++ b/code/AssetLib/glTF/glTFExporter.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -56,6 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/Exporter.hpp>
 #include <assimp/material.h>
 #include <assimp/scene.h>
+#include <assimp/config.h>
 
 // Header files, standard library.
 #include <memory>
@@ -113,6 +113,10 @@ glTFExporter::glTFExporter(const char* filename, IOSystem* pIOSystem, const aiSc
 
     mAsset = std::make_shared<glTF::Asset>(pIOSystem);
 
+    configEpsilon = mProperties->GetPropertyFloat(
+        AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON,
+                (ai_real)AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON_DEFAULT);
+
     if (isBinary) {
         mAsset->SetAsBinary();
     }
@@ -824,7 +828,7 @@ unsigned int glTFExporter::ExportNodeHierarchy(const aiNode* n)
 {
     Ref<Node> node = mAsset->nodes.Create(mAsset->FindUniqueID(n->mName.C_Str(), "node"));
 
-    if (!n->mTransformation.IsIdentity()) {
+    if (!n->mTransformation.IsIdentity(configEpsilon)) {
         node->matrix.isPresent = true;
         CopyValue(n->mTransformation, node->matrix.value);
     }
@@ -851,7 +855,7 @@ unsigned int glTFExporter::ExportNode(const aiNode* n, Ref<Node>& parent)
 
     node->parent = parent;
 
-    if (!n->mTransformation.IsIdentity()) {
+    if (!n->mTransformation.IsIdentity(configEpsilon)) {
         node->matrix.isPresent = true;
         CopyValue(n->mTransformation, node->matrix.value);
     }
diff --git a/code/AssetLib/glTF/glTFExporter.h b/code/AssetLib/glTF/glTFExporter.h
index a52695402..59f24da93 100644
--- a/code/AssetLib/glTF/glTFExporter.h
+++ b/code/AssetLib/glTF/glTFExporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #if !defined(ASSIMP_BUILD_NO_GLTF_EXPORTER) && !defined(ASSIMP_BUILD_NO_GLTF1_EXPORTER)
 
 #include <assimp/material.h>
-#include <assimp/types.h>
+#include <assimp/defs.h>
 
 #include <map>
 #include <memory>
@@ -98,6 +98,8 @@ private:
 
     std::vector<unsigned char> mBodyData;
 
+    ai_real configEpsilon;
+
     void WriteBinaryData(IOStream *outfile, std::size_t sceneLength);
 
     void GetTexSampler(const aiMaterial *mat, glTF::TexProperty &prop);
diff --git a/code/AssetLib/glTF/glTFImporter.cpp b/code/AssetLib/glTF/glTFImporter.cpp
index cd8b7762d..901914da1 100644
--- a/code/AssetLib/glTF/glTFImporter.cpp
+++ b/code/AssetLib/glTF/glTFImporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -41,10 +41,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF1_IMPORTER)
 
-#include "AssetLib/glTF/glTFImporter.h"
-#include "AssetLib/glTF/glTFAsset.h"
+#include "glTFImporter.h"
+#include "glTFAsset.h"
 #if !defined(ASSIMP_BUILD_NO_EXPORT)
-#include "AssetLib/glTF/glTFAssetWriter.h"
+#   include "glTFAssetWriter.h"
 #endif
 #include "PostProcessing/MakeVerboseFormat.h"
 
@@ -55,7 +55,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/importerdesc.h>
 #include <assimp/scene.h>
 #include <assimp/DefaultLogger.hpp>
-#include <assimp/Importer.hpp>
 
 #include <memory>
 
@@ -67,7 +66,11 @@ static constexpr aiImporterDesc desc = {
     "",
     "",
     "",
-    aiImporterFlags_SupportTextFlavour | aiImporterFlags_SupportBinaryFlavour | aiImporterFlags_SupportCompressedFlavour | aiImporterFlags_LimitedSupport | aiImporterFlags_Experimental,
+    aiImporterFlags_SupportTextFlavour |
+        aiImporterFlags_SupportBinaryFlavour |
+        aiImporterFlags_SupportCompressedFlavour |
+        aiImporterFlags_LimitedSupport |
+        aiImporterFlags_Experimental,
     0,
     0,
     0,
@@ -80,14 +83,12 @@ glTFImporter::glTFImporter() :
     // empty
 }
 
-glTFImporter::~glTFImporter() = default;
-
 const aiImporterDesc *glTFImporter::GetInfo() const {
     return &desc;
 }
 
 bool glTFImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /* checkSig */) const {
-    glTF::Asset asset(pIOHandler);
+    Asset asset(pIOHandler);
     try {
         asset.Load(pFile,
                    CheckMagicToken(
@@ -99,41 +100,38 @@ bool glTFImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool
     }
 }
 
-inline void SetMaterialColorProperty(std::vector<int> &embeddedTexIdxs, Asset & /*r*/, glTF::TexProperty prop, aiMaterial *mat,
+inline void SetMaterialColorProperty(const std::vector<int> &embeddedTexIdxs, Asset &, TexProperty prop, aiMaterial *mat,
         aiTextureType texType, const char *pKey, unsigned int type, unsigned int idx) {
     if (prop.texture) {
         if (prop.texture->source) {
             aiString uri(prop.texture->source->uri);
 
-            int texIdx = embeddedTexIdxs[prop.texture->source.GetIndex()];
-            if (texIdx != -1) { // embedded
+            if (const int texIdx = embeddedTexIdxs[prop.texture->source.GetIndex()]; texIdx != -1) { // embedded
                 // setup texture reference string (copied from ColladaLoader::FindFilenameForEffectTexture)
                 uri.data[0] = '*';
-                uri.length = 1 + ASSIMP_itoa10(uri.data + 1, MAXLEN - 1, texIdx);
+                uri.length = 1 + ASSIMP_itoa10(uri.data + 1, AI_MAXLEN - 1, texIdx);
             }
 
             mat->AddProperty(&uri, _AI_MATKEY_TEXTURE_BASE, texType, 0);
         }
-    } else {
-        aiColor4D col;
-        CopyValue(prop.color, col);
-        mat->AddProperty(&col, 1, pKey, type, idx);
+        return;
     }
+
+    aiColor4D col;
+    CopyValue(prop.color, col);
+    mat->AddProperty(&col, 1, pKey, type, idx);
 }
 
-void glTFImporter::ImportMaterials(glTF::Asset &r) {
-    mScene->mNumMaterials = unsigned(r.materials.Size());
+void glTFImporter::ImportMaterials(Asset &r) {
+    mScene->mNumMaterials = static_cast<unsigned int>(r.materials.Size());
     mScene->mMaterials = new aiMaterial *[mScene->mNumMaterials];
 
     for (unsigned int i = 0; i < mScene->mNumMaterials; ++i) {
         aiMaterial *aimat = mScene->mMaterials[i] = new aiMaterial();
 
         Material &mat = r.materials[i];
-
-        /*if (!mat.name.empty())*/ {
-            aiString str(mat.id /*mat.name*/);
-            aimat->AddProperty(&str, AI_MATKEY_NAME);
-        }
+        aiString str(mat.id);
+        aimat->AddProperty(&str, AI_MATKEY_NAME);
 
         SetMaterialColorProperty(embeddedTexIdxs, r, mat.ambient, aimat, aiTextureType_AMBIENT, AI_MATKEY_COLOR_AMBIENT);
         SetMaterialColorProperty(embeddedTexIdxs, r, mat.diffuse, aimat, aiTextureType_DIFFUSE, AI_MATKEY_COLOR_DIFFUSE);
@@ -155,25 +153,26 @@ void glTFImporter::ImportMaterials(glTF::Asset &r) {
         mScene->mNumMaterials = 1;
         // Delete the array of length zero created above.
         delete[] mScene->mMaterials;
+        mScene->mMaterials = nullptr;
         mScene->mMaterials = new aiMaterial *[1];
         mScene->mMaterials[0] = new aiMaterial();
     }
 }
 
-static inline void SetFace(aiFace &face, int a) {
+static void SetFace(aiFace &face, int a) {
     face.mNumIndices = 1;
     face.mIndices = new unsigned int[1];
     face.mIndices[0] = a;
 }
 
-static inline void SetFace(aiFace &face, int a, int b) {
+static void SetFace(aiFace &face, int a, int b) {
     face.mNumIndices = 2;
     face.mIndices = new unsigned int[2];
     face.mIndices[0] = a;
     face.mIndices[1] = b;
 }
 
-static inline void SetFace(aiFace &face, int a, int b, int c) {
+static void SetFace(aiFace &face, int a, int b, int c) {
     face.mNumIndices = 3;
     face.mIndices = new unsigned int[3];
     face.mIndices[0] = a;
@@ -181,7 +180,7 @@ static inline void SetFace(aiFace &face, int a, int b, int c) {
     face.mIndices[2] = c;
 }
 
-static inline bool CheckValidFacesIndices(aiFace *faces, unsigned nFaces, unsigned nVerts) {
+static bool CheckValidFacesIndices(const aiFace *faces, unsigned nFaces, unsigned nVerts) {
     for (unsigned i = 0; i < nFaces; ++i) {
         for (unsigned j = 0; j < faces[i].mNumIndices; ++j) {
             unsigned idx = faces[i].mIndices[j];
@@ -192,7 +191,7 @@ static inline bool CheckValidFacesIndices(aiFace *faces, unsigned nFaces, unsign
     return true;
 }
 
-void glTFImporter::ImportMeshes(glTF::Asset &r) {
+void glTFImporter::ImportMeshes(Asset &r) {
     std::vector<aiMesh *> meshes;
 
     unsigned int k = 0;
@@ -230,10 +229,10 @@ void glTFImporter::ImportMeshes(glTF::Asset &r) {
         } // if(mesh.Extension.size() > 0)
 
         meshOffsets.push_back(k);
-        k += unsigned(mesh.primitives.size());
+        k += static_cast<unsigned>(mesh.primitives.size());
 
         for (unsigned int p = 0; p < mesh.primitives.size(); ++p) {
-            Mesh::Primitive &prim = mesh.primitives[p];
+            auto &[mode, attributes, indices, material] = mesh.primitives[p];
 
             aiMesh *aim = new aiMesh();
             meshes.push_back(aim);
@@ -242,10 +241,10 @@ void glTFImporter::ImportMeshes(glTF::Asset &r) {
             if (mesh.primitives.size() > 1) {
                 ai_uint32 &len = aim->mName.length;
                 aim->mName.data[len] = '-';
-                len += 1 + ASSIMP_itoa10(aim->mName.data + len + 1, unsigned(MAXLEN - len - 1), p);
+                len += 1 + ASSIMP_itoa10(aim->mName.data + len + 1, unsigned(AI_MAXLEN - len - 1), p);
             }
 
-            switch (prim.mode) {
+            switch (mode) {
             case PrimitiveMode_POINTS:
                 aim->mPrimitiveTypes |= aiPrimitiveType_POINT;
                 break;
@@ -263,7 +262,7 @@ void glTFImporter::ImportMeshes(glTF::Asset &r) {
                 break;
             }
 
-            Mesh::Primitive::Attributes &attr = prim.attributes;
+            Mesh::Primitive::Attributes &attr = attributes;
 
             if (attr.position.size() > 0 && attr.position[0]) {
                 aim->mNumVertices = attr.position[0]->count;
@@ -285,13 +284,13 @@ void glTFImporter::ImportMeshes(glTF::Asset &r) {
             aiFace *faces = nullptr;
             unsigned int nFaces = 0;
 
-            if (prim.indices) {
-                unsigned int count = prim.indices->count;
+            if (indices) {
+                unsigned int count = indices->count;
 
-                Accessor::Indexer data = prim.indices->GetIndexer();
+                Accessor::Indexer data = indices->GetIndexer();
                 ai_assert(data.IsValid());
 
-                switch (prim.mode) {
+                switch (mode) {
                 case PrimitiveMode_POINTS: {
                     nFaces = count;
                     faces = new aiFace[nFaces];
@@ -316,13 +315,13 @@ void glTFImporter::ImportMeshes(glTF::Asset &r) {
 
                 case PrimitiveMode_LINE_LOOP:
                 case PrimitiveMode_LINE_STRIP: {
-                    nFaces = count - ((prim.mode == PrimitiveMode_LINE_STRIP) ? 1 : 0);
+                    nFaces = count - ((mode == PrimitiveMode_LINE_STRIP) ? 1 : 0);
                     faces = new aiFace[nFaces];
                     SetFace(faces[0], data.GetUInt(0), data.GetUInt(1));
                     for (unsigned int i = 2; i < count; ++i) {
                         SetFace(faces[i - 1], faces[i - 2].mIndices[1], data.GetUInt(i));
                     }
-                    if (prim.mode == PrimitiveMode_LINE_LOOP) { // close the loop
+                    if (mode == PrimitiveMode_LINE_LOOP) { // close the loop
                         SetFace(faces[count - 1], faces[count - 2].mIndices[1], faces[0].mIndices[0]);
                     }
                     break;
@@ -363,7 +362,7 @@ void glTFImporter::ImportMeshes(glTF::Asset &r) {
                 // use the already determined count as it includes checks
                 unsigned int count = aim->mNumVertices;
 
-                switch (prim.mode) {
+                switch (mode) {
                 case PrimitiveMode_POINTS: {
                     nFaces = count;
                     faces = new aiFace[nFaces];
@@ -388,13 +387,13 @@ void glTFImporter::ImportMeshes(glTF::Asset &r) {
 
                 case PrimitiveMode_LINE_LOOP:
                 case PrimitiveMode_LINE_STRIP: {
-                    nFaces = count - ((prim.mode == PrimitiveMode_LINE_STRIP) ? 1 : 0);
+                    nFaces = count - ((mode == PrimitiveMode_LINE_STRIP) ? 1 : 0);
                     faces = new aiFace[nFaces];
                     SetFace(faces[0], 0, 1);
                     for (unsigned int i = 2; i < count; ++i) {
                         SetFace(faces[i - 1], faces[i - 2].mIndices[1], i);
                     }
-                    if (prim.mode == PrimitiveMode_LINE_LOOP) { // close the loop
+                    if (mode == PrimitiveMode_LINE_LOOP) { // close the loop
                         SetFace(faces[count - 1], faces[count - 2].mIndices[1], faces[0].mIndices[0]);
                     }
                     break;
@@ -442,8 +441,8 @@ void glTFImporter::ImportMeshes(glTF::Asset &r) {
                 }
             }
 
-            if (prim.material) {
-                aim->mMaterialIndex = prim.material.GetIndex();
+            if (material) {
+                aim->mMaterialIndex = material.GetIndex();
             }
         }
     }
@@ -453,7 +452,7 @@ void glTFImporter::ImportMeshes(glTF::Asset &r) {
     CopyVector(meshes, mScene->mMeshes, mScene->mNumMeshes);
 }
 
-void glTFImporter::ImportCameras(glTF::Asset &r) {
+void glTFImporter::ImportCameras(Asset &r) {
     if (!r.cameras.Size()) {
         return;
     }
@@ -482,7 +481,7 @@ void glTFImporter::ImportCameras(glTF::Asset &r) {
     }
 }
 
-void glTFImporter::ImportLights(glTF::Asset &r) {
+void glTFImporter::ImportLights(Asset &r) {
     if (!r.lights.Size()) return;
 
     mScene->mNumLights = r.lights.Size();
@@ -516,7 +515,7 @@ void glTFImporter::ImportLights(glTF::Asset &r) {
         CopyValue(l.color, ail->mColorSpecular);
 
         ail->mAngleOuterCone = l.falloffAngle;
-        ail->mAngleInnerCone = l.falloffExponent; // TODO fix this, it does not look right at all
+        ail->mAngleInnerCone = l.falloffAngle * (1.0f - 1.0f / (1.0f + l.falloffExponent)); 
 
         ail->mAttenuationConstant = l.constantAttenuation;
         ail->mAttenuationLinear = l.linearAttenuation;
@@ -524,7 +523,7 @@ void glTFImporter::ImportLights(glTF::Asset &r) {
     }
 }
 
-aiNode *ImportNode(aiScene *pScene, glTF::Asset &r, std::vector<unsigned int> &meshOffsets, glTF::Ref<glTF::Node> &ptr) {
+aiNode *ImportNode(aiScene *pScene, Asset &r, std::vector<unsigned int> &meshOffsets, Ref<Node> &ptr) {
     Node &node = *ptr;
 
     aiNode *ainode = new aiNode(node.id);
@@ -570,7 +569,7 @@ aiNode *ImportNode(aiScene *pScene, glTF::Asset &r, std::vector<unsigned int> &m
     if (!node.meshes.empty()) {
         int count = 0;
         for (size_t i = 0; i < node.meshes.size(); ++i) {
-            int idx = node.meshes[i].GetIndex();
+            const int idx = node.meshes[i].GetIndex();
             count += meshOffsets[idx + 1] - meshOffsets[idx];
         }
 
@@ -597,13 +596,13 @@ aiNode *ImportNode(aiScene *pScene, glTF::Asset &r, std::vector<unsigned int> &m
     return ainode;
 }
 
-void glTFImporter::ImportNodes(glTF::Asset &r) {
+void glTFImporter::ImportNodes(Asset &r) {
     if (!r.scene) return;
 
     std::vector<Ref<Node>> rootNodes = r.scene->nodes;
 
     // The root nodes
-    unsigned int numRootNodes = unsigned(rootNodes.size());
+    unsigned int numRootNodes = static_cast<unsigned>(rootNodes.size());
     if (numRootNodes == 1) { // a single root node: use it
         mScene->mRootNode = ImportNode(mScene, r, meshOffsets, rootNodes[0]);
     } else if (numRootNodes > 1) { // more than one root node: create a fake root
@@ -616,13 +615,9 @@ void glTFImporter::ImportNodes(glTF::Asset &r) {
         }
         mScene->mRootNode = root;
     }
-
-    //if (!mScene->mRootNode) {
-    //  mScene->mRootNode = new aiNode("EMPTY");
-    //}
 }
 
-void glTFImporter::ImportEmbeddedTextures(glTF::Asset &r) {
+void glTFImporter::ImportEmbeddedTextures(Asset &r) {
     embeddedTexIdxs.resize(r.images.Size(), -1);
 
     int numEmbeddedTexs = 0;
@@ -631,8 +626,9 @@ void glTFImporter::ImportEmbeddedTextures(glTF::Asset &r) {
             numEmbeddedTexs += 1;
     }
 
-    if (numEmbeddedTexs == 0)
+    if (numEmbeddedTexs == 0) {
         return;
+    }
 
     mScene->mTextures = new aiTexture *[numEmbeddedTexs];
 
@@ -646,7 +642,7 @@ void glTFImporter::ImportEmbeddedTextures(glTF::Asset &r) {
 
         aiTexture *tex = mScene->mTextures[idx] = new aiTexture();
 
-        size_t length = img.GetDataLength();
+        const size_t length = img.GetDataLength();
         void *data = img.StealData();
 
         tex->mFilename = img.name;
@@ -657,19 +653,22 @@ void glTFImporter::ImportEmbeddedTextures(glTF::Asset &r) {
         if (!img.mimeType.empty()) {
             const char *ext = strchr(img.mimeType.c_str(), '/') + 1;
             if (ext) {
-                if (strcmp(ext, "jpeg") == 0) ext = "jpg";
-
-                size_t len = strlen(ext);
-                if (len <= 3) {
-                    strcpy(tex->achFormatHint, ext);
+                if (strncmp(ext, "jpeg", 4) == 0) {
+                    ext = "jpg";
                 }
+
+                tex->achFormatHint[3] = '\0';
+                size_t len = strlen(ext);
+                if (len > 3) len = 3;
+                memcpy(tex->achFormatHint, ext, len);
             }
         }
     }
 }
 
-void glTFImporter::ImportCommonMetadata(glTF::Asset &a) {
+void glTFImporter::ImportCommonMetadata(Asset &a) {
     ai_assert(mScene->mMetaData == nullptr);
+
     const bool hasVersion = !a.asset.version.empty();
     const bool hasGenerator = !a.asset.generator.empty();
     const bool hasCopyright = !a.asset.copyright.empty();
@@ -695,7 +694,7 @@ void glTFImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOS
     this->mScene = pScene;
 
     // read the asset file
-    glTF::Asset asset(pIOHandler);
+    Asset asset(pIOHandler);
     asset.Load(pFile,
                CheckMagicToken(
                    pIOHandler, pFile, AI_GLB_MAGIC_NUMBER, 1, 0,
diff --git a/code/AssetLib/glTF/glTFImporter.h b/code/AssetLib/glTF/glTFImporter.h
index 529da53cc..23082f1d0 100644
--- a/code/AssetLib/glTF/glTFImporter.h
+++ b/code/AssetLib/glTF/glTFImporter.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -62,7 +61,7 @@ namespace Assimp {
 class glTFImporter : public BaseImporter {
 public:
     glTFImporter();
-    ~glTFImporter() override;
+    ~glTFImporter() override = default;
     bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const override;
 
 protected:
diff --git a/code/AssetLib/glTF2/glTF2Asset.h b/code/AssetLib/glTF2/glTF2Asset.h
index 3ae40f07e..33bb30688 100644
--- a/code/AssetLib/glTF2/glTF2Asset.h
+++ b/code/AssetLib/glTF2/glTF2Asset.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -53,6 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *   KHR_materials_volume full
  *   KHR_materials_ior full
  *   KHR_materials_emissive_strength full
+ *   KHR_materials_anisotropy full
  */
 #ifndef GLTF2ASSET_H_INC
 #define GLTF2ASSET_H_INC
@@ -118,7 +119,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/material.h>
 #include <assimp/GltfMaterial.h>
 
-#include "AssetLib/glTF/glTFCommon.h"
+#include "AssetLib/glTFCommon/glTFCommon.h"
 
 namespace glTF2 {
 
@@ -547,7 +548,7 @@ struct BufferView : public Object {
     BufferViewTarget target; //! The target that the WebGL buffer should be bound to.
 
     void Read(Value &obj, Asset &r);
-    uint8_t *GetPointer(size_t accOffset);
+    uint8_t *GetPointerAndTailSize(size_t accOffset, size_t& outTailSize);
 };
 
 //! A typed view into a BufferView. A BufferView contains raw binary data.
@@ -629,7 +630,7 @@ struct Accessor : public Object {
 
         std::vector<uint8_t> data; //!< Actual data, which may be defaulted to an array of zeros or the original data, with the sparse buffer view applied on top of it.
 
-        void PopulateData(size_t numBytes, uint8_t *bytes);
+        void PopulateData(size_t numBytes, const uint8_t *bytes);
         void PatchData(unsigned int elementSize);
     };
 };
@@ -720,7 +721,7 @@ const vec4 defaultBaseColor = { 1, 1, 1, 1 };
 const vec3 defaultEmissiveFactor = { 0, 0, 0 };
 const vec4 defaultDiffuseFactor = { 1, 1, 1, 1 };
 const vec3 defaultSpecularFactor = { 1, 1, 1 };
-const vec3 defaultSpecularColorFactor = { 0, 0, 0 };
+const vec3 defaultSpecularColorFactor = { 1, 1, 1 };
 const vec3 defaultSheenFactor = { 0, 0, 0 };
 const vec3 defaultAttenuationColor = { 1, 1, 1 };
 
@@ -821,6 +822,15 @@ struct MaterialEmissiveStrength {
     void SetDefaults();
 };
 
+struct MaterialAnisotropy {
+    float anisotropyStrength = 0.f;
+    float anisotropyRotation = 0.f;
+    TextureInfo anisotropyTexture;
+
+    MaterialAnisotropy() { SetDefaults(); }
+    void SetDefaults();
+};
+
 //! The material appearance of a primitive.
 struct Material : public Object {
     //PBR metallic roughness properties
@@ -859,6 +869,9 @@ struct Material : public Object {
     //extension: KHR_materials_emissive_strength
     Nullable<MaterialEmissiveStrength> materialEmissiveStrength;
 
+    //extension: KHR_materials_anisotropy
+    Nullable<MaterialAnisotropy> materialAnisotropy;
+
     //extension: KHR_materials_unlit
     bool unlit;
 
@@ -1133,22 +1146,24 @@ public:
         bool KHR_materials_volume;
         bool KHR_materials_ior;
         bool KHR_materials_emissive_strength;
+        bool KHR_materials_anisotropy;
         bool KHR_draco_mesh_compression;
         bool FB_ngon_encoding;
         bool KHR_texture_basisu;
 
         Extensions() :
-                KHR_materials_pbrSpecularGlossiness(false), 
-                KHR_materials_specular(false), 
-                KHR_materials_unlit(false), 
-                KHR_lights_punctual(false), 
-                KHR_texture_transform(false), 
-                KHR_materials_sheen(false), 
-                KHR_materials_clearcoat(false), 
-                KHR_materials_transmission(false), 
+                KHR_materials_pbrSpecularGlossiness(false),
+                KHR_materials_specular(false),
+                KHR_materials_unlit(false),
+                KHR_lights_punctual(false),
+                KHR_texture_transform(false),
+                KHR_materials_sheen(false),
+                KHR_materials_clearcoat(false),
+                KHR_materials_transmission(false),
                 KHR_materials_volume(false),
                 KHR_materials_ior(false),
                 KHR_materials_emissive_strength(false),
+                KHR_materials_anisotropy(false),
                 KHR_draco_mesh_compression(false),
                 FB_ngon_encoding(false),
                 KHR_texture_basisu(false) {
@@ -1252,6 +1267,7 @@ private:
     size_t mBodyOffset;
     size_t mBodyLength;
     IdMap mUsedIds;
+    std::map<std::string, int, std::less<>> mUsedNamesMap;
     Ref<Buffer> mBodyBuffer;
 };
 
diff --git a/code/AssetLib/glTF2/glTF2Asset.inl b/code/AssetLib/glTF2/glTF2Asset.inl
index 5781a4be6..a29ba205a 100644
--- a/code/AssetLib/glTF2/glTF2Asset.inl
+++ b/code/AssetLib/glTF2/glTF2Asset.inl
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#include "AssetLib/glTF/glTFCommon.h"
+#include "AssetLib/glTFCommon/glTFCommon.h"
 
 #include <assimp/MemoryIOWrapper.h>
 #include <assimp/StringUtils.h>
@@ -87,6 +87,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Assimp;
 
 namespace glTF2 {
+
 using glTFCommon::FindStringInContext;
 using glTFCommon::FindNumberInContext;
 using glTFCommon::FindUIntInContext;
@@ -294,6 +295,8 @@ inline void SetDecodedIndexBuffer_Draco(const draco::Mesh &dracoMesh, Mesh::Prim
     // Usually uint32_t but shouldn't assume
     if (sizeof(dracoMesh.face(draco::FaceIndex(0))[0]) == componentBytes) {
         memcpy(decodedIndexBuffer->GetPointer(), &dracoMesh.face(draco::FaceIndex(0))[0], decodedIndexBuffer->byteLength);
+        // Assign this alternate data buffer to the accessor
+        prim.indices->decodedBuffer.swap(decodedIndexBuffer);
         return;
     }
 
@@ -785,12 +788,14 @@ inline void BufferView::Read(Value &obj, Asset &r) {
     }
 }
 
-inline uint8_t *BufferView::GetPointer(size_t accOffset) {
+inline uint8_t *BufferView::GetPointerAndTailSize(size_t accOffset, size_t& outTailSize) {
     if (!buffer) {
+        outTailSize = 0;
         return nullptr;
     }
-    uint8_t *basePtr = buffer->GetPointer();
+    uint8_t * const basePtr = buffer->GetPointer();
     if (!basePtr) {
+        outTailSize = 0;
         return nullptr;
     }
 
@@ -799,17 +804,25 @@ inline uint8_t *BufferView::GetPointer(size_t accOffset) {
         const size_t begin = buffer->EncodedRegion_Current->Offset;
         const size_t end = begin + buffer->EncodedRegion_Current->DecodedData_Length;
         if ((offset >= begin) && (offset < end)) {
+            outTailSize = end - offset;
             return &buffer->EncodedRegion_Current->DecodedData[offset - begin];
         }
     }
 
+    if (offset >= buffer->byteLength)
+    {
+        outTailSize = 0;
+        return nullptr;
+    }
+
+    outTailSize = buffer->byteLength - offset;
     return basePtr + offset;
 }
 
 //
 // struct Accessor
 //
-inline void Accessor::Sparse::PopulateData(size_t numBytes, uint8_t *bytes) {
+inline void Accessor::Sparse::PopulateData(size_t numBytes, const uint8_t *bytes) {
     if (bytes) {
         data.assign(bytes, bytes + numBytes);
     } else {
@@ -818,11 +831,21 @@ inline void Accessor::Sparse::PopulateData(size_t numBytes, uint8_t *bytes) {
 }
 
 inline void Accessor::Sparse::PatchData(unsigned int elementSize) {
-    uint8_t *pIndices = indices->GetPointer(indicesByteOffset);
+    size_t indicesTailDataSize;
+    uint8_t *pIndices = indices->GetPointerAndTailSize(indicesByteOffset, indicesTailDataSize);
     const unsigned int indexSize = int(ComponentTypeSize(indicesType));
     uint8_t *indicesEnd = pIndices + count * indexSize;
 
-    uint8_t *pValues = values->GetPointer(valuesByteOffset);
+    if ((uint64_t)indicesEnd > (uint64_t)pIndices + indicesTailDataSize) {
+        throw DeadlyImportError("Invalid sparse accessor. Indices outside allocated memory.");
+    }
+
+    size_t valuesTailDataSize;
+    uint8_t* pValues = values->GetPointerAndTailSize(valuesByteOffset, valuesTailDataSize);
+
+    if (elementSize * count > valuesTailDataSize) {
+        throw DeadlyImportError("Invalid sparse accessor. Indices outside allocated memory.");
+    }
     while (pIndices != indicesEnd) {
         size_t offset;
         switch (indicesType) {
@@ -894,6 +917,9 @@ inline void Accessor::Read(Value &obj, Asset &r) {
         if (Value *indicesValue = FindObject(*sparseValue, "indices")) {
             //indices bufferView
             Value *indiceViewID = FindUInt(*indicesValue, "bufferView");
+            if (!indiceViewID) {
+                throw DeadlyImportError("A bufferView value is required, when reading ", id.c_str(), name.empty() ? "" : " (" + name + ")");
+            }
             sparse->indices = r.bufferViews.Retrieve(indiceViewID->GetUint());
             //indices byteOffset
             sparse->indicesByteOffset = MemberOrDefault(*indicesValue, "byteOffset", size_t(0));
@@ -909,6 +935,9 @@ inline void Accessor::Read(Value &obj, Asset &r) {
         if (Value *valuesValue = FindObject(*sparseValue, "values")) {
             //value bufferView
             Value *valueViewID = FindUInt(*valuesValue, "bufferView");
+            if (!valueViewID) {
+                throw DeadlyImportError("A bufferView value is required, when reading ", id.c_str(), name.empty() ? "" : " (" + name + ")");
+            }
             sparse->values = r.bufferViews.Retrieve(valueViewID->GetUint());
             //value byteOffset
             sparse->valuesByteOffset = MemberOrDefault(*valuesValue, "byteOffset", size_t(0));
@@ -918,7 +947,17 @@ inline void Accessor::Read(Value &obj, Asset &r) {
 
         const unsigned int elementSize = GetElementSize();
         const size_t dataSize = count * elementSize;
-        sparse->PopulateData(dataSize, bufferView ? bufferView->GetPointer(byteOffset) : nullptr);
+        if (bufferView) {
+            size_t bufferViewTailSize;
+            const uint8_t* bufferViewPointer = bufferView->GetPointerAndTailSize(byteOffset, bufferViewTailSize);
+            if (dataSize > bufferViewTailSize) {
+                throw DeadlyImportError("Invalid buffer when reading ", id.c_str(), name.empty() ? "" : " (" + name + ")");
+            }
+            sparse->PopulateData(dataSize, bufferViewPointer);
+        }
+        else {
+            sparse->PopulateData(dataSize, nullptr);
+        }
         sparse->PatchData(elementSize);
     }
 }
@@ -1000,10 +1039,10 @@ size_t Accessor::ExtractData(T *&outData, const std::vector<unsigned int> *remap
     outData = new T[usedCount];
 
     if (remappingIndices != nullptr) {
-        const unsigned int maxIndex = static_cast<unsigned int>(maxSize / stride - 1);
+        const unsigned int maxIndexCount = static_cast<unsigned int>(maxSize / stride);
         for (size_t i = 0; i < usedCount; ++i) {
             size_t srcIdx = (*remappingIndices)[i];
-            if (srcIdx > maxIndex) {
+            if (srcIdx >= maxIndexCount) {
                 throw DeadlyImportError("GLTF: index*stride ", (srcIdx * stride), " > maxSize ", maxSize, " in ", getContextForErrorMessages(id, name));
             }
             memcpy(outData + i, data + srcIdx * stride, elemSize);
@@ -1181,6 +1220,17 @@ inline void Texture::Read(Value &obj, Asset &r) {
     if (Value *samplerVal = FindUInt(obj, "sampler")) {
         sampler = r.samplers.Retrieve(samplerVal->GetUint());
     }
+
+    if (Value *extensions = FindObject(obj, "extensions")) {
+        if (r.extensionsUsed.KHR_texture_basisu) {
+            if (Value *curBasisU = FindObject(*extensions, "KHR_texture_basisu")) {
+
+                if (Value *sourceVal = FindUInt(*curBasisU, "source")) {
+                    source = r.images.Retrieve(sourceVal->GetUint());
+                }
+            }
+        }
+    }
 }
 
 void Material::SetTextureProperties(Asset &r, Value *prop, TextureInfo &out) {
@@ -1278,7 +1328,7 @@ inline void Material::Read(Value &material, Asset &r) {
                 this->pbrSpecularGlossiness = Nullable<PbrSpecularGlossiness>(pbrSG);
             }
         }
-        
+
         if (r.extensionsUsed.KHR_materials_specular) {
             if (Value *curMatSpecular = FindObject(*extensions, "KHR_materials_specular")) {
                 MaterialSpecular specular;
@@ -1365,6 +1415,18 @@ inline void Material::Read(Value &material, Asset &r) {
             }
         }
 
+        if (r.extensionsUsed.KHR_materials_anisotropy) {
+            if (Value *curMaterialAnisotropy = FindObject(*extensions, "KHR_materials_anisotropy")) {
+                MaterialAnisotropy anisotropy;
+
+                ReadMember(*curMaterialAnisotropy, "anisotropyStrength", anisotropy.anisotropyStrength);
+                ReadMember(*curMaterialAnisotropy, "anisotropyRotation", anisotropy.anisotropyRotation);
+                ReadTextureProperty(r, *curMaterialAnisotropy, "anisotropyTexture", anisotropy.anisotropyTexture);
+
+                this->materialAnisotropy = Nullable<MaterialAnisotropy>(anisotropy);
+            }
+        }
+
         unlit = nullptr != FindObject(*extensions, "KHR_materials_unlit");
     }
 }
@@ -1392,7 +1454,7 @@ inline void PbrSpecularGlossiness::SetDefaults() {
 inline void MaterialSpecular::SetDefaults() {
     //KHR_materials_specular properties
     SetVector(specularColorFactor, defaultSpecularColorFactor);
-    specularFactor = 0.f;
+    specularFactor = 1.f;
 }
 
 inline void MaterialSheen::SetDefaults() {
@@ -1404,7 +1466,7 @@ inline void MaterialSheen::SetDefaults() {
 inline void MaterialVolume::SetDefaults() {
     //KHR_materials_volume properties
     thicknessFactor = 0.f;
-    attenuationDistance = INFINITY;
+    attenuationDistance = std::numeric_limits<float>::infinity();
     SetVector(attenuationColor, defaultAttenuationColor);
 }
 
@@ -1418,6 +1480,12 @@ inline void MaterialEmissiveStrength::SetDefaults() {
     emissiveStrength = 0.f;
 }
 
+inline void MaterialAnisotropy::SetDefaults() {
+    //KHR_materials_anisotropy properties
+    anisotropyStrength = 0.f;
+    anisotropyRotation = 0.f;
+}
+
 inline void Mesh::Read(Value &pJSON_Object, Asset &pAsset_Root) {
     Value *curName = FindMember(pJSON_Object, "name");
     if (nullptr != curName && curName->IsString()) {
@@ -2007,6 +2075,12 @@ inline void Asset::Load(const std::string &pFile, bool isBinary)
         mDicts[i]->AttachToDocument(doc);
     }
 
+    // Read the "extensions" property, then add it to each scene's metadata.
+    CustomExtension customExtensions;
+    if (Value *extensionsObject = FindObject(doc, "extensions")) {
+        customExtensions = glTF2::ReadExtensions("extensions", *extensionsObject);
+    }
+
     // Read the "scene" property, which specifies which scene to load
     // and recursively load everything referenced by it
     unsigned int sceneIndex = 0;
@@ -2018,6 +2092,8 @@ inline void Asset::Load(const std::string &pFile, bool isBinary)
     if (Value *scenesArray = FindArray(doc, "scenes")) {
         if (sceneIndex < scenesArray->Size()) {
             this->scene = scenes.Retrieve(sceneIndex);
+
+            this->scene->customExtensions = customExtensions;
         }
     }
 
@@ -2080,6 +2156,7 @@ inline void Asset::ReadExtensionsRequired(Document &doc) {
     }
 
     CHECK_REQUIRED_EXT(KHR_draco_mesh_compression);
+    CHECK_REQUIRED_EXT(KHR_texture_basisu);
 
 #undef CHECK_REQUIRED_EXT
 }
@@ -2107,6 +2184,7 @@ inline void Asset::ReadExtensionsUsed(Document &doc) {
     CHECK_EXT(KHR_materials_volume);
     CHECK_EXT(KHR_materials_ior);
     CHECK_EXT(KHR_materials_emissive_strength);
+    CHECK_EXT(KHR_materials_anisotropy);
     CHECK_EXT(KHR_draco_mesh_compression);
     CHECK_EXT(KHR_texture_basisu);
 
@@ -2130,8 +2208,10 @@ inline std::string Asset::FindUniqueID(const std::string &str, const char *suffi
     std::string id = str;
 
     if (!id.empty()) {
-        if (mUsedIds.find(id) == mUsedIds.end())
+        if (mUsedIds.find(id) == mUsedIds.end()){
+            mUsedNamesMap[id] = 0;
             return id;
+        }
 
         id += "_";
     }
@@ -2140,17 +2220,13 @@ inline std::string Asset::FindUniqueID(const std::string &str, const char *suffi
 
     Asset::IdMap::iterator it = mUsedIds.find(id);
     if (it == mUsedIds.end()) {
+        mUsedNamesMap[id] = 0;
         return id;
     }
 
-    std::vector<char> buffer;
-    buffer.resize(id.size() + 16);
-    int offset = ai_snprintf(buffer.data(), buffer.size(), "%s_", id.c_str());
-    for (int i = 0; it != mUsedIds.end(); ++i) {
-        ai_snprintf(buffer.data() + offset, buffer.size() - offset, "%d", i);
-        id = buffer.data();
-        it = mUsedIds.find(id);
-    }
+    auto key = id;
+    id += "_" + std::to_string(mUsedNamesMap[key]);
+    mUsedNamesMap[key] = mUsedNamesMap[key] + 1;
 
     return id;
 }
diff --git a/code/AssetLib/glTF2/glTF2AssetWriter.h b/code/AssetLib/glTF2/glTF2AssetWriter.h
index 4e5177b4e..86367bea0 100644
--- a/code/AssetLib/glTF2/glTF2AssetWriter.h
+++ b/code/AssetLib/glTF2/glTF2AssetWriter.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -53,6 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *   KHR_materials_volume: full
  *   KHR_materials_ior: full
  *   KHR_materials_emissive_strength: full
+ *   KHR_materials_anisotropy: full
  */
 #ifndef GLTF2ASSETWRITER_H_INC
 #define GLTF2ASSETWRITER_H_INC
diff --git a/code/AssetLib/glTF2/glTF2AssetWriter.inl b/code/AssetLib/glTF2/glTF2AssetWriter.inl
index 30f2580a2..ebda71192 100644
--- a/code/AssetLib/glTF2/glTF2AssetWriter.inl
+++ b/code/AssetLib/glTF2/glTF2AssetWriter.inl
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -426,13 +426,14 @@ namespace glTF2 {
 
             if (specular.specularFactor != 0.0f) {
                 WriteFloat(materialSpecular, specular.specularFactor, "specularFactor", w.mAl);
-                WriteTex(materialSpecular, specular.specularTexture, "specularTexture", w.mAl);
             }
             if (specular.specularColorFactor[0] != defaultSpecularColorFactor[0] && specular.specularColorFactor[1] != defaultSpecularColorFactor[1] && specular.specularColorFactor[2] != defaultSpecularColorFactor[2]) {
                 WriteVec(materialSpecular, specular.specularColorFactor, "specularColorFactor", w.mAl);
-                WriteTex(materialSpecular, specular.specularColorTexture, "specularColorTexture", w.mAl);
             }
 
+            WriteTex(materialSpecular, specular.specularTexture, "specularTexture", w.mAl);
+            WriteTex(materialSpecular, specular.specularColorTexture, "specularColorTexture", w.mAl);
+
             if (!materialSpecular.ObjectEmpty()) {
                 exts.AddMember("KHR_materials_specular", materialSpecular, w.mAl);
             }
@@ -506,7 +507,7 @@ namespace glTF2 {
 
             WriteTex(materialVolume, volume.thicknessTexture, "thicknessTexture", w.mAl);
 
-            if (volume.attenuationDistance != INFINITY) {
+            if (volume.attenuationDistance != std::numeric_limits<float>::infinity()) {
                 WriteFloat(materialVolume, volume.attenuationDistance, "attenuationDistance", w.mAl);
             }
 
@@ -545,6 +546,26 @@ namespace glTF2 {
             }
         }
 
+        if (m.materialAnisotropy.isPresent) {
+            Value materialAnisotropy(rapidjson::Type::kObjectType);
+
+            MaterialAnisotropy &anisotropy = m.materialAnisotropy.value;
+
+            if (anisotropy.anisotropyStrength != 0.f) {
+                WriteFloat(materialAnisotropy, anisotropy.anisotropyStrength, "anisotropyStrength", w.mAl);
+            }
+
+            if (anisotropy.anisotropyRotation != 0.f) {
+                WriteFloat(materialAnisotropy, anisotropy.anisotropyRotation, "anisotropyRotation", w.mAl);
+            }
+
+            WriteTex(materialAnisotropy, anisotropy.anisotropyTexture, "anisotropyTexture", w.mAl);
+
+            if (!materialAnisotropy.ObjectEmpty()) {
+                exts.AddMember("KHR_materials_anisotropy", materialAnisotropy, w.mAl);
+            }
+        }
+
         if (!exts.ObjectEmpty()) {
             obj.AddMember("extensions", exts, w.mAl);
         }
@@ -607,6 +628,7 @@ namespace glTF2 {
                 {
                     WriteAttrs(w, attrs, p.attributes.position, "POSITION");
                     WriteAttrs(w, attrs, p.attributes.normal, "NORMAL");
+                    WriteAttrs(w, attrs, p.attributes.tangent, "TANGENT");
                     WriteAttrs(w, attrs, p.attributes.texcoord, "TEXCOORD", true);
                     WriteAttrs(w, attrs, p.attributes.color, "COLOR", true);
                     WriteAttrs(w, attrs, p.attributes.joint, "JOINTS", true);
@@ -688,7 +710,7 @@ namespace glTF2 {
         for (auto const &value : extras.mValues) {
             WriteExtrasValue(extrasNode, value, w);
         }
-        
+
         obj.AddMember("extras", extrasNode, w.mAl);
     }
 
@@ -939,7 +961,7 @@ namespace glTF2 {
             if (outfile->Write(bodyBuffer->GetPointer(), 1, bodyBuffer->byteLength) != bodyBuffer->byteLength) {
                 throw DeadlyExportError("Failed to write body data!");
             }
-            if (curPaddingLength && outfile->Write(&padding, 1, paddingLength) != paddingLength) {
+            if (curPaddingLength && outfile->Write(&padding, 1, curPaddingLength) != curPaddingLength) {
                 throw DeadlyExportError("Failed to write body data padding!");
             }
         }
@@ -1016,6 +1038,10 @@ namespace glTF2 {
                 exts.PushBack(StringRef("KHR_materials_emissive_strength"), mAl);
             }
 
+            if (this->mAsset.extensionsUsed.KHR_materials_anisotropy) {
+                exts.PushBack(StringRef("KHR_materials_anisotropy"), mAl);
+            }
+
             if (this->mAsset.extensionsUsed.FB_ngon_encoding) {
                 exts.PushBack(StringRef("FB_ngon_encoding"), mAl);
             }
diff --git a/code/AssetLib/glTF2/glTF2Exporter.cpp b/code/AssetLib/glTF2/glTF2Exporter.cpp
index 18a6ae2f4..660d52b9f 100644
--- a/code/AssetLib/glTF2/glTF2Exporter.cpp
+++ b/code/AssetLib/glTF2/glTF2Exporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -55,11 +55,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/version.h>
 #include <assimp/Exporter.hpp>
 #include <assimp/IOSystem.hpp>
+#include <assimp/config.h>
 
 // Header files, standard library.
 #include <cinttypes>
 #include <limits>
 #include <memory>
+#include <iostream>
 
 using namespace rapidjson;
 
@@ -90,6 +92,10 @@ glTF2Exporter::glTF2Exporter(const char *filename, IOSystem *pIOSystem, const ai
     // Always on as our triangulation process is aware of this type of encoding
     mAsset->extensionsUsed.FB_ngon_encoding = true;
 
+    configEpsilon = mProperties->GetPropertyFloat(
+            AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON,
+                    (ai_real)AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON_DEFAULT);
+
     if (isBinary) {
         mAsset->SetAsBinary();
     }
@@ -179,7 +185,7 @@ void SetAccessorRange(Ref<Accessor> acc, void *data, size_t count,
 
     // Allocate and initialize with large values.
     for (unsigned int i = 0; i < numCompsOut; i++) {
-        acc->min.push_back(std::numeric_limits<double>::max());
+        acc->min.push_back(std::numeric_limits<double>::min());
         acc->max.push_back(-std::numeric_limits<double>::max());
     }
 
@@ -730,8 +736,8 @@ bool glTF2Exporter::GetMatSpecular(const aiMaterial &mat, glTF2::MaterialSpecula
     } else if (colorFactorIsZero) {
         specular.specularColorFactor[0] = specular.specularColorFactor[1] = specular.specularColorFactor[2] = 1.0f;
     }
-    GetMatTex(mat, specular.specularColorTexture, aiTextureType_SPECULAR);
-    GetMatTex(mat, specular.specularTexture, aiTextureType_SPECULAR);
+    GetMatTex(mat, specular.specularTexture, aiTextureType_SPECULAR, 0);
+    GetMatTex(mat, specular.specularColorTexture, aiTextureType_SPECULAR, 1);
     return true;
 }
 
@@ -798,6 +804,22 @@ bool glTF2Exporter::GetMatEmissiveStrength(const aiMaterial &mat, glTF2::Materia
     return mat.Get(AI_MATKEY_EMISSIVE_INTENSITY, emissiveStrength.emissiveStrength) == aiReturn_SUCCESS;
 }
 
+bool glTF2Exporter::GetMatAnisotropy(const aiMaterial &mat, glTF2::MaterialAnisotropy &anisotropy) {
+    if (mat.Get(AI_MATKEY_ANISOTROPY_FACTOR, anisotropy.anisotropyStrength) != aiReturn_SUCCESS) {
+        return false;
+    }
+
+    // do not export anisotropy when strength is zero
+    if (anisotropy.anisotropyStrength == 0.0f) {
+        return false;
+    }
+
+    mat.Get(AI_MATKEY_ANISOTROPY_ROTATION, anisotropy.anisotropyRotation);
+    GetMatTex(mat, anisotropy.anisotropyTexture, AI_MATKEY_ANISOTROPY_TEXTURE);
+
+    return true;
+}
+
 void glTF2Exporter::ExportMaterials() {
     aiString aiName;
     for (unsigned int i = 0; i < mScene->mNumMaterials; ++i) {
@@ -912,6 +934,7 @@ void glTF2Exporter::ExportMaterials() {
                 if (GetMatSpecular(mat, specular)) {
                     mAsset->extensionsUsed.KHR_materials_specular = true;
                     m->materialSpecular = Nullable<MaterialSpecular>(specular);
+                    GetMatColor(mat, m->pbrMetallicRoughness.baseColorFactor, AI_MATKEY_COLOR_DIFFUSE);
                 }
 
                 MaterialSheen sheen;
@@ -949,6 +972,12 @@ void glTF2Exporter::ExportMaterials() {
                     mAsset->extensionsUsed.KHR_materials_emissive_strength = true;
                     m->materialEmissiveStrength = Nullable<MaterialEmissiveStrength>(emissiveStrength);
                 }
+
+                MaterialAnisotropy anisotropy;
+                if (GetMatAnisotropy(mat, anisotropy)) {
+                    mAsset->extensionsUsed.KHR_materials_anisotropy = true;
+                    m->materialAnisotropy = Nullable<MaterialAnisotropy>(anisotropy);
+                }
             }
         }
     }
@@ -1171,6 +1200,9 @@ void glTF2Exporter::ExportMeshes() {
 
     for (unsigned int idx_mesh = 0; idx_mesh < mScene->mNumMeshes; ++idx_mesh) {
         const aiMesh *aim = mScene->mMeshes[idx_mesh];
+        if (aim->mNumFaces == 0) {
+            continue;
+        }
 
         std::string name = aim->mName.C_Str();
 
@@ -1205,6 +1237,20 @@ void glTF2Exporter::ExportMeshes() {
             p.attributes.normal.push_back(n);
         }
 
+        /******************** Tangents ********************/
+        if (nullptr != aim->mTangents) {
+            for (uint32_t i = 0; i < aim->mNumVertices; ++i) {
+                aim->mTangents[i].NormalizeSafe();
+            }
+            Ref<Accessor> t = ExportData(
+                *mAsset, meshId, b, aim->mNumVertices, aim->mTangents, AttribType::VEC3,
+                AttribType::VEC3, ComponentType_FLOAT, BufferViewTarget_ARRAY_BUFFER
+            );
+            if (t) {
+                p.attributes.tangent.push_back(t);
+            }
+        }
+
         /************** Texture coordinates **************/
         for (int i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i) {
             if (!aim->HasTextureCoords(i)) {
@@ -1453,8 +1499,12 @@ unsigned int glTF2Exporter::ExportNodeHierarchy(const aiNode *n) {
     Ref<Node> node = mAsset->nodes.Create(mAsset->FindUniqueID(n->mName.C_Str(), "node"));
 
     node->name = n->mName.C_Str();
+    if(n->mNumChildren > 0)
+        node->children.reserve(n->mNumChildren);
+    if(n->mNumMeshes > 0)
+        node->meshes.reserve(n->mNumMeshes);
 
-    if (!n->mTransformation.IsIdentity()) {
+    if (!n->mTransformation.IsIdentity(configEpsilon)) {
         node->matrix.isPresent = true;
         CopyValue(n->mTransformation, node->matrix.value);
     }
@@ -1481,10 +1531,14 @@ unsigned int glTF2Exporter::ExportNode(const aiNode *n, Ref<Node> &parent) {
 
     node->parent = parent;
     node->name = name;
+    if(n->mNumChildren > 0)
+        node->children.reserve(n->mNumChildren);
+    if(n->mNumMeshes > 0)
+        node->meshes.reserve(n->mNumMeshes);
 
     ExportNodeExtras(n->mMetaData, node->extras);
 
-    if (!n->mTransformation.IsIdentity()) {
+    if (!n->mTransformation.IsIdentity(configEpsilon)) {
         if (mScene->mNumAnimations > 0 || (mProperties && mProperties->HasPropertyBool("GLTF2_NODE_IN_TRS"))) {
             aiQuaternion quaternion;
             n->mTransformation.Decompose(*reinterpret_cast<aiVector3D *>(&node->scale.value), quaternion, *reinterpret_cast<aiVector3D *>(&node->translation.value));
diff --git a/code/AssetLib/glTF2/glTF2Exporter.h b/code/AssetLib/glTF2/glTF2Exporter.h
index 7bf57b567..a2689249c 100644
--- a/code/AssetLib/glTF2/glTF2Exporter.h
+++ b/code/AssetLib/glTF2/glTF2Exporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -49,6 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/material.h>
 #include <assimp/types.h>
+#include <assimp/defs.h>
 
 #include <map>
 #include <memory>
@@ -83,6 +84,7 @@ struct MaterialTransmission;
 struct MaterialVolume;
 struct MaterialIOR;
 struct MaterialEmissiveStrength;
+struct MaterialAnisotropy;
 
 // Vec/matrix types, as raw float arrays
 typedef float(vec2)[2];
@@ -125,6 +127,7 @@ protected:
     bool GetMatVolume(const aiMaterial &mat, glTF2::MaterialVolume &volume);
     bool GetMatIOR(const aiMaterial &mat, glTF2::MaterialIOR &ior);
     bool GetMatEmissiveStrength(const aiMaterial &mat, glTF2::MaterialEmissiveStrength &emissiveStrength);
+    bool GetMatAnisotropy(const aiMaterial &mat, glTF2::MaterialAnisotropy &anisotropy);
     void ExportMetadata();
     void ExportMaterials();
     void ExportMeshes();
@@ -142,6 +145,7 @@ private:
     std::map<std::string, unsigned int> mTexturesByPath;
     std::shared_ptr<glTF2::Asset> mAsset;
     std::vector<unsigned char> mBodyData;
+    ai_real configEpsilon;
 };
 
 } // namespace Assimp
diff --git a/code/AssetLib/glTF2/glTF2Importer.cpp b/code/AssetLib/glTF2/glTF2Importer.cpp
index 4bdbe39f1..f42943990 100644
--- a/code/AssetLib/glTF2/glTF2Importer.cpp
+++ b/code/AssetLib/glTF2/glTF2Importer.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -41,12 +41,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF2_IMPORTER)
 
-#include "AssetLib/glTF2/glTF2Importer.h"
-#include "AssetLib/glTF2/glTF2Asset.h"
+#include "glTF2Importer.h"
+#include "glTF2Asset.h"
 #include "PostProcessing/MakeVerboseFormat.h"
 
 #if !defined(ASSIMP_BUILD_NO_EXPORT)
-#include "AssetLib/glTF2/glTF2AssetWriter.h"
+#   include "AssetLib/glTF2/glTF2AssetWriter.h"
 #endif
 
 #include <assimp/CreateAnimMesh.h>
@@ -71,6 +71,7 @@ using namespace glTF2;
 using namespace glTFCommon;
 
 namespace {
+
 // generate bi-tangents from normals and tangents according to spec
 struct Tangent {
     aiVector3D xyz;
@@ -92,7 +93,7 @@ static constexpr aiImporterDesc desc = {
     0,
     0,
     0,
-    "gltf glb"
+    "gltf glb vrm"
 };
 
 glTF2Importer::glTF2Importer() :
@@ -106,12 +107,12 @@ const aiImporterDesc *glTF2Importer::GetInfo() const {
 
 bool glTF2Importer::CanRead(const std::string &filename, IOSystem *pIOHandler, bool checkSig) const {
     const std::string extension = GetExtension(filename);
-    if (!checkSig && (extension != "gltf") && (extension != "glb")) {
+    if (!checkSig && (extension != "gltf") && (extension != "glb") && (extension != "vrm")) {
         return false;
     }
 
     if (pIOHandler) {
-        glTF2::Asset asset(pIOHandler);
+        Asset asset(pIOHandler);
         return asset.CanRead(
             filename,
             CheckMagicToken(
@@ -122,22 +123,23 @@ bool glTF2Importer::CanRead(const std::string &filename, IOSystem *pIOHandler, b
     return false;
 }
 
-static inline aiTextureMapMode ConvertWrappingMode(SamplerWrap gltfWrapMode) {
+static aiTextureMapMode ConvertWrappingMode(SamplerWrap gltfWrapMode) {
     switch (gltfWrapMode) {
-    case SamplerWrap::Mirrored_Repeat:
-        return aiTextureMapMode_Mirror;
+        case SamplerWrap::Mirrored_Repeat:
+            return aiTextureMapMode_Mirror;
 
-    case SamplerWrap::Clamp_To_Edge:
-        return aiTextureMapMode_Clamp;
+        case SamplerWrap::Clamp_To_Edge:
+            return aiTextureMapMode_Clamp;
 
-    case SamplerWrap::UNSET:
-    case SamplerWrap::Repeat:
-    default:
-        return aiTextureMapMode_Wrap;
+        case SamplerWrap::UNSET:
+        case SamplerWrap::Repeat:
+        default:
+            break;
     }
+    return aiTextureMapMode_Wrap;
 }
 
-static inline void SetMaterialColorProperty(Asset & /*r*/, vec4 &prop, aiMaterial *mat,
+static void SetMaterialColorProperty(Asset & /*r*/, vec4 &prop, aiMaterial *mat,
         const char *pKey, unsigned int type, unsigned int idx) {
     aiColor4D col;
     CopyValue(prop, col);
@@ -147,12 +149,12 @@ static inline void SetMaterialColorProperty(Asset & /*r*/, vec4 &prop, aiMateria
 static inline void SetMaterialColorProperty(Asset & /*r*/, vec3 &prop, aiMaterial *mat,
         const char *pKey, unsigned int type, unsigned int idx) {
     aiColor4D col;
-    glTFCommon::CopyValue(prop, col);
+    CopyValue(prop, col);
     mat->AddProperty(&col, 1, pKey, type, idx);
 }
 
 static void SetMaterialTextureProperty(std::vector<int> &embeddedTexIdxs, Asset & /*r*/,
-        glTF2::TextureInfo prop, aiMaterial *mat, aiTextureType texType,
+        TextureInfo prop, aiMaterial *mat, aiTextureType texType,
         unsigned int texSlot = 0) {
     if (prop.texture && prop.texture->source) {
         aiString uri(prop.texture->source->uri);
@@ -161,7 +163,7 @@ static void SetMaterialTextureProperty(std::vector<int> &embeddedTexIdxs, Asset
         if (texIdx != -1) { // embedded
             // setup texture reference string (copied from ColladaLoader::FindFilenameForEffectTexture)
             uri.data[0] = '*';
-            uri.length = 1 + ASSIMP_itoa10(uri.data + 1, MAXLEN - 1, texIdx);
+            uri.length = 1 + ASSIMP_itoa10(uri.data + 1, AI_MAXLEN - 1, texIdx);
         }
 
         mat->AddProperty(&uri, AI_MATKEY_TEXTURE(texType, texSlot));
@@ -218,20 +220,20 @@ static void SetMaterialTextureProperty(std::vector<int> &embeddedTexIdxs, Asset
     }
 }
 
-inline void SetMaterialTextureProperty(std::vector<int> &embeddedTexIdxs, Asset &r,
+static void SetMaterialTextureProperty(std::vector<int> &embeddedTexIdxs, Asset &r,
         NormalTextureInfo &prop, aiMaterial *mat, aiTextureType texType,
         unsigned int texSlot = 0) {
-    SetMaterialTextureProperty(embeddedTexIdxs, r, (glTF2::TextureInfo)prop, mat, texType, texSlot);
+    SetMaterialTextureProperty(embeddedTexIdxs, r, static_cast<TextureInfo>(prop), mat, texType, texSlot);
 
     if (prop.texture && prop.texture->source) {
         mat->AddProperty(&prop.scale, 1, AI_MATKEY_GLTF_TEXTURE_SCALE(texType, texSlot));
     }
 }
 
-inline void SetMaterialTextureProperty(std::vector<int> &embeddedTexIdxs, Asset &r,
+static void SetMaterialTextureProperty(std::vector<int> &embeddedTexIdxs, Asset &r,
         OcclusionTextureInfo &prop, aiMaterial *mat, aiTextureType texType,
         unsigned int texSlot = 0) {
-    SetMaterialTextureProperty(embeddedTexIdxs, r, (glTF2::TextureInfo)prop, mat, texType, texSlot);
+    SetMaterialTextureProperty(embeddedTexIdxs, r, static_cast<TextureInfo>(prop), mat, texType, texSlot);
 
     if (prop.texture && prop.texture->source) {
         std::string textureStrengthKey = std::string(_AI_MATKEY_TEXTURE_BASE) + "." + "strength";
@@ -285,11 +287,11 @@ static aiMaterial *ImportMaterial(std::vector<int> &embeddedTexIdxs, Asset &r, M
         if (mat.materialSpecular.isPresent) {
             MaterialSpecular &specular = mat.materialSpecular.value;
             // Default values of zero disables Specular
-            if (std::memcmp(specular.specularColorFactor, defaultSpecularColorFactor, sizeof(glTFCommon::vec3)) != 0 || specular.specularFactor != 0.0f) {
+            if (std::memcmp(specular.specularColorFactor, defaultSpecularColorFactor, sizeof(vec3)) != 0 || specular.specularFactor != 0.0f) {
                 SetMaterialColorProperty(r, specular.specularColorFactor, aimat, AI_MATKEY_COLOR_SPECULAR);
                 aimat->AddProperty(&specular.specularFactor, 1, AI_MATKEY_SPECULAR_FACTOR);
-                SetMaterialTextureProperty(embeddedTexIdxs, r, specular.specularTexture, aimat, aiTextureType_SPECULAR);
-                SetMaterialTextureProperty(embeddedTexIdxs, r, specular.specularColorTexture, aimat, aiTextureType_SPECULAR);
+                SetMaterialTextureProperty(embeddedTexIdxs, r, specular.specularTexture, aimat, aiTextureType_SPECULAR, 0);
+                SetMaterialTextureProperty(embeddedTexIdxs, r, specular.specularColorTexture, aimat, aiTextureType_SPECULAR, 1);
             }
         }
         // pbrSpecularGlossiness
@@ -369,11 +371,21 @@ static aiMaterial *ImportMaterial(std::vector<int> &embeddedTexIdxs, Asset &r, M
 
         // KHR_materials_emissive_strength
         if (mat.materialEmissiveStrength.isPresent) {
-            MaterialEmissiveStrength &emissiveStrength = mat.materialEmissiveStrength.value;
+            const MaterialEmissiveStrength &emissiveStrength = mat.materialEmissiveStrength.value;
 
             aimat->AddProperty(&emissiveStrength.emissiveStrength, 1, AI_MATKEY_EMISSIVE_INTENSITY);
         }
 
+        // KHR_materials_anisotropy
+        if (mat.materialAnisotropy.isPresent) {
+            const MaterialAnisotropy &anisotropy = mat.materialAnisotropy.value;
+
+            aimat->AddProperty(&anisotropy.anisotropyStrength, 1, AI_MATKEY_ANISOTROPY_FACTOR);
+            aimat->AddProperty(&anisotropy.anisotropyRotation, 1, AI_MATKEY_ANISOTROPY_ROTATION);
+
+            SetMaterialTextureProperty(embeddedTexIdxs, r, anisotropy.anisotropyTexture, aimat, AI_MATKEY_ANISOTROPY_TEXTURE);
+        }
+
         return aimat;
     } catch (...) {
         delete aimat;
@@ -498,7 +510,7 @@ void glTF2Importer::ImportMeshes(glTF2::Asset &r) {
             // Extract used vertices:
             bool useIndexBuffer = prim.indices;
             std::vector<unsigned int> *vertexRemappingTable = nullptr;
-            
+
             if (useIndexBuffer) {
                 size_t count = prim.indices->count;
                 indexBuffer.resize(count);
@@ -518,7 +530,7 @@ void glTF2Importer::ImportMeshes(glTF2::Asset &r) {
                     if (index >= numAllVertices) {
                         // Out-of-range indices will be filtered out when adding the faces and then lead to a warning. At this stage, we just keep them.
                         indexBuffer[i] = index;
-                        continue; 
+                        continue;
                     }
                     if (index >= reverseMappingIndices.size()) {
                         reverseMappingIndices.resize(index + 1, unusedIndex);
@@ -539,7 +551,7 @@ void glTF2Importer::ImportMeshes(glTF2::Asset &r) {
             if (mesh.primitives.size() > 1) {
                 ai_uint32 &len = aim->mName.length;
                 aim->mName.data[len] = '-';
-                len += 1 + ASSIMP_itoa10(aim->mName.data + len + 1, unsigned(MAXLEN - len - 1), p);
+                len += 1 + ASSIMP_itoa10(aim->mName.data + len + 1, unsigned(AI_MAXLEN - len - 1), p);
             }
 
             switch (prim.mode) {
@@ -1055,7 +1067,8 @@ static void BuildVertexWeightMapping(Mesh::Primitive &primitive, std::vector<std
             attr.joint[j]->ExtractData(indices16[j], vertexRemappingTablePtr);
         }
     }
-    //
+
+    // No indices are an invalid usecase
     if (nullptr == indices8 && nullptr == indices16) {
         // Something went completely wrong!
         ai_assert(false);
@@ -1299,6 +1312,9 @@ struct AnimationSamplers {
     Animation::Sampler *weight;
 };
 
+struct vec4f {
+    float x, y, z, w;
+};
 aiNodeAnim *CreateNodeAnim(glTF2::Asset &, Node &node, AnimationSamplers &samplers) {
     aiNodeAnim *anim = new aiNodeAnim();
 
@@ -1310,9 +1326,18 @@ aiNodeAnim *CreateNodeAnim(glTF2::Asset &, Node &node, AnimationSamplers &sample
         if (samplers.translation && samplers.translation->input && samplers.translation->output) {
             float *times = nullptr;
             samplers.translation->input->ExtractData(times);
-            aiVector3D *values = nullptr;
-            samplers.translation->output->ExtractData(values);
-            anim->mNumPositionKeys = static_cast<uint32_t>(samplers.translation->input->count);
+            //aiVector3D *values = nullptr;
+            vec4f *tmp_values = nullptr;
+            size_t numItems = samplers.translation->output->ExtractData(tmp_values);
+            aiVector3D *values = new aiVector3D[numItems];
+            for (size_t i = 0; i < numItems; ++i) {
+                values[i].x = tmp_values[i].x;
+                values[i].y = tmp_values[i].y;
+                values[i].z = tmp_values[i].z;
+            }
+            delete[] tmp_values;
+
+            anim->mNumPositionKeys = static_cast<unsigned int>(samplers.translation->input->count);
             anim->mPositionKeys = new aiVectorKey[anim->mNumPositionKeys];
             unsigned int ii = (samplers.translation->interpolation == Interpolation_CUBICSPLINE) ? 1 : 0;
             for (unsigned int i = 0; i < anim->mNumPositionKeys; ++i) {
@@ -1336,7 +1361,7 @@ aiNodeAnim *CreateNodeAnim(glTF2::Asset &, Node &node, AnimationSamplers &sample
             samplers.rotation->input->ExtractData(times);
             aiQuaternion *values = nullptr;
             samplers.rotation->output->ExtractData(values);
-            anim->mNumRotationKeys = static_cast<uint32_t>(samplers.rotation->input->count);
+            anim->mNumRotationKeys = static_cast<unsigned int>(samplers.rotation->input->count);
             anim->mRotationKeys = new aiQuatKey[anim->mNumRotationKeys];
             unsigned int ii = (samplers.rotation->interpolation == Interpolation_CUBICSPLINE) ? 1 : 0;
             for (unsigned int i = 0; i < anim->mNumRotationKeys; ++i) {
@@ -1364,7 +1389,7 @@ aiNodeAnim *CreateNodeAnim(glTF2::Asset &, Node &node, AnimationSamplers &sample
             samplers.scale->input->ExtractData(times);
             aiVector3D *values = nullptr;
             samplers.scale->output->ExtractData(values);
-            anim->mNumScalingKeys = static_cast<uint32_t>(samplers.scale->input->count);
+            anim->mNumScalingKeys = static_cast<unsigned int>(samplers.scale->input->count);
             anim->mScalingKeys = new aiVectorKey[anim->mNumScalingKeys];
             unsigned int ii = (samplers.scale->interpolation == Interpolation_CUBICSPLINE) ? 1 : 0;
             for (unsigned int i = 0; i < anim->mNumScalingKeys; ++i) {
@@ -1456,7 +1481,8 @@ std::unordered_map<unsigned int, AnimationSamplers> GatherSamplers(Animation &an
         }
 
         if (animsampler.input->count > animsampler.output->count) {
-            ASSIMP_LOG_WARN("Animation ", anim.name, ": Number of keyframes in sampler input ", animsampler.input->count, " exceeds number of keyframes in sampler output ", animsampler.output->count);
+            ASSIMP_LOG_WARN("Animation ", anim.name, ": Number of keyframes in sampler input ", animsampler.input->count,
+                            " exceeds number of keyframes in sampler output ", animsampler.output->count);
             continue;
         }
 
@@ -1630,7 +1656,7 @@ void glTF2Importer::ImportEmbeddedTextures(glTF2::Asset &r) {
         if (!img.mimeType.empty()) {
             const char *ext = strchr(img.mimeType.c_str(), '/') + 1;
             if (ext) {
-                if (strcmp(ext, "jpeg") == 0) {
+                if (strncmp(ext, "jpeg", 4) == 0) {
                     ext = "jpg";
                 } else if (strcmp(ext, "ktx2") == 0) { // basisu: ktx remains
                     ext = "kx2";
@@ -1639,9 +1665,9 @@ void glTF2Importer::ImportEmbeddedTextures(glTF2::Asset &r) {
                 }
 
                 size_t len = strlen(ext);
-                if (len <= 3) {
-                    strcpy(tex->achFormatHint, ext);
-                }
+                if (len > 3) len = 3;
+                tex->achFormatHint[3] = '\0';
+                memcpy(tex->achFormatHint, ext, len);
             }
         }
     }
diff --git a/code/AssetLib/glTF2/glTF2Importer.h b/code/AssetLib/glTF2/glTF2Importer.h
index 2be42126c..7ddbbf198 100644
--- a/code/AssetLib/glTF2/glTF2Importer.h
+++ b/code/AssetLib/glTF2/glTF2Importer.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -43,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_GLTF2IMPORTER_H_INC
 
 #include <assimp/BaseImporter.h>
-#include <AssetLib/glTF2/glTF2Asset.h>
+#include "glTF2Asset.h"
 
 struct aiNode;
 
diff --git a/code/AssetLib/glTF/glTFCommon.cpp b/code/AssetLib/glTFCommon/glTFCommon.cpp
similarity index 97%
rename from code/AssetLib/glTF/glTFCommon.cpp
rename to code/AssetLib/glTFCommon/glTFCommon.cpp
index fea680cd3..9c217acfd 100644
--- a/code/AssetLib/glTF/glTFCommon.cpp
+++ b/code/AssetLib/glTFCommon/glTFCommon.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
 
-#include "AssetLib/glTF/glTFCommon.h"
+#include "AssetLib/glTFCommon/glTFCommon.h"
 
 namespace glTFCommon {
 
diff --git a/code/AssetLib/glTF/glTFCommon.h b/code/AssetLib/glTFCommon/glTFCommon.h
similarity index 97%
rename from code/AssetLib/glTF/glTFCommon.h
rename to code/AssetLib/glTFCommon/glTFCommon.h
index 187fbbdb5..3729f3ac4 100644
--- a/code/AssetLib/glTF/glTFCommon.h
+++ b/code/AssetLib/glTFCommon/glTFCommon.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
 
 #include <assimp/Exceptional.h>
+#include <assimp/DefaultLogger.hpp>
 
 #include <algorithm>
 #include <list>
@@ -444,7 +445,7 @@ inline Value *FindArrayInContext(Value &val, const char *memberId, const char *c
     return &it->value;
 }
 
-inline Value *FindObjectInContext(Value &val, const char *memberId, const char *context, const char *extraContext = nullptr) {
+inline Value *FindObjectInContext(Value &val, const char * memberId, const char *context, const char *extraContext = nullptr) {
     if (!val.IsObject()) {
         return nullptr;
     }
@@ -453,8 +454,9 @@ inline Value *FindObjectInContext(Value &val, const char *memberId, const char *
         return nullptr;
     }
     if (!it->value.IsObject()) {
-        throwUnexpectedTypeError("object", memberId, context, extraContext);
-    }
+        ASSIMP_LOG_ERROR("Member \"", memberId, "\" was not of type \"", context, "\" when reading ", extraContext);
+        return nullptr;
+   }
     return &it->value;
 }
 
diff --git a/code/CApi/AssimpCExport.cpp b/code/CApi/AssimpCExport.cpp
index 21e40205c..231e59649 100644
--- a/code/CApi/AssimpCExport.cpp
+++ b/code/CApi/AssimpCExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/CApi/CInterfaceIOWrapper.cpp b/code/CApi/CInterfaceIOWrapper.cpp
index f0e46cd08..7d76563e1 100644
--- a/code/CApi/CInterfaceIOWrapper.cpp
+++ b/code/CApi/CInterfaceIOWrapper.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -49,7 +49,6 @@ namespace Assimp {
 CIOStreamWrapper::~CIOStreamWrapper() {
     // Various places depend on this destructor to close the file
     if (mFile != nullptr) {
-        
         mIO->mFileSystem->CloseProc(mIO->mFileSystem, mFile);
     }
 }
diff --git a/code/CApi/CInterfaceIOWrapper.h b/code/CApi/CInterfaceIOWrapper.h
index 28d4c3e75..332d07471 100644
--- a/code/CApi/CInterfaceIOWrapper.h
+++ b/code/CApi/CInterfaceIOWrapper.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 7870524e8..022999342 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Open Asset Import Library (assimp)
 # ----------------------------------------------------------------------
-# Copyright (c) 2006-2022, assimp team
+# Copyright (c) 2006-2025, assimp team
 #
 # All rights reserved.
 #
@@ -42,7 +42,7 @@
 # 3) Add libassimp using the file lists (eliminates duplication of file names between
 #    source groups and library command)
 #
-cmake_minimum_required( VERSION 3.10 )
+cmake_minimum_required( VERSION 3.22 )
 SET( HEADER_PATH ../include/assimp )
 
 if(NOT ANDROID AND ASSIMP_ANDROID_JNIIOSYSTEM)
@@ -271,7 +271,6 @@ MACRO(ADD_ASSIMP_IMPORTER name)
 ENDMACRO()
 
 if (NOT ASSIMP_NO_EXPORT)
-
   # if this variable is set to TRUE, the user can manually disable exporters by setting
   # ASSIMP_BUILD_XXX_EXPORTER to FALSE for each exporter
   # if this variable is set to FALSE, the user can manually enable exporters by setting
@@ -417,14 +416,12 @@ ADD_ASSIMP_IMPORTER( LWS
   AssetLib/LWS/LWSLoader.h
 )
 
-ADD_ASSIMP_IMPORTER( M3D
-  AssetLib/M3D/M3DMaterials.h
-  AssetLib/M3D/M3DImporter.h
-  AssetLib/M3D/M3DImporter.cpp
-  AssetLib/M3D/M3DWrapper.h
-  AssetLib/M3D/M3DWrapper.cpp
-  AssetLib/M3D/m3d.h
-)
+if (ASSIMP_BUILD_M3D_IMPORTER)
+    ADD_ASSIMP_IMPORTER( M3D
+            AssetLib/M3D/M3DImporter.cpp
+            AssetLib/M3D/M3DWrapper.cpp
+    )
+endif () # if (ASSIMP_BUILD_M3D_IMPORTER)
 
 ADD_ASSIMP_IMPORTER( MD2
   AssetLib/MD2/MD2FileData.h
@@ -471,6 +468,14 @@ ADD_ASSIMP_IMPORTER( MDL
   AssetLib/MDL/HalfLife/UniqueNameGenerator.h
 )
 
+IF(((CMAKE_CXX_COMPILER_ID MATCHES "GNU") AND NOT MINGW AND NOT HAIKU) AND CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 13)
+  message(STATUS "GCC13 detected disabling \"-Warray-bounds and -Wstringop-overflow\" for"
+      " AssetLib/MDL/MDLLoader.cpp as it appears to be a false positive")
+  set_source_files_properties(AssetLib/MDL/MDLLoader.cpp PROPERTIES
+      COMPILE_FLAGS "-Wno-array-bounds -Wno-stringop-overflow"
+  )
+endif()
+
 SET( MaterialSystem_SRCS
   Material/MaterialSystem.cpp
   Material/MaterialSystem.h
@@ -503,6 +508,14 @@ ADD_ASSIMP_IMPORTER( OBJ
   AssetLib/Obj/ObjTools.h
 )
 
+IF(((CMAKE_CXX_COMPILER_ID MATCHES "GNU") AND NOT MINGW AND NOT HAIKU) AND CMAKE_CXX_COMPILER_VERSION EQUAL 14)
+  message(STATUS "GCC14 detected disabling \"-Wmaybe-uninitialized\" for"
+      " AssetLib/Obj/ObjFileParser.cpp as it appears to be a false positive")
+  set_source_files_properties(AssetLib/Obj/ObjFileParser.cpp PROPERTIES
+      COMPILE_FLAGS "-Wno-maybe-uninitialized"
+  )
+endif()
+
 ADD_ASSIMP_IMPORTER( OGRE
   AssetLib/Ogre/OgreImporter.h
   AssetLib/Ogre/OgreStructs.h
@@ -648,9 +661,10 @@ if (NOT ASSIMP_NO_EXPORT)
     AssetLib/Assxml/AssxmlFileWriter.h
     AssetLib/Assxml/AssxmlFileWriter.cpp)
 
-  ADD_ASSIMP_EXPORTER(M3D
-    AssetLib/M3D/M3DExporter.h
-    AssetLib/M3D/M3DExporter.cpp)
+  if ((NOT ASSIMP_NO_EXPORT) AND ASSIMP_BUILD_M3D_EXPORTER)
+      ADD_ASSIMP_EXPORTER(M3D
+              AssetLib/M3D/M3DExporter.cpp)
+  endif () # if (ASSIMP_BUILD_M3D_EXPORTER)
 
   ADD_ASSIMP_EXPORTER(COLLADA
     AssetLib/Collada/ColladaExporter.h
@@ -814,6 +828,17 @@ ADD_ASSIMP_IMPORTER( 3D
   AssetLib/Unreal/UnrealLoader.h
 )
 
+ADD_ASSIMP_IMPORTER( USD
+  AssetLib/USD/USDLoader.cpp
+  AssetLib/USD/USDLoader.h
+  AssetLib/USD/USDLoaderImplTinyusdz.cpp
+  AssetLib/USD/USDLoaderImplTinyusdz.h
+  AssetLib/USD/USDLoaderImplTinyusdzHelper.cpp
+  AssetLib/USD/USDLoaderImplTinyusdzHelper.h
+  AssetLib/USD/USDLoaderUtil.cpp
+  AssetLib/USD/USDLoaderUtil.h
+)
+
 ADD_ASSIMP_IMPORTER( X
   AssetLib/X/XFileHelper.h
   AssetLib/X/XFileImporter.cpp
@@ -841,11 +866,15 @@ ADD_ASSIMP_IMPORTER( X3D
   AssetLib/X3D/X3DGeoHelper.h
   AssetLib/X3D/X3DXmlHelper.cpp
   AssetLib/X3D/X3DXmlHelper.h
+  AssetLib/VRML/VrmlConverter.cpp
 )
+SET(glTFCommon_src
+  AssetLib/glTFCommon/glTFCommon.h
+  AssetLib/glTFCommon/glTFCommon.cpp
+)
+SOURCE_GROUP( glTFCommon FILES ${glTFCommon_src})
 
 ADD_ASSIMP_IMPORTER( GLTF
-  AssetLib/glTF/glTFCommon.h
-  AssetLib/glTF/glTFCommon.cpp
   AssetLib/glTF/glTFAsset.h
   AssetLib/glTF/glTFAsset.inl
   AssetLib/glTF/glTFAssetWriter.h
@@ -907,13 +936,195 @@ SET( Extra_SRCS
 )
 SOURCE_GROUP( Extra FILES ${Extra_SRCS})
 
+# VRML (.wrl/.x3dv) support
+IF (ASSIMP_BUILD_VRML_IMPORTER)
+    # Note: ALWAYS specify a git commit hash (or tag) instead of a branch name; using a branch name
+    #       can lead to non-deterministic (unpredictable) results since the code is potentially in flux
+    # "main" branch, 18 Nov 2024
+    set(Meshlab_GIT_TAG "ad55b47a9b0700e7b427db6db287bb3a39aa31e7")
+    message("****")
+    message("\n\n**** Cloning meshlab repo, git tag ${Meshlab_GIT_TAG}\n\n")
+
+    # Use CMAKE_CURRENT_SOURCE_DIR which provides assimp-local path (CMAKE_SOURCE_DIR is
+    # relative to top-level/main project)
+    set(Meshlab_BASE_ABSPATH "${CMAKE_CURRENT_SOURCE_DIR}/../contrib/meshlab")
+
+    # Note: Depending on user's OS, build environment etc it may be necessary to change line endings of
+    #       "patches/meshlab.patch" file from CRLF to LF in order for patch operation to succeed
+    # Patch required to
+    #  - replace QtXml w/pugixml
+    #  - disable meshlab cmake scripts to prevent breaking assimp build
+    #  - address compiler warnings to avoid breaking build for users who wisely treat warnings-as-errors
+    set(Meshlab_PATCH_CMD git apply ${Meshlab_BASE_ABSPATH}/patches/meshlab.patch)
+
+    # Note: cloning entire meshlab repo is wasteful since we require literally only two source files.
+    #       There is a technique using "git archive" e.g.
+    #           execute_process(
+    #              COMMAND git archive --remote=${Meshlab_GIT_REPO} ${Meshlab_GIT_TAG} <files> | \
+    #                  tar -x -C ${Meshlab_BASE_ABSPATH}
+    #              RESULT_VARIABLE result
+    #           )
+    #       But this doesn't work with git "https" protocol so not a viable solution
+
+    # Note: CMake's "FetchContent" (which executes at configure time) is much better for this use case
+    #       than "ExternalProject" (which executes at build time); we just want to clone a repo and
+    #       block (wait) as long as necessary until cloning is complete, so we immediately have full
+    #       access to the cloned source files
+    include(FetchContent)
+    set(Meshlab_REPO_ABSPATH "${Meshlab_BASE_ABSPATH}/autoclone")
+    # Only want to clone once (on Android, using SOURCE_DIR will clone per-ABI (x86, x86_64 etc))
+    set(FETCHCONTENT_BASE_DIR ${Meshlab_REPO_ABSPATH})
+    set(FETCHCONTENT_QUIET on) # Turn off to troubleshoot repo clone problems
+    set(FETCHCONTENT_UPDATES_DISCONNECTED on) # Prevent other ABIs from re-cloning/re-patching etc
+    set(Meshlab_GIT_REPO "https://github.com/cnr-isti-vclab/meshlab")
+    FetchContent_Declare(
+            meshlab_repo
+            GIT_REPOSITORY ${Meshlab_GIT_REPO}
+            GIT_TAG        ${Meshlab_GIT_TAG}
+            PATCH_COMMAND  ${Meshlab_PATCH_CMD}
+    )
+    FetchContent_MakeAvailable(meshlab_repo)
+    message("**** Finished cloning meshlab repo")
+    message("****")
+    set(Meshlab_SRC_ABSPATH "${Meshlab_REPO_ABSPATH}/meshlab_repo-src/src/meshlabplugins/io_x3d/vrml")
+    set(Meshlab_SRCS
+            ${Meshlab_SRC_ABSPATH}/Parser.cpp
+            ${Meshlab_SRC_ABSPATH}/Scanner.cpp
+    )
+    set(Meshlab_INCLUDE_DIRS "${Meshlab_SRC_ABSPATH}")
+    INCLUDE_DIRECTORIES(${Meshlab_INCLUDE_DIRS})
+    MESSAGE(STATUS "VRML enabled")
+ELSE() # IF (ASSIMP_BUILD_VRML_IMPORTER)
+    set(Meshlab_SRCS "")
+    MESSAGE(STATUS "VRML disabled")
+ENDIF() # IF (ASSIMP_BUILD_VRML_IMPORTER)
+
+# USD/USDA/USDC/USDZ support
+# tinyusdz
+IF (ASSIMP_BUILD_USD_IMPORTER)
+    if (ASSIMP_BUILD_USD_VERBOSE_LOGS)
+        ADD_DEFINITIONS( -DASSIMP_USD_VERBOSE_LOGS)
+    endif ()
+    # Use CMAKE_CURRENT_SOURCE_DIR which provides assimp-local path (CMAKE_SOURCE_DIR is
+    # relative to top-level/main project)
+    set(Tinyusdz_BASE_ABSPATH "${CMAKE_CURRENT_SOURCE_DIR}/../contrib/tinyusdz")
+    set(Tinyusdz_REPO_ABSPATH "${Tinyusdz_BASE_ABSPATH}/autoclone")
+
+    # Note: ALWAYS specify a git commit hash (or tag) instead of a branch name; using a branch
+    #       name can lead to non-deterministic (unpredictable) results since the code is potentially
+    #       in flux
+    # "dev" branch, 14 Mar 2025
+    set(TINYUSDZ_GIT_TAG "6050eef932f7d2788656d63297aa488fb0961ed1")
+    message("****")
+    message("\n\n**** Cloning tinyusdz repo, git tag ${TINYUSDZ_GIT_TAG}\n\n")
+
+    # Patch required to build arm32 on android
+    set(TINYUSDZ_PATCH_CMD git apply ${Tinyusdz_BASE_ABSPATH}/patches/tinyusdz.patch)
+
+    # Note: CMake's "FetchContent" (which executes at configure time) is much better for this use case
+    #       than "ExternalProject" (which executes at build time); we just want to clone a repo and
+    #       block (wait) as long as necessary until cloning is complete, so we immediately have full
+    #       access to the cloned source files
+    include(FetchContent)
+    # Only want to clone once (on Android, using SOURCE_DIR will clone per-ABI (x86, x86_64 etc))
+    set(FETCHCONTENT_BASE_DIR ${Tinyusdz_REPO_ABSPATH})
+    set(FETCHCONTENT_QUIET on) # Turn off to troubleshoot repo clone problems
+    set(FETCHCONTENT_UPDATES_DISCONNECTED on) # Prevent other ABIs from re-cloning/re-patching etc
+    FetchContent_Declare(
+            tinyusdz_repo
+            EXCLUDE_FROM_ALL TRUE
+            GIT_REPOSITORY "https://github.com/lighttransport/tinyusdz"
+            GIT_TAG        ${TINYUSDZ_GIT_TAG}
+            PATCH_COMMAND  ${TINYUSDZ_PATCH_CMD}
+    )
+    FetchContent_MakeAvailable(tinyusdz_repo)
+    message("**** Finished cloning tinyusdz repo")
+    message("****")
+
+    set(Tinyusdz_SRC_ABSPATH "${Tinyusdz_REPO_ABSPATH}/tinyusdz_repo-src/src")
+    set(Tinyusdz_SRCS
+            ${Tinyusdz_SRC_ABSPATH}/ascii-parser.cc
+            ${Tinyusdz_SRC_ABSPATH}/ascii-parser-basetype.cc
+            ${Tinyusdz_SRC_ABSPATH}/ascii-parser-timesamples.cc
+            ${Tinyusdz_SRC_ABSPATH}/ascii-parser-timesamples-array.cc
+            ${Tinyusdz_SRC_ABSPATH}/asset-resolution.cc
+            ${Tinyusdz_SRC_ABSPATH}/composition.cc
+            ${Tinyusdz_SRC_ABSPATH}/crate-format.cc
+            ${Tinyusdz_SRC_ABSPATH}/crate-pprint.cc
+            ${Tinyusdz_SRC_ABSPATH}/crate-reader.cc
+            ${Tinyusdz_SRC_ABSPATH}/image-loader.cc
+            ${Tinyusdz_SRC_ABSPATH}/image-util.cc
+            ${Tinyusdz_SRC_ABSPATH}/image-writer.cc
+            ${Tinyusdz_SRC_ABSPATH}/io-util.cc
+            ${Tinyusdz_SRC_ABSPATH}/linear-algebra.cc
+            ${Tinyusdz_SRC_ABSPATH}/path-util.cc
+            ${Tinyusdz_SRC_ABSPATH}/pprinter.cc
+            ${Tinyusdz_SRC_ABSPATH}/prim-composition.cc
+            ${Tinyusdz_SRC_ABSPATH}/prim-reconstruct.cc
+            ${Tinyusdz_SRC_ABSPATH}/prim-types.cc
+            ${Tinyusdz_SRC_ABSPATH}/primvar.cc
+            ${Tinyusdz_SRC_ABSPATH}/stage.cc
+            ${Tinyusdz_SRC_ABSPATH}/str-util.cc
+            ${Tinyusdz_SRC_ABSPATH}/tiny-format.cc
+            ${Tinyusdz_SRC_ABSPATH}/tinyusdz.cc
+            ${Tinyusdz_SRC_ABSPATH}/tydra/attribute-eval.cc
+            ${Tinyusdz_SRC_ABSPATH}/tydra/attribute-eval-typed.cc
+            ${Tinyusdz_SRC_ABSPATH}/tydra/attribute-eval-typed-animatable.cc
+            ${Tinyusdz_SRC_ABSPATH}/tydra/attribute-eval-typed-animatable-fallback.cc
+            ${Tinyusdz_SRC_ABSPATH}/tydra/attribute-eval-typed-fallback.cc
+            ${Tinyusdz_SRC_ABSPATH}/tydra/facial.cc
+            ${Tinyusdz_SRC_ABSPATH}/tydra/prim-apply.cc
+            ${Tinyusdz_SRC_ABSPATH}/tydra/render-data.cc
+            ${Tinyusdz_SRC_ABSPATH}/tydra/scene-access.cc
+            ${Tinyusdz_SRC_ABSPATH}/tydra/shader-network.cc
+            ${Tinyusdz_SRC_ABSPATH}/usda-reader.cc
+            ${Tinyusdz_SRC_ABSPATH}/usda-writer.cc
+            ${Tinyusdz_SRC_ABSPATH}/usdc-reader.cc
+            ${Tinyusdz_SRC_ABSPATH}/usdc-writer.cc
+            ${Tinyusdz_SRC_ABSPATH}/usdGeom.cc
+            ${Tinyusdz_SRC_ABSPATH}/usdLux.cc
+            ${Tinyusdz_SRC_ABSPATH}/usdMtlx.cc
+            ${Tinyusdz_SRC_ABSPATH}/usdShade.cc
+            ${Tinyusdz_SRC_ABSPATH}/usdSkel.cc
+            ${Tinyusdz_SRC_ABSPATH}/value-pprint.cc
+            ${Tinyusdz_SRC_ABSPATH}/value-types.cc
+            ${Tinyusdz_SRC_ABSPATH}/xform.cc
+    )
+
+    set(Tinyusdz_DEP_SOURCES
+            ${Tinyusdz_SRC_ABSPATH}/external/fpng.cpp
+            #${Tinyusdz_SRC_ABSPATH}/external/staticstruct.cc
+            #${Tinyusdz_SRC_ABSPATH}/external/string_id/database.cpp
+            #${Tinyusdz_SRC_ABSPATH}/external/string_id/error.cpp
+            #${Tinyusdz_SRC_ABSPATH}/external/string_id/string_id.cpp
+            #${Tinyusdz_SRC_ABSPATH}/external/tinyxml2/tinyxml2.cpp
+            ${Tinyusdz_SRC_ABSPATH}/integerCoding.cpp
+            ${Tinyusdz_SRC_ABSPATH}/lz4-compression.cc
+            ${Tinyusdz_SRC_ABSPATH}/lz4/lz4.c
+    )
+
+    set(tinyusdz_INCLUDE_DIRS "${Tinyusdz_SRC_ABSPATH}")
+    INCLUDE_DIRECTORIES(${tinyusdz_INCLUDE_DIRS})
+    SOURCE_GROUP( Contrib\\Tinyusdz
+            FILES
+            ${Tinyusdz_SRCS}
+            ${Tinyusdz_DEP_SOURCES}
+    )
+    MESSAGE(STATUS "tinyusdz enabled")
+ELSE() # IF (ASSIMP_BUILD_USD_IMPORTER)
+    set(Tinyusdz_SRCS "")
+    set(Tinyusdz_DEP_SOURCES "")
+    MESSAGE(STATUS "tinyusdz disabled")
+ENDIF() # IF (ASSIMP_BUILD_USD_IMPORTER)
+
 # pugixml
 IF(ASSIMP_HUNTER_ENABLED)
   hunter_add_package(pugixml)
   find_package(pugixml CONFIG REQUIRED)
-ELSE()
+ELSEIF(NOT TARGET pugixml::pugixml)
   SET( Pugixml_SRCS
     ../contrib/pugixml/src/pugiconfig.hpp
+    ../contrib/pugixml/src/pugixml.cpp
     ../contrib/pugixml/src/pugixml.hpp
   )
   INCLUDE_DIRECTORIES("../contrib/pugixml/src")
@@ -1115,11 +1326,6 @@ if(MSVC10)
   endif()
 endif()
 
-IF( MSVC OR "${CMAKE_CXX_SIMULATE_ID}" MATCHES "MSVC") # clang with MSVC ABI
-  ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
-  ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
-endif ()
-
 IF(NOT ASSIMP_HUNTER_ENABLED)
   if (UNZIP_FOUND)
     SET (unzip_compile_SRCS "")
@@ -1150,6 +1356,7 @@ SET( assimp_src
   ${PostProcessing_SRCS}
   ${MaterialSystem_SRCS}
   ${STEPParser_SRCS}
+  ${glTFCommon_src}
 #  ${Step_SRCS} check if we need a different approach
 
   # Model Support
@@ -1163,6 +1370,9 @@ SET( assimp_src
   ${openddl_parser_SRCS}
   ${open3dgc_SRCS}
   ${ziplib_SRCS}
+  ${Meshlab_SRCS}
+  ${Tinyusdz_SRCS}
+  ${Tinyusdz_DEP_SOURCES}
   ${Pugixml_SRCS}
   ${stb_SRCS}
   ${MikkTSpaceTangents_SRCS}
@@ -1197,15 +1407,18 @@ ADD_LIBRARY(assimp::assimp ALIAS assimp)
 IF (BUILD_SHARED_LIBS)
   TARGET_COMPILE_DEFINITIONS(assimp PRIVATE ASSIMP_BUILD_DLL_EXPORT)
 ELSE ()
-  TARGET_COMPILE_DEFINITIONS(assimp PRIVATE OPENDDL_STATIC_LIBARY)
+  TARGET_COMPILE_DEFINITIONS(assimp PRIVATE OPENDDL_STATIC_LIBARY P2T_STATIC_EXPORTS)
 ENDIF ()
 
 TARGET_USE_COMMON_OUTPUT_DIRECTORY(assimp)
 
+add_compile_options(
+  "$<$<CONFIG:DEBUG>:-O0;-g3;-ggdb>"
+)
+
 IF (ASSIMP_WARNINGS_AS_ERRORS)
   MESSAGE(STATUS "Treating all warnings as errors (for assimp library only)")
   IF (MSVC)
-
     IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) # clang-cl
       TARGET_COMPILE_OPTIONS(assimp PRIVATE -Wall -Werror
         -Wno-microsoft-enum-value
@@ -1255,6 +1468,8 @@ IF (ASSIMP_WARNINGS_AS_ERRORS)
         -Wno-unused-template
         -Wno-undefined-func-template
         -Wno-declaration-after-statement
+        -Wno-deprecated-declarations
+	      -Wno-deprecated-non-prototype
       )
     ELSE()
       TARGET_COMPILE_OPTIONS(assimp PRIVATE /W4 /WX)
@@ -1276,9 +1491,7 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC
 IF(ASSIMP_HUNTER_ENABLED)
   TARGET_LINK_LIBRARIES(assimp
       PUBLIC
-      #polyclipping::polyclipping
       openddlparser::openddl_parser
-      #poly2tri::poly2tri
       minizip::minizip
       ZLIB::zlib
       RapidJSON::rapidjson
@@ -1291,13 +1504,16 @@ IF(ASSIMP_HUNTER_ENABLED)
   endif()
 
   if (ASSIMP_BUILD_DRACO)
-    target_link_libraries(assimp PUBLIC ${draco_LIBRARIES})
+    target_link_libraries(assimp PRIVATE ${draco_LIBRARIES})
   endif()
 ELSE()
   TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES})
   if (ASSIMP_BUILD_DRACO)
     target_link_libraries(assimp ${draco_LIBRARIES})
   endif()
+  if(TARGET pugixml::pugixml)
+    target_link_libraries(assimp pugixml::pugixml)
+  endif()
 ENDIF()
 
 if(ASSIMP_ANDROID_JNIIOSYSTEM)
@@ -1405,19 +1621,20 @@ IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC)
   TARGET_LINK_LIBRARIES(assimp rt)
 ENDIF ()
 
+IF(ASSIMP_INSTALL)
+  INSTALL( TARGETS assimp
+    EXPORT "${TARGETS_EXPORT_NAME}"
+    LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} COMPONENT ${LIBASSIMP_COMPONENT}
+    ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} COMPONENT ${LIBASSIMP-DEV_COMPONENT}
+    RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} COMPONENT ${LIBASSIMP_COMPONENT}
+    FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} COMPONENT ${LIBASSIMP_COMPONENT}
+    INCLUDES DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}
+  )
+  INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp COMPONENT assimp-dev)
+  INSTALL( FILES ${COMPILER_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp/Compiler COMPONENT assimp-dev)
+ENDIF()
 
-INSTALL( TARGETS assimp
-  EXPORT "${TARGETS_EXPORT_NAME}"
-  LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} COMPONENT ${LIBASSIMP_COMPONENT}
-  ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} COMPONENT ${LIBASSIMP-DEV_COMPONENT}
-  RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} COMPONENT ${LIBASSIMP_COMPONENT}
-  FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} COMPONENT ${LIBASSIMP_COMPONENT}
-  INCLUDES DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}
-)
-INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp COMPONENT assimp-dev)
-INSTALL( FILES ${COMPILER_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp/Compiler COMPONENT assimp-dev)
-
-if (ASSIMP_ANDROID_JNIIOSYSTEM)
+if (ASSIMP_ANDROID_JNIIOSYSTEM AND ASSIMP_INSTALL)
   INSTALL(FILES ${HEADER_PATH}/${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/AndroidJNIIOSystem.h
     DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}
     COMPONENT assimp-dev)
@@ -1433,7 +1650,7 @@ if(MSVC AND ASSIMP_INSTALL_PDB)
       COMPILE_PDB_NAME_DEBUG assimp${LIBRARY_SUFFIX}${CMAKE_DEBUG_POSTFIX}
     )
 
-    IF(GENERATOR_IS_MULTI_CONFIG)
+    IF(is_multi_config)
       install(FILES ${Assimp_BINARY_DIR}/code/Debug/assimp${LIBRARY_SUFFIX}${CMAKE_DEBUG_POSTFIX}.pdb
         DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
         CONFIGURATIONS Debug
diff --git a/code/Common/AssertHandler.cpp b/code/Common/AssertHandler.cpp
index 2fd4046ad..732865141 100644
--- a/code/Common/AssertHandler.cpp
+++ b/code/Common/AssertHandler.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/Assimp.cpp b/code/Common/Assimp.cpp
index e3b39c349..f84951b1f 100644
--- a/code/Common/Assimp.cpp
+++ b/code/Common/Assimp.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -120,10 +120,10 @@ static std::mutex gLogStreamMutex;
 
 // ------------------------------------------------------------------------------------------------
 // Custom LogStream implementation for the C-API
-class LogToCallbackRedirector : public LogStream {
+class LogToCallbackRedirector final : public LogStream {
 public:
     explicit LogToCallbackRedirector(const aiLogStream &s) :
-            stream(s) {
+            mStream(s) {
         ai_assert(nullptr != s.callback);
     }
 
@@ -137,7 +137,7 @@ public:
         // might cause strange problems, but the chance is quite low.
 
         PredefLogStreamMap::iterator it = std::find(gPredefinedStreams.begin(),
-                gPredefinedStreams.end(), (Assimp::LogStream *)stream.user);
+                gPredefinedStreams.end(), (Assimp::LogStream *)mStream.user);
 
         if (it != gPredefinedStreams.end()) {
             delete *it;
@@ -147,11 +147,11 @@ public:
 
     /** @copydoc LogStream::write */
     void write(const char *message) {
-        stream.callback(message, stream.user);
+        mStream.callback(message, mStream.user);
     }
 
 private:
-    aiLogStream stream;
+    const aiLogStream &mStream;
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -233,8 +233,13 @@ const aiScene *aiImportFileFromMemoryWithProperties(
         unsigned int pFlags,
         const char *pHint,
         const aiPropertyStore *props) {
-    ai_assert(nullptr != pBuffer);
-    ai_assert(0 != pLength);
+    if (pBuffer == nullptr) {
+        return nullptr;
+    }
+
+    if (pLength == 0u) {
+        return nullptr;
+    }
 
     const aiScene *scene = nullptr;
     ASSIMP_BEGIN_EXCEPTION_REGION();
@@ -349,25 +354,31 @@ ASSIMP_API const aiScene *aiApplyCustomizedPostProcessing(const aiScene *scene,
 void CallbackToLogRedirector(const char *msg, char *dt) {
     ai_assert(nullptr != msg);
     ai_assert(nullptr != dt);
-    LogStream *s = (LogStream *)dt;
-
-    s->write(msg);
+    LogStream *stream = (LogStream *)dt;
+    if (stream != nullptr) {
+        stream->write(msg);
+    }
 }
 
+static LogStream *DefaultStream = nullptr;
+
 // ------------------------------------------------------------------------------------------------
 ASSIMP_API aiLogStream aiGetPredefinedLogStream(aiDefaultLogStream pStream, const char *file) {
     aiLogStream sout;
 
     ASSIMP_BEGIN_EXCEPTION_REGION();
-    LogStream *stream = LogStream::createDefaultStream(pStream, file);
-    if (!stream) {
+    if (DefaultStream == nullptr) {
+        DefaultStream = LogStream::createDefaultStream(pStream, file);
+    }
+
+    if (!DefaultStream) {
         sout.callback = nullptr;
         sout.user = nullptr;
     } else {
         sout.callback = &CallbackToLogRedirector;
-        sout.user = (char *)stream;
+        sout.user = (char *)DefaultStream;
     }
-    gPredefinedStreams.push_back(stream);
+    gPredefinedStreams.push_back(DefaultStream);
     ASSIMP_END_EXCEPTION_REGION(aiLogStream);
     return sout;
 }
@@ -406,6 +417,10 @@ ASSIMP_API aiReturn aiDetachLogStream(const aiLogStream *stream) {
     DefaultLogger::get()->detachStream(it->second);
     delete it->second;
 
+    if ((Assimp::LogStream *)stream->user == DefaultStream) {
+        DefaultStream = nullptr;
+    }
+
     gActiveLogStreams.erase(it);
 
     if (gActiveLogStreams.empty()) {
@@ -507,6 +522,11 @@ void aiGetMemoryRequirements(const C_STRUCT aiScene *pIn,
     ASSIMP_END_EXCEPTION_REGION(void);
 }
 
+// ------------------------------------------------------------------------------------------------
+ASSIMP_API const C_STRUCT aiTexture *aiGetEmbeddedTexture(const C_STRUCT aiScene *pIn, const char *filename) {
+    return pIn->GetEmbeddedTexture(filename);
+}
+
 // ------------------------------------------------------------------------------------------------
 ASSIMP_API aiPropertyStore *aiCreatePropertyStore(void) {
     return reinterpret_cast<aiPropertyStore *>(new PropertyMap());
@@ -738,14 +758,14 @@ ASSIMP_API void aiVector2DivideByVector(
 }
 
 // ------------------------------------------------------------------------------------------------
-ASSIMP_API float aiVector2Length(
+ASSIMP_API ai_real aiVector2Length(
         const C_STRUCT aiVector2D *v) {
     ai_assert(nullptr != v);
     return v->Length();
 }
 
 // ------------------------------------------------------------------------------------------------
-ASSIMP_API float aiVector2SquareLength(
+ASSIMP_API ai_real aiVector2SquareLength(
         const C_STRUCT aiVector2D *v) {
     ai_assert(nullptr != v);
     return v->SquareLength();
@@ -759,7 +779,7 @@ ASSIMP_API void aiVector2Negate(
 }
 
 // ------------------------------------------------------------------------------------------------
-ASSIMP_API float aiVector2DotProduct(
+ASSIMP_API ai_real aiVector2DotProduct(
         const C_STRUCT aiVector2D *a,
         const C_STRUCT aiVector2D *b) {
     ai_assert(nullptr != a);
@@ -854,14 +874,14 @@ ASSIMP_API void aiVector3DivideByVector(
 }
 
 // ------------------------------------------------------------------------------------------------
-ASSIMP_API float aiVector3Length(
+ASSIMP_API ai_real aiVector3Length(
         const C_STRUCT aiVector3D *v) {
     ai_assert(nullptr != v);
     return v->Length();
 }
 
 // ------------------------------------------------------------------------------------------------
-ASSIMP_API float aiVector3SquareLength(
+ASSIMP_API ai_real aiVector3SquareLength(
         const C_STRUCT aiVector3D *v) {
     ai_assert(nullptr != v);
     return v->SquareLength();
@@ -875,7 +895,7 @@ ASSIMP_API void aiVector3Negate(
 }
 
 // ------------------------------------------------------------------------------------------------
-ASSIMP_API float aiVector3DotProduct(
+ASSIMP_API ai_real aiVector3DotProduct(
         const C_STRUCT aiVector3D *a,
         const C_STRUCT aiVector3D *b) {
     ai_assert(nullptr != a);
@@ -961,7 +981,7 @@ ASSIMP_API void aiMatrix3Inverse(C_STRUCT aiMatrix3x3 *mat) {
 }
 
 // ------------------------------------------------------------------------------------------------
-ASSIMP_API float aiMatrix3Determinant(const C_STRUCT aiMatrix3x3 *mat) {
+ASSIMP_API ai_real aiMatrix3Determinant(const C_STRUCT aiMatrix3x3 *mat) {
     ai_assert(nullptr != mat);
     return mat->Determinant();
 }
@@ -1061,7 +1081,7 @@ ASSIMP_API void aiMatrix4Inverse(C_STRUCT aiMatrix4x4 *mat) {
 }
 
 // ------------------------------------------------------------------------------------------------
-ASSIMP_API float aiMatrix4Determinant(const C_STRUCT aiMatrix4x4 *mat) {
+ASSIMP_API ai_real aiMatrix4Determinant(const C_STRUCT aiMatrix4x4 *mat) {
     ai_assert(nullptr != mat);
     return mat->Determinant();
 }
@@ -1263,7 +1283,6 @@ ASSIMP_API void aiQuaternionInterpolate(
     aiQuaternion::Interpolate(*dst, *start, *end, factor);
 }
 
-
 // stb_image is a lightweight image loader. It is shared by:
 //  - M3D import
 //  - PBRT export
@@ -1274,21 +1293,21 @@ ASSIMP_API void aiQuaternionInterpolate(
 #define ASSIMP_HAS_M3D ((!ASSIMP_BUILD_NO_EXPORT && !ASSIMP_BUILD_NO_M3D_EXPORTER) || !ASSIMP_BUILD_NO_M3D_IMPORTER)
 
 #ifndef STB_USE_HUNTER
-#   if ASSIMP_HAS_PBRT_EXPORT
-#       define ASSIMP_NEEDS_STB_IMAGE 1
-#   elif ASSIMP_HAS_M3D
-#       define ASSIMP_NEEDS_STB_IMAGE 1
-#       define STBI_ONLY_PNG
-#   endif
+#if ASSIMP_HAS_PBRT_EXPORT
+#define ASSIMP_NEEDS_STB_IMAGE 1
+#elif ASSIMP_HAS_M3D
+#define ASSIMP_NEEDS_STB_IMAGE 1
+#define STBI_ONLY_PNG
+#endif
 #endif
 
 // Ensure all symbols are linked correctly
 #if ASSIMP_NEEDS_STB_IMAGE
-    // Share stb_image's PNG loader with other importers/exporters instead of bringing our own copy.
-#   define STBI_ONLY_PNG
-#   ifdef ASSIMP_USE_STB_IMAGE_STATIC
-#       define STB_IMAGE_STATIC
-#   endif
-#   define STB_IMAGE_IMPLEMENTATION
-#   include "Common/StbCommon.h"
+// Share stb_image's PNG loader with other importers/exporters instead of bringing our own copy.
+#define STBI_ONLY_PNG
+#ifdef ASSIMP_USE_STB_IMAGE_STATIC
+#define STB_IMAGE_STATIC
+#endif
+#define STB_IMAGE_IMPLEMENTATION
+#include "Common/StbCommon.h"
 #endif
diff --git a/code/Common/Base64.cpp b/code/Common/Base64.cpp
index 65308f4fd..77df44e5e 100644
--- a/code/Common/Base64.cpp
+++ b/code/Common/Base64.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp
index 9ef69a8e6..1894ad811 100644
--- a/code/Common/BaseImporter.cpp
+++ b/code/Common/BaseImporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -93,10 +93,6 @@ BaseImporter::BaseImporter() AI_NO_EXCEPT
     // empty
 }
 
-// ------------------------------------------------------------------------------------------------
-// Destructor, private as well
-BaseImporter::~BaseImporter() = default;
-
 void BaseImporter::UpdateImporterScale(Importer *pImp) {
     ai_assert(pImp != nullptr);
     ai_assert(importerScale != 0.0);
@@ -254,9 +250,10 @@ void BaseImporter::GetExtensionList(std::set<std::string> &extensions) {
 /*static*/ bool BaseImporter::SimpleExtensionCheck(const std::string &pFile,
         const char *ext0,
         const char *ext1,
-        const char *ext2) {
+        const char *ext2,
+        const char *ext3) {
     std::set<std::string> extensions;
-    for (const char* ext : {ext0, ext1, ext2}) {
+    for (const char* ext : {ext0, ext1, ext2, ext3}) {
         if (ext == nullptr) continue;
         extensions.emplace(ext);
     }
@@ -378,6 +375,9 @@ void BaseImporter::ConvertToUTF8(std::vector<char> &data) {
 
     // UTF 32 BE with BOM
     if (*((uint32_t *)&data.front()) == 0xFFFE0000) {
+        if (data.size() % sizeof(uint32_t) != 0) {
+            throw DeadlyImportError("Not valid UTF-32 BE");
+        }
 
         // swap the endianness ..
         for (uint32_t *p = (uint32_t *)&data.front(), *end = (uint32_t *)&data.back(); p <= end; ++p) {
@@ -387,11 +387,14 @@ void BaseImporter::ConvertToUTF8(std::vector<char> &data) {
 
     // UTF 32 LE with BOM
     if (*((uint32_t *)&data.front()) == 0x0000FFFE) {
+        if (data.size() % sizeof(uint32_t) != 0) {
+            throw DeadlyImportError("Not valid UTF-32 LE");
+        }
         ASSIMP_LOG_DEBUG("Found UTF-32 BOM ...");
 
         std::vector<char> output;
-        int *ptr = (int *)&data[0];
-        int *end = ptr + (data.size() / sizeof(int)) + 1;
+        auto *ptr = (uint32_t *)&data[0];
+        uint32_t *end = ptr + (data.size() / sizeof(uint32_t)) + 1;
         utf8::utf32to8(ptr, end, back_inserter(output));
         return;
     }
@@ -399,8 +402,8 @@ void BaseImporter::ConvertToUTF8(std::vector<char> &data) {
     // UTF 16 BE with BOM
     if (*((uint16_t *)&data.front()) == 0xFFFE) {
         // Check to ensure no overflow can happen
-        if(data.size() % 2 != 0) {
-            return;
+        if (data.size() % sizeof(uint16_t) != 0) {
+            throw DeadlyImportError("Not valid UTF-16 BE");
         }
         // swap the endianness ..
         for (uint16_t *p = (uint16_t *)&data.front(), *end = (uint16_t *)&data.back(); p <= end; ++p) {
@@ -410,6 +413,9 @@ void BaseImporter::ConvertToUTF8(std::vector<char> &data) {
 
     // UTF 16 LE with BOM
     if (*((uint16_t *)&data.front()) == 0xFEFF) {
+        if (data.size() % sizeof(uint16_t) != 0) {
+            throw DeadlyImportError("Not valid UTF-16 LE");
+        }
         ASSIMP_LOG_DEBUG("Found UTF-16 BOM ...");
 
         std::vector<unsigned char> output;
diff --git a/code/Common/BaseProcess.cpp b/code/Common/BaseProcess.cpp
index 8ff7c98e9..2a6a4679a 100644
--- a/code/Common/BaseProcess.cpp
+++ b/code/Common/BaseProcess.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -57,10 +57,6 @@ BaseProcess::BaseProcess() AI_NO_EXCEPT
     // empty
 }
 
-// ------------------------------------------------------------------------------------------------
-// Destructor, private as well
-BaseProcess::~BaseProcess() = default;
-
 // ------------------------------------------------------------------------------------------------
 void BaseProcess::ExecuteOnScene(Importer *pImp) {
     ai_assert( nullptr != pImp );
diff --git a/code/Common/BaseProcess.h b/code/Common/BaseProcess.h
index d2af4faa6..c35dab013 100644
--- a/code/Common/BaseProcess.h
+++ b/code/Common/BaseProcess.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -179,11 +179,11 @@ class ASSIMP_API BaseProcess {
     friend class Importer;
 
 public:
-    /** @brief onstructor to be privately used by Importer */
+    /** @brief Constructor to be privately used by Importer */
     BaseProcess() AI_NO_EXCEPT;
 
-    /** @brief Destructor, private as well */
-    virtual ~BaseProcess();
+    /** @brief Destructor */
+    virtual ~BaseProcess() = default;
 
     // -------------------------------------------------------------------
     /**
diff --git a/code/Common/Bitmap.cpp b/code/Common/Bitmap.cpp
index 65dfd1754..61aade41b 100644
--- a/code/Common/Bitmap.cpp
+++ b/code/Common/Bitmap.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -148,8 +148,10 @@ void Bitmap::WriteData(aiTexture *texture, IOStream *file) {
 
             file->Write(pixel, mBytesPerPixel, 1);
         }
-
-        file->Write(padding_data, padding, 1);
+        // When padding is 0, passing it as an argument will cause an assertion failure in DefaultIOStream::Write.
+        if (padding) {
+            file->Write(padding_data, padding, 1);
+        }
     }
 }
 
diff --git a/code/Common/Compression.cpp b/code/Common/Compression.cpp
index a6a7be7e4..d6699620a 100644
--- a/code/Common/Compression.cpp
+++ b/code/Common/Compression.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/Compression.h b/code/Common/Compression.h
index cfedc7409..1106315af 100644
--- a/code/Common/Compression.h
+++ b/code/Common/Compression.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/CreateAnimMesh.cpp b/code/Common/CreateAnimMesh.cpp
index 58f3d909d..501c79b98 100644
--- a/code/Common/CreateAnimMesh.cpp
+++ b/code/Common/CreateAnimMesh.cpp
@@ -4,7 +4,7 @@ Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
 Copyright (C) 2016 The Qt Company Ltd.
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/CreateAnimMesh.h>
 
-namespace Assimp    {
+namespace Assimp {
 
 aiAnimMesh *aiCreateAnimMesh(const aiMesh *mesh, bool needPositions, bool needNormals, bool needTangents, bool needColors, bool needTexCoords)
 {
diff --git a/code/Common/DefaultIOStream.cpp b/code/Common/DefaultIOStream.cpp
index f2c772187..55b80168b 100644
--- a/code/Common/DefaultIOStream.cpp
+++ b/code/Common/DefaultIOStream.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -157,9 +157,9 @@ size_t DefaultIOStream::FileSize() const {
             return 0;
         mCachedSize = (size_t)(fileStat.st_size);
 #elif defined _WIN32
-        struct _stat32 fileStat;
+        struct _stat fileStat;
         //using fileno + fstat avoids having to handle the filename
-        int err = _fstat32(_fileno(mFile), &fileStat);
+        int err = _fstat(_fileno(mFile), &fileStat);
         if (0 != err)
             return 0;
         mCachedSize = (size_t)(fileStat.st_size);
diff --git a/code/Common/DefaultIOSystem.cpp b/code/Common/DefaultIOSystem.cpp
index b28910c70..31f9754ae 100644
--- a/code/Common/DefaultIOSystem.cpp
+++ b/code/Common/DefaultIOSystem.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -93,18 +93,24 @@ static std::string WideToUtf8(const wchar_t *in) {
 // ------------------------------------------------------------------------------------------------
 // Tests for the existence of a file at the given path.
 bool DefaultIOSystem::Exists(const char *pFile) const {
+    if (pFile == nullptr) {
+        return false;
+    }
+
 #ifdef _WIN32
     struct __stat64 filestat;
     if (_wstat64(Utf8ToWide(pFile).c_str(), &filestat) != 0) {
         return false;
     }
 #else
-    FILE *file = ::fopen(pFile, "rb");
-    if (!file) {
+	struct stat statbuf;
+    if (stat(pFile, &statbuf) != 0) {
+        return false;
+    }
+    // test for a regular file
+    if (!S_ISREG(statbuf.st_mode)) {
         return false;
     }
-
-    ::fclose(file);
 #endif
 
     return true;
@@ -116,6 +122,7 @@ IOStream *DefaultIOSystem::Open(const char *strFile, const char *strMode) {
     ai_assert(strFile != nullptr);
     ai_assert(strMode != nullptr);
     FILE *file;
+
 #ifdef _WIN32
     std::wstring name = Utf8ToWide(strFile);
     if (name.empty()) {
@@ -126,6 +133,7 @@ IOStream *DefaultIOSystem::Open(const char *strFile, const char *strMode) {
 #else
     file = ::fopen(strFile, strMode);
 #endif
+
     if (!file) {
         return nullptr;
     }
diff --git a/code/Common/DefaultLogger.cpp b/code/Common/DefaultLogger.cpp
index 5cb32d38f..59f55d26c 100644
--- a/code/Common/DefaultLogger.cpp
+++ b/code/Common/DefaultLogger.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
@@ -221,13 +221,11 @@ void DefaultLogger::set(Logger *logger) {
 #endif
 
     if (nullptr == logger) {
-        logger = &s_pNullLogger;
+        m_pLogger = &s_pNullLogger;
     }
-    if (nullptr != m_pLogger && !isNullLogger()) {
-        delete m_pLogger;
+    else {
+        m_pLogger = logger;
     }
-
-    DefaultLogger::m_pLogger = logger;
 }
 
 // ----------------------------------------------------------------------------------
@@ -320,9 +318,13 @@ bool DefaultLogger::attachStream(LogStream *pStream, unsigned int severity) {
     }
 
     if (0 == severity) {
-        severity = Logger::Info | Logger::Err | Logger::Warn | Logger::Debugging;
+        severity = SeverityAll;
     }
 
+#ifndef ASSIMP_BUILD_SINGLETHREADED
+    std::lock_guard<std::mutex> lock(m_arrayMutex);
+#endif
+
     for (StreamIt it = m_StreamArray.begin();
             it != m_StreamArray.end();
             ++it) {
@@ -348,6 +350,10 @@ bool DefaultLogger::detachStream(LogStream *pStream, unsigned int severity) {
         severity = SeverityAll;
     }
 
+#ifndef ASSIMP_BUILD_SINGLETHREADED
+    std::lock_guard<std::mutex> lock(m_arrayMutex);
+#endif
+
     bool res(false);
     for (StreamIt it = m_StreamArray.begin(); it != m_StreamArray.end(); ++it) {
         if ((*it)->m_pStream == pStream) {
@@ -387,6 +393,10 @@ DefaultLogger::~DefaultLogger() {
 void DefaultLogger::WriteToStreams(const char *message, ErrorSeverity ErrorSev) {
     ai_assert(nullptr != message);
 
+#ifndef ASSIMP_BUILD_SINGLETHREADED
+    std::lock_guard<std::mutex> lock(m_arrayMutex);
+#endif
+
     // Check whether this is a repeated message
     auto thisLen = ::strlen(message);
     if (thisLen == lastLen - 1 && !::strncmp(message, lastMsg, lastLen - 1)) {
diff --git a/code/Common/DefaultProgressHandler.h b/code/Common/DefaultProgressHandler.h
index ac1bb68db..bf40afd46 100644
--- a/code/Common/DefaultProgressHandler.h
+++ b/code/Common/DefaultProgressHandler.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/Exceptional.cpp b/code/Common/Exceptional.cpp
index b25281a97..e98c370c0 100644
--- a/code/Common/Exceptional.cpp
+++ b/code/Common/Exceptional.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/Exporter.cpp b/code/Common/Exporter.cpp
index 0795da65c..c83782bd5 100644
--- a/code/Common/Exporter.cpp
+++ b/code/Common/Exporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -159,10 +159,8 @@ static void setupExporterArray(std::vector<Exporter::ExportFormatEntry> &exporte
 #endif
 
 #ifndef ASSIMP_BUILD_NO_OBJ_EXPORTER
-	exporters.emplace_back("obj", "Wavefront OBJ format", "obj", &ExportSceneObj,
-			aiProcess_GenSmoothNormals /*| aiProcess_PreTransformVertices */);
-	exporters.emplace_back("objnomtl", "Wavefront OBJ format without material file", "obj", &ExportSceneObjNoMtl,
-			aiProcess_GenSmoothNormals /*| aiProcess_PreTransformVertices */);
+	exporters.emplace_back("obj", "Wavefront OBJ format", "obj", &ExportSceneObj);
+	exporters.emplace_back("objnomtl", "Wavefront OBJ format without material file", "obj", &ExportSceneObjNoMtl);
 #endif
 
 #ifndef ASSIMP_BUILD_NO_STL_EXPORTER
diff --git a/code/Common/FileLogStream.h b/code/Common/FileLogStream.h
index 334541485..0f40f4083 100644
--- a/code/Common/FileLogStream.h
+++ b/code/Common/FileLogStream.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/FileSystemFilter.h b/code/Common/FileSystemFilter.h
index c530153d4..62886de9c 100644
--- a/code/Common/FileSystemFilter.h
+++ b/code/Common/FileSystemFilter.h
@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/fast_atof.h>
 #include <assimp/ParsingUtils.h>
 
-namespace Assimp    {
+namespace Assimp {
 
 inline bool IsHex(char s) {
     return (s>='0' && s<='9') || (s>='a' && s<='f') || (s>='A' && s<='F');
diff --git a/code/Common/IFF.h b/code/Common/IFF.h
index d5469a760..cdca13eb5 100644
--- a/code/Common/IFF.h
+++ b/code/Common/IFF.h
@@ -7,8 +7,8 @@
 
 #include <assimp/ByteSwapper.h>
 
-namespace Assimp    {
-namespace IFF       {
+namespace Assimp {
+namespace IFF {
 
 /////////////////////////////////////////////////////////////////////////////////
 //! Describes an IFF chunk header
diff --git a/code/Common/IOSystem.cpp b/code/Common/IOSystem.cpp
index 1e63827ba..d2f375a61 100644
--- a/code/Common/IOSystem.cpp
+++ b/code/Common/IOSystem.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/Importer.cpp b/code/Common/Importer.cpp
index bdf64ac8f..a71c28df6 100644
--- a/code/Common/Importer.cpp
+++ b/code/Common/Importer.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -771,6 +771,7 @@ const aiScene* Importer::ReadFile( const char* _pFile, unsigned int pFlags) {
 #else
         pimpl->mErrorString = std::string("std::exception: ") + e.what();
 #endif
+        pimpl->mException = std::current_exception();
 
         ASSIMP_LOG_ERROR(pimpl->mErrorString);
         delete pimpl->mScene; pimpl->mScene = nullptr;
@@ -848,11 +849,7 @@ const aiScene* Importer::ApplyPostProcessing(unsigned int pFlags) {
             break;
         }
 #ifdef ASSIMP_BUILD_DEBUG
-
-#ifdef ASSIMP_BUILD_NO_VALIDATEDS_PROCESS
-        continue;
-#endif  // no validation
-
+#ifndef ASSIMP_BUILD_NO_VALIDATEDS_PROCESS
         // If the extra verbose mode is active, execute the ValidateDataStructureStep again - after each step
         if (pimpl->bExtraVerbose)   {
             ASSIMP_LOG_DEBUG("Verbose Import: re-validating data structures");
@@ -864,6 +861,7 @@ const aiScene* Importer::ApplyPostProcessing(unsigned int pFlags) {
                 break;
             }
         }
+#endif  // no validation
 #endif // ! DEBUG
     }
     pimpl->mProgressHandler->UpdatePostProcess( static_cast<int>(pimpl->mPostProcessingSteps.size()),
@@ -939,6 +937,7 @@ const aiScene* Importer::ApplyCustomizedPostProcessing( BaseProcess *rootProcess
         profiler->EndRegion( "postprocess" );
     }
 
+#ifndef ASSIMP_BUILD_NO_VALIDATEDS_PROCESS
     // If the extra verbose mode is active, execute the ValidateDataStructureStep again - after each step
     if ( pimpl->bExtraVerbose || requestValidation  ) {
         ASSIMP_LOG_DEBUG( "Verbose Import: revalidating data structures" );
@@ -949,6 +948,7 @@ const aiScene* Importer::ApplyCustomizedPostProcessing( BaseProcess *rootProcess
             ASSIMP_LOG_ERROR( "Verbose Import: failed to revalidate data structures" );
         }
     }
+#endif // no validation
 
     // clear any data allocated by post-process steps
     pimpl->mPPShared->Clean();
diff --git a/code/Common/Importer.h b/code/Common/Importer.h
index ab7e3a6b3..bb37f3ba8 100644
--- a/code/Common/Importer.h
+++ b/code/Common/Importer.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct aiScene;
 
-namespace Assimp    {
+namespace Assimp {
     class ProgressHandler;
     class IOSystem;
     class BaseImporter;
@@ -74,11 +74,11 @@ public:
     typedef unsigned int KeyType;
 
     // typedefs for our configuration maps.
-    typedef std::map<KeyType, int> IntPropertyMap;
-    typedef std::map<KeyType, ai_real> FloatPropertyMap;
-    typedef std::map<KeyType, std::string> StringPropertyMap;
-    typedef std::map<KeyType, aiMatrix4x4> MatrixPropertyMap;
-    typedef std::map<KeyType, void*> PointerPropertyMap;
+    using IntPropertyMap = std::map<KeyType, int>;
+    using FloatPropertyMap = std::map<KeyType, ai_real>;
+    using StringPropertyMap = std::map<KeyType, std::string>;
+    using MatrixPropertyMap = std::map<KeyType, aiMatrix4x4>;
+    using PointerPropertyMap = std::map<KeyType, void*>;
 
     /** IO handler to use for all file accesses. */
     IOSystem* mIOHandler;
@@ -128,10 +128,12 @@ public:
 
     /// The default class constructor.
     ImporterPimpl() AI_NO_EXCEPT;
+
+    /// The class destructor.
+    ~ImporterPimpl() = default;
 };
 
-inline
-ImporterPimpl::ImporterPimpl() AI_NO_EXCEPT :
+inline ImporterPimpl::ImporterPimpl() AI_NO_EXCEPT :
         mIOHandler( nullptr ),
         mIsDefaultHandler( false ),
         mProgressHandler( nullptr ),
diff --git a/code/Common/ImporterRegistry.cpp b/code/Common/ImporterRegistry.cpp
index c67fee936..c98518eef 100644
--- a/code/Common/ImporterRegistry.cpp
+++ b/code/Common/ImporterRegistry.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -55,6 +55,9 @@ corresponding preprocessor flag to selectively disable formats.
 // Importers
 // (include_new_importers_here)
 // ------------------------------------------------------------------------------------------------
+#if !defined(ASSIMP_BUILD_NO_USD_IMPORTER)
+#include "AssetLib/USD/USDLoader.h"
+#endif
 #ifndef ASSIMP_BUILD_NO_X_IMPORTER
 #include "AssetLib/X/XFileImporter.h"
 #endif
@@ -230,6 +233,9 @@ void GetImporterInstanceList(std::vector<BaseImporter *> &out) {
     // (register_new_importers_here)
     // ----------------------------------------------------------------------------
     out.reserve(64);
+#if !defined(ASSIMP_BUILD_NO_USD_IMPORTER)
+    out.push_back(new USDImporter());
+#endif
 #if (!defined ASSIMP_BUILD_NO_X_IMPORTER)
     out.push_back(new XFileImporter());
 #endif
diff --git a/code/Common/Maybe.h b/code/Common/Maybe.h
index 387c1bcaf..b7041dd84 100644
--- a/code/Common/Maybe.h
+++ b/code/Common/Maybe.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -83,6 +83,7 @@ struct Maybe {
 
     Maybe &operator&() = delete;
     Maybe(const Maybe &) = delete;
+    Maybe &operator=(const Maybe &) = default;
 
 private:
     T _val;
diff --git a/code/Common/PolyTools.h b/code/Common/PolyTools.h
index b53de8579..a3b04e0e0 100644
--- a/code/Common/PolyTools.h
+++ b/code/Common/PolyTools.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/PostStepRegistry.cpp b/code/Common/PostStepRegistry.cpp
index de4f39083..62ab3b691 100644
--- a/code/Common/PostStepRegistry.cpp
+++ b/code/Common/PostStepRegistry.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/code/Common/RemoveComments.cpp b/code/Common/RemoveComments.cpp
index 52dd37ff0..c8979578c 100644
--- a/code/Common/RemoveComments.cpp
+++ b/code/Common/RemoveComments.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/SGSpatialSort.cpp b/code/Common/SGSpatialSort.cpp
index 0ef1853c0..c00627ad8 100644
--- a/code/Common/SGSpatialSort.cpp
+++ b/code/Common/SGSpatialSort.cpp
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -50,16 +48,13 @@ the 3ds loader handling smooth groups correctly  */
 using namespace Assimp;
 
 // ------------------------------------------------------------------------------------------------
-SGSpatialSort::SGSpatialSort()
-{
+SGSpatialSort::SGSpatialSort() {
     // define the reference plane. We choose some arbitrary vector away from all basic axes
     // in the hope that no model spreads all its vertices along this plane.
     mPlaneNormal.Set( 0.8523f, 0.34321f, 0.5736f);
     mPlaneNormal.Normalize();
 }
-// ------------------------------------------------------------------------------------------------
-// Destructor
-SGSpatialSort::~SGSpatialSort() = default;
+
 // ------------------------------------------------------------------------------------------------
 void SGSpatialSort::Add(const aiVector3D& vPosition, unsigned int index,
     unsigned int smoothingGroup)
diff --git a/code/Common/SceneCombiner.cpp b/code/Common/SceneCombiner.cpp
index 0188f5dea..638c8a0fb 100644
--- a/code/Common/SceneCombiner.cpp
+++ b/code/Common/SceneCombiner.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -53,7 +52,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
 // ----------------------------------------------------------------------------
 #include "ScenePrivate.h"
-#include "time.h"
 #include <assimp/Hash.h>
 #include <assimp/SceneCombiner.h>
 #include <assimp/StringUtils.h>
@@ -61,9 +59,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/mesh.h>
 #include <assimp/metadata.h>
 #include <assimp/scene.h>
-#include <stdio.h>
 #include <assimp/DefaultLogger.hpp>
 
+#include <unordered_set>
+#include <ctime>
+#include <cstdio>
+
 namespace Assimp {
 
 #if (__GNUC__ >= 8 && __GNUC_MINOR__ >= 0)
@@ -78,7 +79,7 @@ inline void PrefixString(aiString &string, const char *prefix, unsigned int len)
     if (string.length >= 1 && string.data[0] == '$')
         return;
 
-    if (len + string.length >= MAXLEN - 1) {
+    if (len + string.length >= AI_MAXLEN - 1) {
         ASSIMP_LOG_VERBOSE_DEBUG("Can't add an unique prefix because the string is too long");
         ai_assert(false);
         return;
@@ -95,6 +96,11 @@ inline void PrefixString(aiString &string, const char *prefix, unsigned int len)
 // ------------------------------------------------------------------------------------------------
 // Add node identifiers to a hashing set
 void SceneCombiner::AddNodeHashes(aiNode *node, std::set<unsigned int> &hashes) {
+    if (node == nullptr) {
+        ASSIMP_LOG_ERROR("Pointer to aiNode is nullptr.");
+        return;
+    }
+
     // Add node name to hashing set if it is non-empty - empty nodes are allowed
     // and they can't have any anims assigned so its absolutely safe to duplicate them.
     if (node->mName.length) {
@@ -252,6 +258,14 @@ void SceneCombiner::AttachToGraph(aiScene *master, std::vector<NodeAttachmentInf
 // ------------------------------------------------------------------------------------------------
 void SceneCombiner::MergeScenes(aiScene **_dest, aiScene *master, std::vector<AttachmentInfo> &srcList, unsigned int flags) {
     if (nullptr == _dest) {
+        std::unordered_set<aiScene *> uniqueScenes;
+        uniqueScenes.insert(master);
+        for (const auto &item : srcList) {
+            uniqueScenes.insert(item.scene);
+        }
+        for (const auto &item : uniqueScenes) {
+            delete item;
+        }
         return;
     }
 
@@ -259,6 +273,7 @@ void SceneCombiner::MergeScenes(aiScene **_dest, aiScene *master, std::vector<At
     if (srcList.empty()) {
         if (*_dest) {
             SceneCombiner::CopySceneFlat(_dest, master);
+            delete master;
         } else
             *_dest = master;
         return;
@@ -306,15 +321,6 @@ void SceneCombiner::MergeScenes(aiScene **_dest, aiScene *master, std::vector<At
         boost::variate_generator<boost::mt19937&, boost::uniform_int<> > rndGen(rng, dist);
 #endif
         for (unsigned int i = 1; i < src.size(); ++i) {
-            //if (i != duplicates[i])
-            //{
-            //  // duplicate scenes share the same UID
-            //  ::strcpy( src[i].id, src[duplicates[i]].id );
-            //  src[i].idlen = src[duplicates[i]].idlen;
-
-            //  continue;
-            //}
-
             src[i].idlen = ai_snprintf(src[i].id, 32, "$%.6X$_", i);
 
             if (flags & AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES_IF_NECESSARY) {
@@ -408,7 +414,7 @@ void SceneCombiner::MergeScenes(aiScene **_dest, aiScene *master, std::vector<At
                             // where n is the index of the texture.
                             // Copy here because we overwrite the string data in-place and the buffer inside of aiString
                             // will be a lie if we just reinterpret from prop->mData. The size of mData is not guaranteed to be
-                            // MAXLEN in size.
+                            // AI_MAXLEN in size.
                             aiString s(*(aiString *)prop->mData);
                             if ('*' == s.data[0]) {
                                 // Offset the index and write it back ..
@@ -984,7 +990,7 @@ inline void GetArrayCopy(Type *&dest, ai_uint num) {
     Type *old = dest;
 
     dest = new Type[num];
-    ::memcpy(dest, old, sizeof(Type) * num);
+    std::copy(old, old+num, dest);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -1057,7 +1063,7 @@ void SceneCombiner::CopyScene(aiScene **_dest, const aiScene *src, bool allocate
     dest->mFlags = src->mFlags;
 
     // source private data might be nullptr if the scene is user-allocated (i.e. for use with the export API)
-    if (dest->mPrivate != nullptr) {
+    if (src->mPrivate != nullptr) {
         ScenePriv(dest)->mPPStepsApplied = ScenePriv(src) ? ScenePriv(src)->mPPStepsApplied : 0;
     }
 }
@@ -1094,10 +1100,6 @@ void SceneCombiner::Copy(aiMesh **_dest, const aiMesh *src) {
 
     // make a deep copy of all faces
     GetArrayCopy(dest->mFaces, dest->mNumFaces);
-    for (unsigned int i = 0; i < dest->mNumFaces; ++i) {
-        aiFace &f = dest->mFaces[i];
-        GetArrayCopy(f.mIndices, f.mNumIndices);
-    }
 
     // make a deep copy of all blend shapes
     CopyPtrArray(dest->mAnimMeshes, dest->mAnimMeshes, dest->mNumAnimMeshes);
diff --git a/code/Common/ScenePreprocessor.cpp b/code/Common/ScenePreprocessor.cpp
index 18a257ad4..d6854126b 100644
--- a/code/Common/ScenePreprocessor.cpp
+++ b/code/Common/ScenePreprocessor.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/ScenePreprocessor.h b/code/Common/ScenePreprocessor.h
index 49e06ed1c..ecdd3aa01 100644
--- a/code/Common/ScenePreprocessor.h
+++ b/code/Common/ScenePreprocessor.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -56,7 +55,7 @@ class ScenePreprocessorTest;
 namespace Assimp {
 
 // ----------------------------------------------------------------------------------
-/** ScenePreprocessor: Preprocess a scene before any post-processing
+/** ScenePreprocessor: Pre-process a scene before any post-processing
  *  steps are executed.
  *
  *  The step computes data that needn't necessarily be provided by the
@@ -79,6 +78,9 @@ public:
     ScenePreprocessor(aiScene *_scene) :
             scene(_scene) {}
 
+    /// @brief The class destructor.
+    ~ScenePreprocessor() = default;
+
     // ----------------------------------------------------------------
     /** Assign a (new) scene to the object.
      *
diff --git a/code/Common/ScenePrivate.h b/code/Common/ScenePrivate.h
index 3910db78c..7ed554c9c 100644
--- a/code/Common/ScenePrivate.h
+++ b/code/Common/ScenePrivate.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/SkeletonMeshBuilder.cpp b/code/Common/SkeletonMeshBuilder.cpp
index f3c8fb412..6c67392b9 100644
--- a/code/Common/SkeletonMeshBuilder.cpp
+++ b/code/Common/SkeletonMeshBuilder.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/SpatialSort.cpp b/code/Common/SpatialSort.cpp
index c8c5c30ed..231a29c2b 100644
--- a/code/Common/SpatialSort.cpp
+++ b/code/Common/SpatialSort.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -71,10 +71,6 @@ SpatialSort::SpatialSort() :
     mPlaneNormal.Normalize();
 }
 
-// ------------------------------------------------------------------------------------------------
-// Destructor
-SpatialSort::~SpatialSort() = default;
-
 // ------------------------------------------------------------------------------------------------
 void SpatialSort::Fill(const aiVector3D *pPositions, unsigned int pNumPositions,
         unsigned int pElementOffset,
diff --git a/code/Common/StackAllocator.h b/code/Common/StackAllocator.h
index 191010cac..3eeda56ca 100644
--- a/code/Common/StackAllocator.h
+++ b/code/Common/StackAllocator.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -61,9 +61,10 @@ namespace Assimp {
 class StackAllocator {
 public:
     /// @brief Constructs the allocator
-    inline StackAllocator();
+    StackAllocator();
+
     /// @brief Destructs the allocator and frees all memory
-    inline ~StackAllocator();
+    ~StackAllocator();
 
     // non copyable
     StackAllocator(const StackAllocator &) = delete;
@@ -87,6 +88,11 @@ private:
 
 } // namespace Assimp
 
+/// @brief Fixes an undefined reference error when linking in certain build environments.
+//         May throw warnings about needing stdc++17, but should compile without issues on modern compilers.
+inline const size_t Assimp::StackAllocator::g_maxBytesPerBlock;
+inline const size_t Assimp::StackAllocator::g_startBytesPerBlock;
+
 #include "StackAllocator.inl"
 
 #endif // include guard
diff --git a/code/Common/StackAllocator.inl b/code/Common/StackAllocator.inl
index 2c3164ca7..93544579b 100644
--- a/code/Common/StackAllocator.inl
+++ b/code/Common/StackAllocator.inl
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -41,11 +41,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "StackAllocator.h"
 #include <assimp/ai_assert.h>
+#include <algorithm>
 
 using namespace Assimp;
 
-inline StackAllocator::StackAllocator() {
-}
+inline StackAllocator::StackAllocator() : m_storageBlocks() {}
 
 inline StackAllocator::~StackAllocator() {
     FreeAll();
@@ -56,7 +56,7 @@ inline void *StackAllocator::Allocate(size_t byteSize) {
     {
         // double block size every time, up to maximum of g_maxBytesPerBlock.
         // Block size must be at least as large as byteSize, but we want to use this for small allocations anyway.
-        m_blockAllocationSize = std::max(std::min(m_blockAllocationSize * 2, g_maxBytesPerBlock), byteSize);
+        m_blockAllocationSize = std::max<std::size_t>(std::min<std::size_t>(m_blockAllocationSize * 2, g_maxBytesPerBlock), byteSize);
         uint8_t *data = new uint8_t[m_blockAllocationSize];
         m_storageBlocks.emplace_back(data);
         m_subIndex = byteSize;
diff --git a/code/Common/StandardShapes.cpp b/code/Common/StandardShapes.cpp
index abf3c4839..ee9a09f72 100644
--- a/code/Common/StandardShapes.cpp
+++ b/code/Common/StandardShapes.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/StbCommon.h b/code/Common/StbCommon.h
index 5de2e176d..6cec216e6 100644
--- a/code/Common/StbCommon.h
+++ b/code/Common/StbCommon.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -64,10 +64,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     The list can be regenerated using the following:
 
-    cat <path/to/stb/stb_image.h> | fgrep STBIDEF | fgrep '(' | sed -E 's/\*|\(.+//g' | \
-        awk '{print "#define " $(NF) " assimp_" $(NF) }' | sort | uniq"
+    cat "path/to/stb/stb_image.h" | fgrep STBIDEF | fgrep '(' | sed -E 's/\*|\(.+//g' | \
+        awk '{print "#define " $(NF) " assimp_" $(NF) }' | sort | uniq
 */
 #define stbi_convert_iphone_png_to_rgb assimp_stbi_convert_iphone_png_to_rgb
+#define stbi_convert_iphone_png_to_rgb_thread assimp_stbi_convert_iphone_png_to_rgb_thread
 #define stbi_convert_wchar_to_utf8 assimp_stbi_convert_wchar_to_utf8
 #define stbi_failure_reason assimp_stbi_failure_reason
 #define stbi_hdr_to_ldr_gamma assimp_stbi_hdr_to_ldr_gamma
@@ -87,22 +88,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define stbi_is_hdr_from_memory assimp_stbi_is_hdr_from_memory
 #define stbi_ldr_to_hdr_gamma assimp_stbi_ldr_to_hdr_gamma
 #define stbi_ldr_to_hdr_scale assimp_stbi_ldr_to_hdr_scale
+#define stbi_load assimp_stbi_load
 #define stbi_load_16 assimp_stbi_load_16
 #define stbi_load_16_from_callbacks assimp_stbi_load_16_from_callbacks
 #define stbi_load_16_from_memory assimp_stbi_load_16_from_memory
-#define stbi_load assimp_stbi_load
+#define stbi_load_from_callbacks assimp_stbi_load_from_callbacks
+#define stbi_load_from_file assimp_stbi_load_from_file
+#define stbi_load_from_file_16 assimp_stbi_load_from_file_16
+#define stbi_load_from_memory assimp_stbi_load_from_memory
+#define stbi_load_gif_from_memory assimp_stbi_load_gif_from_memory
 #define stbi_loadf assimp_stbi_loadf
 #define stbi_loadf_from_callbacks assimp_stbi_loadf_from_callbacks
 #define stbi_loadf_from_file assimp_stbi_loadf_from_file
 #define stbi_loadf_from_memory assimp_stbi_loadf_from_memory
-#define stbi_load_from_callbacks assimp_stbi_load_from_callbacks
-#define stbi_load_from_file_16 assimp_stbi_load_from_file_16
-#define stbi_load_from_file assimp_stbi_load_from_file
-#define stbi_load_from_memory assimp_stbi_load_from_memory
-#define stbi_load_gif_from_memory assimp_stbi_load_gif_from_memory
 #define stbi_set_flip_vertically_on_load assimp_stbi_set_flip_vertically_on_load
 #define stbi_set_flip_vertically_on_load_thread assimp_stbi_set_flip_vertically_on_load_thread
 #define stbi_set_unpremultiply_on_load assimp_stbi_set_unpremultiply_on_load
+#define stbi_set_unpremultiply_on_load_thread assimp_stbi_set_unpremultiply_on_load_thread
 #define stbi_zlib_decode_buffer assimp_stbi_zlib_decode_buffer
 #define stbi_zlib_decode_malloc assimp_stbi_zlib_decode_malloc
 #define stbi_zlib_decode_malloc_guesssize assimp_stbi_zlib_decode_malloc_guesssize
diff --git a/code/Common/StdOStreamLogStream.h b/code/Common/StdOStreamLogStream.h
index cc0e06263..a4c461b51 100644
--- a/code/Common/StdOStreamLogStream.h
+++ b/code/Common/StdOStreamLogStream.h
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -51,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/LogStream.hpp>
 #include <ostream>
 
-namespace Assimp    {
+namespace Assimp {
 
 // ---------------------------------------------------------------------------
 /** @class  StdOStreamLogStream
diff --git a/code/Common/Subdivision.cpp b/code/Common/Subdivision.cpp
index 3aea5d4c5..2a04b8b7c 100644
--- a/code/Common/Subdivision.cpp
+++ b/code/Common/Subdivision.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -525,6 +524,10 @@ void CatmullClarkSubdivider::InternSubdivide(
                                     }
                                 }
 
+                                if (mp == nullptr) {
+                                    continue;
+                                }
+
                                 ai_assert(adj[o] - moffsets[nidx].first < mp->mNumFaces);
                                 const aiFace &f = mp->mFaces[adj[o] - moffsets[nidx].first];
                                 bool haveit = false;
diff --git a/code/Common/TargetAnimation.cpp b/code/Common/TargetAnimation.cpp
index 5f6d9bad0..f0f73d660 100644
--- a/code/Common/TargetAnimation.cpp
+++ b/code/Common/TargetAnimation.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/TargetAnimation.h b/code/Common/TargetAnimation.h
index 863406b94..22363935a 100644
--- a/code/Common/TargetAnimation.h
+++ b/code/Common/TargetAnimation.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -119,12 +118,16 @@ private:
  * look-at target */
 class TargetAnimationHelper {
 public:
+    ///	@brief The class constructor.
     TargetAnimationHelper() :
             targetPositions(nullptr),
             objectPositions(nullptr) {
         // empty
     }
 
+    ///	@brief The class destructor.
+    ~TargetAnimationHelper() = default;
+
     // ------------------------------------------------------------------
     /** Sets the target animation channel
      *
diff --git a/code/Common/Version.cpp b/code/Common/Version.cpp
index 1699b99d6..eabe9a430 100644
--- a/code/Common/Version.cpp
+++ b/code/Common/Version.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2023, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -44,15 +44,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ScenePrivate.h"
 #include <assimp/scene.h>
 #include <assimp/version.h>
-
-#include "revision.h"
+#include <assimp/revision.h>
 
 // --------------------------------------------------------------------------------
 // Legal information string - don't remove this.
 static constexpr char LEGAL_INFORMATION[] =
         "Open Asset Import Library (Assimp).\n"
         "A free C/C++ library to import various 3D file formats into applications\n\n"
-        "(c) 2006-2023, Assimp team\n"
+        "(c) 2006-2025, Assimp team\n"
         "License under the terms and conditions of the 3-clause BSD license\n"
         "https://www.assimp.org\n";
 
@@ -118,83 +117,3 @@ ASSIMP_API const char *aiGetBranchName() {
     return GitBranch;
 }
 
-// ------------------------------------------------------------------------------------------------
-ASSIMP_API aiScene::aiScene() :
-        mFlags(0),
-        mRootNode(nullptr),
-        mNumMeshes(0),
-        mMeshes(nullptr),
-        mNumMaterials(0),
-        mMaterials(nullptr),
-        mNumAnimations(0),
-        mAnimations(nullptr),
-        mNumTextures(0),
-        mTextures(nullptr),
-        mNumLights(0),
-        mLights(nullptr),
-        mNumCameras(0),
-        mCameras(nullptr),
-        mMetaData(nullptr),
-        mName(),
-        mNumSkeletons(0),
-        mSkeletons(nullptr),
-        mPrivate(new Assimp::ScenePrivateData()) {
-    // empty
-}
-
-// ------------------------------------------------------------------------------------------------
-ASSIMP_API aiScene::~aiScene() {
-    // delete all sub-objects recursively
-    delete mRootNode;
-
-    // To make sure we won't crash if the data is invalid it's
-    // much better to check whether both mNumXXX and mXXX are
-    // valid instead of relying on just one of them.
-    if (mNumMeshes && mMeshes) {
-        for (unsigned int a = 0; a < mNumMeshes; ++a) {
-            delete mMeshes[a];
-        }
-    }
-    delete[] mMeshes;
-
-    if (mNumMaterials && mMaterials) {
-        for (unsigned int a = 0; a < mNumMaterials; ++a) {
-            delete mMaterials[a];
-        }
-    }
-    delete[] mMaterials;
-
-    if (mNumAnimations && mAnimations) {
-        for (unsigned int a = 0; a < mNumAnimations; ++a) {
-            delete mAnimations[a];
-        }
-    }
-    delete[] mAnimations;
-
-    if (mNumTextures && mTextures) {
-        for (unsigned int a = 0; a < mNumTextures; ++a) {
-            delete mTextures[a];
-        }
-    }
-    delete[] mTextures;
-
-    if (mNumLights && mLights) {
-        for (unsigned int a = 0; a < mNumLights; ++a) {
-            delete mLights[a];
-        }
-    }
-    delete[] mLights;
-
-    if (mNumCameras && mCameras) {
-        for (unsigned int a = 0; a < mNumCameras; ++a) {
-            delete mCameras[a];
-        }
-    }
-    delete[] mCameras;
-
-    aiMetadata::Dealloc(mMetaData);
-
-    delete[] mSkeletons;
-
-    delete static_cast<Assimp::ScenePrivateData *>(mPrivate);
-}
diff --git a/code/Common/VertexTriangleAdjacency.cpp b/code/Common/VertexTriangleAdjacency.cpp
index 555e3e386..5757490e0 100644
--- a/code/Common/VertexTriangleAdjacency.cpp
+++ b/code/Common/VertexTriangleAdjacency.cpp
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/VertexTriangleAdjacency.h b/code/Common/VertexTriangleAdjacency.h
index 41d809450..87b8cfeaa 100644
--- a/code/Common/VertexTriangleAdjacency.h
+++ b/code/Common/VertexTriangleAdjacency.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -51,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 struct aiMesh;
 struct aiFace;
 
-namespace Assimp    {
+namespace Assimp {
 
 // --------------------------------------------------------------------------------------------
 /** @brief The VertexTriangleAdjacency class computes a vertex-triangle
diff --git a/code/Common/Win32DebugLogStream.h b/code/Common/Win32DebugLogStream.h
index 34d849e83..9a0850256 100644
--- a/code/Common/Win32DebugLogStream.h
+++ b/code/Common/Win32DebugLogStream.h
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -52,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/LogStream.hpp>
 #include "windows.h"
 
-namespace Assimp    {
+namespace Assimp {
 
 // ---------------------------------------------------------------------------
 /** @class  Win32DebugLogStream
diff --git a/code/Common/ZipArchiveIOSystem.cpp b/code/Common/ZipArchiveIOSystem.cpp
index 51a250810..e2234e27e 100644
--- a/code/Common/ZipArchiveIOSystem.cpp
+++ b/code/Common/ZipArchiveIOSystem.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -62,13 +62,13 @@ namespace Assimp {
 // ----------------------------------------------------------------
 // A read-only file inside a ZIP
 
-class ZipFile : public IOStream {
+class ZipFile final : public IOStream {
     friend class ZipFileInfo;
     explicit ZipFile(std::string &filename, size_t size);
 
 public:
     std::string m_Filename;
-    virtual ~ZipFile() override;
+    ~ZipFile() override = default;
 
     // IOStream interface
     size_t Read(void *pvBuffer, size_t pSize, size_t pCount) override;
@@ -89,6 +89,8 @@ private:
 // Wraps an existing Assimp::IOSystem for unzip
 class IOSystem2Unzip {
 public:
+    IOSystem2Unzip() = default;
+    ~IOSystem2Unzip() = default;
     static voidpf open(voidpf opaque, const char *filename, int mode);
     static voidpf opendisk(voidpf opaque, voidpf stream, uint32_t number_disk, int mode);
     static uLong read(voidpf opaque, voidpf stream, void *buf, uLong size);
@@ -100,6 +102,7 @@ public:
     static zlib_filefunc_def get(IOSystem *pIOHandler);
 };
 
+// ----------------------------------------------------------------
 voidpf IOSystem2Unzip::open(voidpf opaque, const char *filename, int mode) {
     IOSystem *io_system = reinterpret_cast<IOSystem *>(opaque);
 
@@ -119,6 +122,7 @@ voidpf IOSystem2Unzip::open(voidpf opaque, const char *filename, int mode) {
     return (voidpf)io_system->Open(filename, mode_fopen);
 }
 
+// ----------------------------------------------------------------
 voidpf IOSystem2Unzip::opendisk(voidpf opaque, voidpf stream, uint32_t number_disk, int mode) {
     ZipFile *io_stream = (ZipFile *)stream;
     voidpf ret = nullptr;
@@ -141,24 +145,28 @@ voidpf IOSystem2Unzip::opendisk(voidpf opaque, voidpf stream, uint32_t number_di
     return ret;
 }
 
+// ----------------------------------------------------------------
 uLong IOSystem2Unzip::read(voidpf /*opaque*/, voidpf stream, void *buf, uLong size) {
     IOStream *io_stream = (IOStream *)stream;
 
     return static_cast<uLong>(io_stream->Read(buf, 1, size));
 }
 
+// ----------------------------------------------------------------
 uLong IOSystem2Unzip::write(voidpf /*opaque*/, voidpf stream, const void *buf, uLong size) {
     IOStream *io_stream = (IOStream *)stream;
 
     return static_cast<uLong>(io_stream->Write(buf, 1, size));
 }
 
+// ----------------------------------------------------------------
 long IOSystem2Unzip::tell(voidpf /*opaque*/, voidpf stream) {
     IOStream *io_stream = (IOStream *)stream;
 
     return static_cast<long>(io_stream->Tell());
 }
 
+// ----------------------------------------------------------------
 long IOSystem2Unzip::seek(voidpf /*opaque*/, voidpf stream, uLong offset, int origin) {
     IOStream *io_stream = (IOStream *)stream;
 
@@ -179,6 +187,7 @@ long IOSystem2Unzip::seek(voidpf /*opaque*/, voidpf stream, uLong offset, int or
     return (io_stream->Seek(offset, assimp_origin) == aiReturn_SUCCESS ? 0 : -1);
 }
 
+// ----------------------------------------------------------------
 int IOSystem2Unzip::close(voidpf opaque, voidpf stream) {
     IOSystem *io_system = (IOSystem *)opaque;
     IOStream *io_stream = (IOStream *)stream;
@@ -188,10 +197,12 @@ int IOSystem2Unzip::close(voidpf opaque, voidpf stream) {
     return 0;
 }
 
+// ----------------------------------------------------------------
 int IOSystem2Unzip::testerror(voidpf /*opaque*/, voidpf /*stream*/) {
     return 0;
 }
 
+// ----------------------------------------------------------------
 zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) {
     zlib_filefunc_def mapping;
 
@@ -213,9 +224,10 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) {
 
 // ----------------------------------------------------------------
 // Info about a read-only file inside a ZIP
-class ZipFileInfo {
+class ZipFileInfo final {
 public:
     explicit ZipFileInfo(unzFile zip_handle, size_t size);
+    ~ZipFileInfo() = default;
 
     // Allocate and Extract data from the ZIP
     ZipFile *Extract(std::string &filename, unzFile zip_handle) const;
@@ -225,6 +237,7 @@ private:
     unz_file_pos_s m_ZipFilePos;
 };
 
+// ----------------------------------------------------------------
 ZipFileInfo::ZipFileInfo(unzFile zip_handle, size_t size) :
         m_Size(size) {
     ai_assert(m_Size != 0);
@@ -234,6 +247,7 @@ ZipFileInfo::ZipFileInfo(unzFile zip_handle, size_t size) :
     unzGetFilePos(zip_handle, &(m_ZipFilePos));
 }
 
+// ----------------------------------------------------------------
 ZipFile *ZipFileInfo::Extract(std::string &filename, unzFile zip_handle) const {
     // Find in the ZIP. This cannot fail
     unz_file_pos_s *filepos = const_cast<unz_file_pos_s *>(&(m_ZipFilePos));
@@ -273,14 +287,14 @@ ZipFile *ZipFileInfo::Extract(std::string &filename, unzFile zip_handle) const {
     return zip_file;
 }
 
+// ----------------------------------------------------------------
 ZipFile::ZipFile(std::string &filename, size_t size) :
         m_Filename(filename), m_Size(size) {
     ai_assert(m_Size != 0);
     m_Buffer = std::unique_ptr<uint8_t[]>(new uint8_t[m_Size]);
 }
 
-ZipFile::~ZipFile() = default;
-
+// ----------------------------------------------------------------
 size_t ZipFile::Read(void *pvBuffer, size_t pSize, size_t pCount) {
     // Should be impossible
     ai_assert(m_Buffer != nullptr);
@@ -305,10 +319,12 @@ size_t ZipFile::Read(void *pvBuffer, size_t pSize, size_t pCount) {
     return pCount;
 }
 
+// ----------------------------------------------------------------
 size_t ZipFile::FileSize() const {
     return m_Size;
 }
 
+// ----------------------------------------------------------------
 aiReturn ZipFile::Seek(size_t pOffset, aiOrigin pOrigin) {
     switch (pOrigin) {
         case aiOrigin_SET: {
@@ -334,6 +350,7 @@ aiReturn ZipFile::Seek(size_t pOffset, aiOrigin pOrigin) {
     return aiReturn_FAILURE;
 }
 
+// ----------------------------------------------------------------
 size_t ZipFile::Tell() const {
     return m_SeekPtr;
 }
@@ -365,6 +382,7 @@ private:
     ZipFileInfoMap m_ArchiveMap;
 };
 
+// ----------------------------------------------------------------
 ZipArchiveIOSystem::Implement::Implement(IOSystem *pIOHandler, const char *pFilename, const char *pMode) {
     ai_assert(strcmp(pMode, "r") == 0);
     ai_assert(pFilename != nullptr);
@@ -376,12 +394,14 @@ ZipArchiveIOSystem::Implement::Implement(IOSystem *pIOHandler, const char *pFile
     m_ZipFileHandle = unzOpen2(pFilename, &mapping);
 }
 
+// ----------------------------------------------------------------
 ZipArchiveIOSystem::Implement::~Implement() {
     if (m_ZipFileHandle != nullptr) {
         unzClose(m_ZipFileHandle);
     }
 }
 
+// ----------------------------------------------------------------
 void ZipArchiveIOSystem::Implement::MapArchive() {
     if (m_ZipFileHandle == nullptr)
         return;
@@ -408,10 +428,12 @@ void ZipArchiveIOSystem::Implement::MapArchive() {
     } while (unzGoToNextFile(m_ZipFileHandle) != UNZ_END_OF_LIST_OF_FILE);
 }
 
+// ----------------------------------------------------------------
 bool ZipArchiveIOSystem::Implement::isOpen() const {
     return (m_ZipFileHandle != nullptr);
 }
 
+// ----------------------------------------------------------------
 void ZipArchiveIOSystem::Implement::getFileList(std::vector<std::string> &rFileList) {
     MapArchive();
     rFileList.clear();
@@ -421,6 +443,7 @@ void ZipArchiveIOSystem::Implement::getFileList(std::vector<std::string> &rFileL
     }
 }
 
+// ----------------------------------------------------------------
 void ZipArchiveIOSystem::Implement::getFileListExtension(std::vector<std::string> &rFileList, const std::string &extension) {
     MapArchive();
     rFileList.clear();
@@ -431,6 +454,7 @@ void ZipArchiveIOSystem::Implement::getFileListExtension(std::vector<std::string
     }
 }
 
+// ----------------------------------------------------------------
 bool ZipArchiveIOSystem::Implement::Exists(std::string &filename) {
     MapArchive();
 
@@ -438,6 +462,7 @@ bool ZipArchiveIOSystem::Implement::Exists(std::string &filename) {
     return (it != m_ArchiveMap.end());
 }
 
+// ----------------------------------------------------------------
 IOStream *ZipArchiveIOSystem::Implement::OpenFile(std::string &filename) {
     MapArchive();
 
@@ -452,6 +477,7 @@ IOStream *ZipArchiveIOSystem::Implement::OpenFile(std::string &filename) {
     return zip_file.Extract(filename, m_ZipFileHandle);
 }
 
+// ----------------------------------------------------------------
 inline void ReplaceAll(std::string &data, const std::string &before, const std::string &after) {
     size_t pos = data.find(before);
     while (pos != std::string::npos) {
@@ -460,6 +486,7 @@ inline void ReplaceAll(std::string &data, const std::string &before, const std::
     }
 }
 
+// ----------------------------------------------------------------
 inline void ReplaceAllChar(std::string &data, const char before, const char after) {
     size_t pos = data.find(before);
     while (pos != std::string::npos) {
@@ -468,6 +495,7 @@ inline void ReplaceAllChar(std::string &data, const char before, const char afte
     }
 }
 
+// ----------------------------------------------------------------
 void ZipArchiveIOSystem::Implement::SimplifyFilename(std::string &filename) {
     ReplaceAllChar(filename, '\\', '/');
 
@@ -492,6 +520,7 @@ void ZipArchiveIOSystem::Implement::SimplifyFilename(std::string &filename) {
     }
 }
 
+// ----------------------------------------------------------------
 ZipArchiveIOSystem::ZipArchiveIOSystem(IOSystem *pIOHandler, const char *pFilename, const char *pMode) :
         pImpl(new Implement(pIOHandler, pFilename, pMode)) {
 }
@@ -502,10 +531,12 @@ ZipArchiveIOSystem::ZipArchiveIOSystem(IOSystem *pIOHandler, const std::string &
         pImpl(new Implement(pIOHandler, rFilename.c_str(), pMode)) {
 }
 
+// ----------------------------------------------------------------
 ZipArchiveIOSystem::~ZipArchiveIOSystem() {
     delete pImpl;
 }
 
+// ----------------------------------------------------------------
 bool ZipArchiveIOSystem::Exists(const char *pFilename) const {
     ai_assert(pFilename != nullptr);
 
@@ -517,11 +548,13 @@ bool ZipArchiveIOSystem::Exists(const char *pFilename) const {
     return pImpl->Exists(filename);
 }
 
+// ----------------------------------------------------------------
 // This is always '/' in a ZIP
 char ZipArchiveIOSystem::getOsSeparator() const {
     return '/';
 }
 
+// ----------------------------------------------------------------
 // Only supports Reading
 IOStream *ZipArchiveIOSystem::Open(const char *pFilename, const char *pMode) {
     ai_assert(pFilename != nullptr);
@@ -536,22 +569,27 @@ IOStream *ZipArchiveIOSystem::Open(const char *pFilename, const char *pMode) {
     return pImpl->OpenFile(filename);
 }
 
+// ----------------------------------------------------------------
 void ZipArchiveIOSystem::Close(IOStream *pFile) {
     delete pFile;
 }
 
+// ----------------------------------------------------------------
 bool ZipArchiveIOSystem::isOpen() const {
     return (pImpl->isOpen());
 }
 
+// ----------------------------------------------------------------
 void ZipArchiveIOSystem::getFileList(std::vector<std::string> &rFileList) const {
     return pImpl->getFileList(rFileList);
 }
 
+// ----------------------------------------------------------------
 void ZipArchiveIOSystem::getFileListExtension(std::vector<std::string> &rFileList, const std::string &extension) const {
     return pImpl->getFileListExtension(rFileList, extension);
 }
 
+// ----------------------------------------------------------------
 bool ZipArchiveIOSystem::isZipArchive(IOSystem *pIOHandler, const char *pFilename) {
     Implement tmp(pIOHandler, pFilename, "r");
     return tmp.isOpen();
diff --git a/code/Common/material.cpp b/code/Common/material.cpp
index ffc2f415b..bae26b690 100644
--- a/code/Common/material.cpp
+++ b/code/Common/material.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -90,6 +90,18 @@ const char *aiTextureTypeToString(aiTextureType in) {
         return "Clearcoat";
     case aiTextureType_TRANSMISSION:
         return "Transmission";
+    case aiTextureType_MAYA_BASE:
+        return "MayaBase";
+    case aiTextureType_MAYA_SPECULAR:
+        return "MayaSpecular";
+    case aiTextureType_MAYA_SPECULAR_COLOR:
+        return "MayaSpecularColor";
+    case aiTextureType_MAYA_SPECULAR_ROUGHNESS:
+        return "MayaSpecularRoughness";
+    case aiTextureType_ANISOTROPY:
+        return "Anisotropy";
+    case aiTextureType_GLTF_METALLIC_ROUGHNESS:
+        return "glTFMetallicRoughness";
     case aiTextureType_UNKNOWN:
         return "Unknown";
     default:
diff --git a/code/Common/scene.cpp b/code/Common/scene.cpp
index b0e882154..bc1fe5c0c 100644
--- a/code/Common/scene.cpp
+++ b/code/Common/scene.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -40,6 +40,87 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include <assimp/scene.h>
 
+#include "ScenePrivate.h"
+
+aiScene::aiScene() :
+        mFlags(0),
+        mRootNode(nullptr),
+        mNumMeshes(0),
+        mMeshes(nullptr),
+        mNumMaterials(0),
+        mMaterials(nullptr),
+        mNumAnimations(0),
+        mAnimations(nullptr),
+        mNumTextures(0),
+        mTextures(nullptr),
+        mNumLights(0),
+        mLights(nullptr),
+        mNumCameras(0),
+        mCameras(nullptr),
+        mMetaData(nullptr),
+        mName(),
+        mNumSkeletons(0),
+        mSkeletons(nullptr),
+        mPrivate(new Assimp::ScenePrivateData()) {
+    // empty
+}
+
+aiScene::~aiScene() {
+    // delete all sub-objects recursively
+    delete mRootNode;
+
+    // To make sure we won't crash if the data is invalid it's
+    // much better to check whether both mNumXXX and mXXX are
+    // valid instead of relying on just one of them.
+    if (mNumMeshes && mMeshes) {
+        for (unsigned int a = 0; a < mNumMeshes; ++a) {
+            delete mMeshes[a];
+        }
+    }
+    delete[] mMeshes;
+
+    if (mNumMaterials && mMaterials) {
+        for (unsigned int a = 0; a < mNumMaterials; ++a) {
+            delete mMaterials[a];
+        }
+    }
+    delete[] mMaterials;
+
+    if (mNumAnimations && mAnimations) {
+        for (unsigned int a = 0; a < mNumAnimations; ++a) {
+            delete mAnimations[a];
+        }
+    }
+    delete[] mAnimations;
+
+    if (mNumTextures && mTextures) {
+        for (unsigned int a = 0; a < mNumTextures; ++a) {
+            delete mTextures[a];
+        }
+    }
+    delete[] mTextures;
+
+    if (mNumLights && mLights) {
+        for (unsigned int a = 0; a < mNumLights; ++a) {
+            delete mLights[a];
+        }
+    }
+    delete[] mLights;
+
+    if (mNumCameras && mCameras) {
+        for (unsigned int a = 0; a < mNumCameras; ++a) {
+            delete mCameras[a];
+        }
+    }
+    delete[] mCameras;
+
+    aiMetadata::Dealloc(mMetaData);
+
+    delete[] mSkeletons;
+
+    delete static_cast<Assimp::ScenePrivateData *>(mPrivate);
+}
+
 aiNode::aiNode() :
         mName(""),
         mParent(nullptr),
diff --git a/code/Common/simd.cpp b/code/Common/simd.cpp
index 0dd437d26..9c2b27346 100644
--- a/code/Common/simd.cpp
+++ b/code/Common/simd.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Common/simd.h b/code/Common/simd.h
index a1d936629..71cdbbaaf 100644
--- a/code/Common/simd.h
+++ b/code/Common/simd.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/Geometry/GeometryUtils.cpp b/code/Geometry/GeometryUtils.cpp
index cec1e74c5..80197604a 100644
--- a/code/Geometry/GeometryUtils.cpp
+++ b/code/Geometry/GeometryUtils.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -47,8 +47,8 @@ namespace Assimp {
 
 // ------------------------------------------------------------------------------------------------
 ai_real GeometryUtils::heron( ai_real a, ai_real b, ai_real c ) {
-    const ai_real s = (a + b + c) / 2;
-    const ai_real area = pow((s * ( s - a ) * ( s - b ) * ( s - c ) ), (ai_real)0.5 );
+    const ai_real s    = (a + b + c) * 0.5;
+    const ai_real area = pow((s * ( s - a ) * ( s - b ) * ( s - c ) ), static_cast<ai_real>(0.5));
     return area;
 }
 
@@ -57,8 +57,8 @@ ai_real GeometryUtils::distance3D( const aiVector3D &vA, const aiVector3D &vB )
     const ai_real lx = ( vB.x - vA.x );
     const ai_real ly = ( vB.y - vA.y );
     const ai_real lz = ( vB.z - vA.z );
-    const ai_real a = lx*lx + ly*ly + lz*lz;
-    const ai_real d = pow( a, (ai_real)0.5 );
+    const ai_real a  = lx*lx + ly*ly + lz*lz;
+    const ai_real d  = pow( a, static_cast<ai_real>(0.5));
 
     return d;
 }
@@ -66,6 +66,9 @@ ai_real GeometryUtils::distance3D( const aiVector3D &vA, const aiVector3D &vB )
 // ------------------------------------------------------------------------------------------------
 ai_real GeometryUtils::calculateAreaOfTriangle( const aiFace& face, aiMesh* mesh ) {
     ai_real area = 0;
+    if (mesh == nullptr) {
+        return area;
+    }
 
     const aiVector3D vA( mesh->mVertices[ face.mIndices[ 0 ] ] );
     const aiVector3D vB( mesh->mVertices[ face.mIndices[ 1 ] ] );
@@ -81,8 +84,7 @@ ai_real GeometryUtils::calculateAreaOfTriangle( const aiFace& face, aiMesh* mesh
 
 // ------------------------------------------------------------------------------------------------
 // Check whether a ray intersects a plane and find the intersection point
-bool GeometryUtils::PlaneIntersect(const aiRay& ray, const aiVector3D& planePos, 
-        const aiVector3D& planeNormal, aiVector3D& pos) {
+bool GeometryUtils::PlaneIntersect(const aiRay& ray, const aiVector3D& planePos, const aiVector3D& planeNormal, aiVector3D& pos) {
     const ai_real b = planeNormal * (planePos - ray.pos);
     ai_real h = ray.dir * planeNormal;
     if ((h < 10e-5 && h > -10e-5) || (h = b/h) < 0)
@@ -93,11 +95,14 @@ bool GeometryUtils::PlaneIntersect(const aiRay& ray, const aiVector3D& planePos,
 }
 
 // ------------------------------------------------------------------------------------------------
-void GeometryUtils::normalizeVectorArray(aiVector3D *vectorArrayIn, aiVector3D *vectorArrayOut, 
-        size_t numVectors) {
+void GeometryUtils::normalizeVectorArray(aiVector3D *vectorArrayIn, aiVector3D *vectorArrayOut, size_t numVectors) {
+    if (vectorArrayIn == nullptr || vectorArrayOut == nullptr) {
+        return;
+    }
+	
     for (size_t i=0; i<numVectors; ++i) {
-		    vectorArrayOut[i] = vectorArrayIn[i].Normalize();
-	  }
+	vectorArrayOut[i] = vectorArrayIn[i].Normalize();
+    }
 }
 
 } // namespace Assimp
diff --git a/code/Geometry/GeometryUtils.h b/code/Geometry/GeometryUtils.h
index b6fff99e1..7acbf90fc 100644
--- a/code/Geometry/GeometryUtils.h
+++ b/code/Geometry/GeometryUtils.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -49,8 +49,12 @@ namespace Assimp {
 // ---------------------------------------------------------------------------
 class ASSIMP_API GeometryUtils {
 public:
+    /// @brief Will calculate the area of a triangle.
+    /// @param a  The first vertex of the triangle.
+    /// @param b  The first vertex of the triangle.
+    /// @param c  The first vertex of the triangle.
     static ai_real heron( ai_real a, ai_real b, ai_real c );
-    
+
     /// @brief Will compute the distance between 2 3D-vectors
     /// @param vA  Vector a.
     /// @param vB  Vector b.
diff --git a/code/Material/MaterialSystem.cpp b/code/Material/MaterialSystem.cpp
index cc8ca2f88..75e2ee622 100644
--- a/code/Material/MaterialSystem.cpp
+++ b/code/Material/MaterialSystem.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -74,7 +73,7 @@ aiReturn aiGetMaterialProperty(const aiMaterial *pMat,
         aiMaterialProperty *prop = pMat->mProperties[i];
 
         if (prop /* just for safety ... */
-                && 0 == strcmp(prop->mKey.data, pKey) && (UINT_MAX == type || prop->mSemantic == type) /* UINT_MAX is a wild-card, but this is undocumented :-) */
+                && 0 == strncmp(prop->mKey.data, pKey, strlen(pKey)) && (UINT_MAX == type || prop->mSemantic == type) /* UINT_MAX is a wild-card, but this is undocumented :-) */
                 && (UINT_MAX == index || prop->mIndex == index)) {
             *pPropOut = pMat->mProperties[i];
             return AI_SUCCESS;
@@ -84,13 +83,17 @@ aiReturn aiGetMaterialProperty(const aiMaterial *pMat,
     return AI_FAILURE;
 }
 
+namespace
+{
+
 // ------------------------------------------------------------------------------------------------
-// Get an array of floating-point values from the material.
-aiReturn aiGetMaterialFloatArray(const aiMaterial *pMat,
+// Implementation of functions "aiGetMaterialFloatArray" and "aiGetMaterialFloatFloatArray".
+template <class TReal>
+aiReturn GetMaterialFloatArray(const aiMaterial *pMat,
         const char *pKey,
         unsigned int type,
         unsigned int index,
-        ai_real *pOut,
+        TReal *pOut,
         unsigned int *pMax) {
     ai_assert(pOut != nullptr);
     ai_assert(pMat != nullptr);
@@ -101,7 +104,7 @@ aiReturn aiGetMaterialFloatArray(const aiMaterial *pMat,
         return AI_FAILURE;
     }
 
-    // data is given in floats, convert to ai_real
+    // data is given in floats, convert to TReal
     unsigned int iWrite = 0;
     if (aiPTI_Float == prop->mType || aiPTI_Buffer == prop->mType) {
         iWrite = prop->mDataLength / sizeof(float);
@@ -111,14 +114,14 @@ aiReturn aiGetMaterialFloatArray(const aiMaterial *pMat,
         }
 
         for (unsigned int a = 0; a < iWrite; ++a) {
-            pOut[a] = static_cast<ai_real>(reinterpret_cast<float *>(prop->mData)[a]);
+            pOut[a] = static_cast<TReal>(reinterpret_cast<float *>(prop->mData)[a]);
         }
 
         if (pMax) {
             *pMax = iWrite;
         }
     }
-    // data is given in doubles, convert to float
+    // data is given in doubles, convert to TReal
     else if (aiPTI_Double == prop->mType) {
         iWrite = prop->mDataLength / sizeof(double);
         if (pMax) {
@@ -126,13 +129,13 @@ aiReturn aiGetMaterialFloatArray(const aiMaterial *pMat,
             ;
         }
         for (unsigned int a = 0; a < iWrite; ++a) {
-            pOut[a] = static_cast<ai_real>(reinterpret_cast<double *>(prop->mData)[a]);
+            pOut[a] = static_cast<TReal>(reinterpret_cast<double *>(prop->mData)[a]);
         }
         if (pMax) {
             *pMax = iWrite;
         }
     }
-    // data is given in ints, convert to float
+    // data is given in ints, convert to TReal
     else if (aiPTI_Integer == prop->mType) {
         iWrite = prop->mDataLength / sizeof(int32_t);
         if (pMax) {
@@ -140,7 +143,7 @@ aiReturn aiGetMaterialFloatArray(const aiMaterial *pMat,
             ;
         }
         for (unsigned int a = 0; a < iWrite; ++a) {
-            pOut[a] = static_cast<ai_real>(reinterpret_cast<int32_t *>(prop->mData)[a]);
+            pOut[a] = static_cast<TReal>(reinterpret_cast<int32_t *>(prop->mData)[a]);
         }
         if (pMax) {
             *pMax = iWrite;
@@ -156,7 +159,7 @@ aiReturn aiGetMaterialFloatArray(const aiMaterial *pMat,
         ai_assert(prop->mDataLength >= 5);
         ai_assert(!prop->mData[prop->mDataLength - 1]);
         for (unsigned int a = 0;; ++a) {
-            cur = fast_atoreal_move<ai_real>(cur, pOut[a]);
+            cur = fast_atoreal_move<TReal>(cur, pOut[a]);
             if (a == iWrite - 1) {
                 break;
             }
@@ -174,6 +177,30 @@ aiReturn aiGetMaterialFloatArray(const aiMaterial *pMat,
     return AI_SUCCESS;
 }
 
+// ------------------------------------------------------------------------------------------------
+// Get an array of float typed float values from the material.
+aiReturn aiGetMaterialFloatFloatArray(const aiMaterial *pMat,
+        const char *pKey,
+        unsigned int type,
+        unsigned int index,
+        float *pOut,
+        unsigned int *pMax) {
+    return ::GetMaterialFloatArray(pMat, pKey, type, index, pOut, pMax);
+}
+
+} // namespace
+
+// ------------------------------------------------------------------------------------------------
+// Get an array of floating-point values from the material.
+aiReturn aiGetMaterialFloatArray(const aiMaterial *pMat,
+        const char *pKey,
+        unsigned int type,
+        unsigned int index,
+        ai_real *pOut,
+        unsigned int *pMax) {
+    return ::GetMaterialFloatArray(pMat, pKey, type, index, pOut, pMax);
+}
+
 // ------------------------------------------------------------------------------------------------
 // Get an array if integers from the material
 aiReturn aiGetMaterialIntegerArray(const aiMaterial *pMat,
@@ -260,7 +287,7 @@ aiReturn aiGetMaterialColor(const aiMaterial *pMat,
         unsigned int index,
         aiColor4D *pOut) {
     unsigned int iMax = 4;
-    const aiReturn eRet = aiGetMaterialFloatArray(pMat, pKey, type, index, (ai_real *)pOut, &iMax);
+    const aiReturn eRet = aiGetMaterialFloatFloatArray(pMat, pKey, type, index, (float *)pOut, &iMax);
 
     // if no alpha channel is defined: set it to 1.0
     if (3 == iMax) {
@@ -313,6 +340,12 @@ aiReturn aiGetMaterialString(const aiMaterial *pMat,
     return AI_SUCCESS;
 }
 
+// ------------------------------------------------------------------------------------------------
+// Get a c-like string fron an aiString
+const char *aiGetStringC_Str(const aiString *str) {
+	return str->data;
+}
+
 // ------------------------------------------------------------------------------------------------
 // Get the number of textures on a particular texture stack
 unsigned int aiGetMaterialTextureCount(const C_STRUCT aiMaterial *pMat, C_ENUM aiTextureType type) {
@@ -486,7 +519,7 @@ aiReturn aiMaterial::AddBinaryProperty(const void *pInput,
     memcpy(pcNew->mData, pInput, pSizeInBytes);
 
     pcNew->mKey.length = static_cast<ai_uint32>(::strlen(pKey));
-    ai_assert(MAXLEN > pcNew->mKey.length);
+    ai_assert(AI_MAXLEN > pcNew->mKey.length);
     strcpy(pcNew->mKey.data, pKey);
 
     if (UINT_MAX != iOutIndex) {
diff --git a/code/Material/MaterialSystem.h b/code/Material/MaterialSystem.h
index 41891ad97..dacd5a8ca 100644
--- a/code/Material/MaterialSystem.h
+++ b/code/Material/MaterialSystem.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -51,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct aiMaterial;
 
-namespace Assimp    {
+namespace Assimp {
 
 // ------------------------------------------------------------------------------
 /** Computes a hash (hopefully unique) from all material properties
diff --git a/code/Pbrt/PbrtExporter.cpp b/code/Pbrt/PbrtExporter.cpp
index 67937019f..07bf1f056 100644
--- a/code/Pbrt/PbrtExporter.cpp
+++ b/code/Pbrt/PbrtExporter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -89,22 +89,27 @@ using namespace Assimp;
 
 namespace Assimp {
 
-void ExportScenePbrt (
-    const char* pFile,
-    IOSystem* pIOSystem,
-    const aiScene* pScene,
-    const ExportProperties* /*pProperties*/
-){
+void ExportScenePbrt(const char *pFile, IOSystem *pIOSystem, const aiScene *pScene,
+        const ExportProperties *) {
     std::string path = DefaultIOSystem::absolutePath(std::string(pFile));
     std::string file = DefaultIOSystem::completeBaseName(std::string(pFile));
-
+    
     // initialize the exporter
     PbrtExporter exporter(pScene, pIOSystem, path, file);
 }
 
 } // end of namespace Assimp
 
-// Constructor
+static void create_embedded_textures_folder(const aiScene *scene, IOSystem *pIOSystem) {
+    if (scene->mNumTextures > 0) {
+        if (!pIOSystem->Exists("textures")) {
+            if (!pIOSystem->CreateDirectory("textures")) {
+                throw DeadlyExportError("Could not create textures/ directory.");
+            }
+        }
+    }
+}
+
 PbrtExporter::PbrtExporter(
         const aiScene *pScene, IOSystem *pIOSystem,
         const std::string &path, const std::string &file) :
@@ -127,10 +132,10 @@ PbrtExporter::PbrtExporter(
         0.f,  0.f,  1.f, 0.f, //
         0.f,  0.f,  0.f, 1.f  //
     ) * mRootTransform;
+
     // Export embedded textures.
-    if (mScene->mNumTextures > 0)
-        if (!mIOSystem->CreateDirectory("textures"))
-            throw DeadlyExportError("Could not create textures/ directory.");
+    create_embedded_textures_folder(mScene, mIOSystem);
+
     for (unsigned int i = 0; i < mScene->mNumTextures; ++i) {
         aiTexture* tex = mScene->mTextures[i];
         std::string fn = CleanTextureFilename(tex->mFilename, false);
@@ -169,16 +174,19 @@ PbrtExporter::PbrtExporter(
     WriteWorldDefinition();
 
     // And write the file to disk...
-    std::unique_ptr<IOStream> outfile(mIOSystem->Open(mPath,"wt"));
+    std::string outputFilePath = mPath;
+    if (!outputFilePath.empty()) {
+        outputFilePath = outputFilePath + mIOSystem->getOsSeparator();
+    }
+    outputFilePath = outputFilePath + mFile +".pbrt";
+
+    std::unique_ptr<IOStream> outfile(mIOSystem->Open(outputFilePath,"wt"));
     if (!outfile) {
         throw DeadlyExportError("could not open output .pbrt file: " + std::string(mFile));
     }
     outfile->Write(mOutput.str().c_str(), mOutput.str().length(), 1);
 }
 
-// Destructor
-PbrtExporter::~PbrtExporter() = default;
-
 void PbrtExporter::WriteMetaData() {
     mOutput << "#############################\n";
     mOutput << "# Scene metadata:\n";
@@ -798,10 +806,20 @@ void PbrtExporter::WriteLights() {
 
 void PbrtExporter::WriteMesh(aiMesh* mesh) {
     mOutput << "# - Mesh: ";
+    const char* mName;
     if (mesh->mName == aiString(""))
-        mOutput << "<No Name>\n";
+        mName = "<No Name>";
     else
-        mOutput << mesh->mName.C_Str() << "\n";
+        mName = mesh->mName.C_Str();
+    mOutput << mName << "\n";
+
+    // Check if any types other than tri
+    if (   (mesh->mPrimitiveTypes & aiPrimitiveType_POINT)
+           || (mesh->mPrimitiveTypes & aiPrimitiveType_LINE)
+           || (mesh->mPrimitiveTypes & aiPrimitiveType_POLYGON)) {
+        std::cerr << "Error: ignoring point / line / polygon mesh " << mName << ".\n";
+        return;
+    }
 
     mOutput << "AttributeBegin\n";
     aiMaterial* material = mScene->mMaterials[mesh->mMaterialIndex];
@@ -814,14 +832,6 @@ void PbrtExporter::WriteMesh(aiMesh* mesh) {
         mOutput << "    AreaLightSource \"diffuse\" \"rgb L\" [ " << emission.r <<
             " " << emission.g << " " << emission.b << " ]\n";
 
-    // Check if any types other than tri
-    if (   (mesh->mPrimitiveTypes & aiPrimitiveType_POINT)
-        || (mesh->mPrimitiveTypes & aiPrimitiveType_LINE)
-        || (mesh->mPrimitiveTypes & aiPrimitiveType_POLYGON)) {
-        std::cerr << "Error: ignoring point / line / polygon mesh " << mesh->mName.C_Str() << ".\n";
-        return;
-    }
-
     // Alpha mask
     std::string alpha;
     aiString opacityTexture;
diff --git a/code/Pbrt/PbrtExporter.h b/code/Pbrt/PbrtExporter.h
index c7e8180e2..71a906e87 100644
--- a/code/Pbrt/PbrtExporter.h
+++ b/code/Pbrt/PbrtExporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -70,15 +70,33 @@ class ExportProperties;
 // ---------------------------------------------------------------------
 /** Helper class to export a given scene to a Pbrt file. */
 // ---------------------------------------------------------------------
-class PbrtExporter
-{
+class PbrtExporter {
 public:
     /// Constructor for a specific scene to export
     PbrtExporter(const aiScene *pScene, IOSystem *pIOSystem,
             const std::string &path, const std::string &file);
 
     /// Destructor
-    virtual ~PbrtExporter();
+    virtual ~PbrtExporter() = default;
+
+private:
+    aiMatrix4x4 GetNodeTransform(const aiString &name) const;
+    static std::string TransformAsString(const aiMatrix4x4 &m);
+    static std::string RemoveSuffix(std::string filename);
+    std::string CleanTextureFilename(const aiString &f, bool rewriteExtension = true) const;
+    void WriteMetaData();
+    void WriteWorldDefinition();
+    void WriteCameras();
+    void WriteCamera(int i);
+    void WriteLights();
+    void WriteTextures();
+    static bool TextureHasAlphaMask(const std::string &filename);
+    void WriteMaterials();
+    void WriteMaterial(int i);
+    void WriteMesh(aiMesh *mesh);
+    void WriteInstanceDefinition(int i);
+    void WriteGeometricObjects(aiNode *node, aiMatrix4x4 parentTransform,
+            std::map<int, int> &meshUses);
 
 private:
     // the scene to export
@@ -96,39 +114,11 @@ private:
     /// Name of the file (without extension) where the scene will be exported
     const std::string mFile;
 
-private:
     //  A private set to keep track of which textures have been declared
     std::set<std::string> mTextureSet;
 
     // Transform to apply to the root node and all root objects such as cameras, lights, etc.
     aiMatrix4x4 mRootTransform;
-
-    aiMatrix4x4 GetNodeTransform(const aiString& name) const;
-    static std::string TransformAsString(const aiMatrix4x4& m);
-
-    static std::string RemoveSuffix(std::string filename);
-    std::string CleanTextureFilename(const aiString &f, bool rewriteExtension = true) const;
-
-    void WriteMetaData();
-
-    void WriteWorldDefinition();
-
-    void WriteCameras();
-    void WriteCamera(int i);
-
-    void WriteLights();
-
-    void WriteTextures();
-    static bool TextureHasAlphaMask(const std::string &filename);
-
-    void WriteMaterials();
-    void WriteMaterial(int i);
-
-    void WriteMesh(aiMesh* mesh);
-
-    void WriteInstanceDefinition(int i);
-    void WriteGeometricObjects(aiNode* node, aiMatrix4x4 parentTransform,
-                               std::map<int, int> &meshUses);
 };
 
 } // namespace Assimp
diff --git a/code/PostProcessing/ArmaturePopulate.cpp b/code/PostProcessing/ArmaturePopulate.cpp
index 234a00232..90e1523f4 100644
--- a/code/PostProcessing/ArmaturePopulate.cpp
+++ b/code/PostProcessing/ArmaturePopulate.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -81,7 +81,7 @@ void ArmaturePopulate::Execute(aiScene *out) {
         aiBone *bone = kvp.first;
         aiNode *bone_node = kvp.second;
         ASSIMP_LOG_VERBOSE_DEBUG("active node lookup: ", bone->mName.C_Str());
-        
+
         // lcl transform grab - done in generate_nodes :)
         aiNode *armature = GetArmatureRoot(bone_node, bones);
 
diff --git a/code/PostProcessing/ArmaturePopulate.h b/code/PostProcessing/ArmaturePopulate.h
index 52d3adfef..939d3cb3a 100644
--- a/code/PostProcessing/ArmaturePopulate.h
+++ b/code/PostProcessing/ArmaturePopulate.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/CalcTangentsProcess.cpp b/code/PostProcessing/CalcTangentsProcess.cpp
index 2276f94df..c679909c5 100644
--- a/code/PostProcessing/CalcTangentsProcess.cpp
+++ b/code/PostProcessing/CalcTangentsProcess.cpp
@@ -189,9 +189,9 @@ bool CalcTangentsProcess::ProcessMesh(aiMesh *pMesh, unsigned int meshIndex) {
         tangent.x = (w.x * sy - v.x * ty) * dirCorrection;
         tangent.y = (w.y * sy - v.y * ty) * dirCorrection;
         tangent.z = (w.z * sy - v.z * ty) * dirCorrection;
-        bitangent.x = (- w.x * sx + v.x * tx) * dirCorrection;
-        bitangent.y = (- w.y * sx + v.y * tx) * dirCorrection;
-        bitangent.z = (- w.z * sx + v.z * tx) * dirCorrection;
+        bitangent.x = (w.x * sx - v.x * tx) * dirCorrection;
+        bitangent.y = (w.y * sx - v.y * tx) * dirCorrection;
+        bitangent.z = (w.z * sx - v.z * tx) * dirCorrection;
 
         // store for every vertex of that face
         for (unsigned int b = 0; b < face.mNumIndices; ++b) {
@@ -199,13 +199,15 @@ bool CalcTangentsProcess::ProcessMesh(aiMesh *pMesh, unsigned int meshIndex) {
 
             // project tangent and bitangent into the plane formed by the vertex' normal
             aiVector3D localTangent = tangent - meshNorm[p] * (tangent * meshNorm[p]);
-            aiVector3D localBitangent = bitangent - meshNorm[p] * (bitangent * meshNorm[p]) - localTangent * (bitangent * localTangent);
+            aiVector3D localBitangent = bitangent - meshNorm[p] * (bitangent * meshNorm[p]);
             localTangent.NormalizeSafe();
             localBitangent.NormalizeSafe();
 
             // reconstruct tangent/bitangent according to normal and bitangent/tangent when it's infinite or NaN.
-            bool invalid_tangent = is_special_float(localTangent.x) || is_special_float(localTangent.y) || is_special_float(localTangent.z);
-            bool invalid_bitangent = is_special_float(localBitangent.x) || is_special_float(localBitangent.y) || is_special_float(localBitangent.z);
+            bool invalid_tangent = is_special_float(localTangent.x) || is_special_float(localTangent.y) || is_special_float(localTangent.z)
+                || (-0.5f < localTangent.x && localTangent.x < 0.5f && -0.5f < localTangent.y && localTangent.y < 0.5f && -0.5f < localTangent.z && localTangent.z < 0.5f);
+            bool invalid_bitangent = is_special_float(localBitangent.x) || is_special_float(localBitangent.y) || is_special_float(localBitangent.z)
+                || (-0.5f < localBitangent.x && localBitangent.x < 0.5f && -0.5f < localBitangent.y && localBitangent.y < 0.5f && -0.5f < localBitangent.z && localBitangent.z < 0.5f);
             if (invalid_tangent != invalid_bitangent) {
                 if (invalid_tangent) {
                     localTangent = meshNorm[p] ^ localBitangent;
diff --git a/code/PostProcessing/CalcTangentsProcess.h b/code/PostProcessing/CalcTangentsProcess.h
index bae82422e..01d63a0c5 100644
--- a/code/PostProcessing/CalcTangentsProcess.h
+++ b/code/PostProcessing/CalcTangentsProcess.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/ComputeUVMappingProcess.cpp b/code/PostProcessing/ComputeUVMappingProcess.cpp
index f75dc5952..c3d2e2b62 100644
--- a/code/PostProcessing/ComputeUVMappingProcess.cpp
+++ b/code/PostProcessing/ComputeUVMappingProcess.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -346,16 +346,20 @@ void ComputeUVMappingProcess::Execute(aiScene *pScene) {
     ASSIMP_LOG_DEBUG("GenUVCoordsProcess begin");
     char buffer[1024];
 
-    if (pScene->mFlags & AI_SCENE_FLAGS_NON_VERBOSE_FORMAT)
+    if (pScene->mFlags & AI_SCENE_FLAGS_NON_VERBOSE_FORMAT) {
         throw DeadlyImportError("Post-processing order mismatch: expecting pseudo-indexed (\"verbose\") vertices here");
+    }
 
     std::list<MappingInfo> mappingStack;
 
-    /*  Iterate through all materials and search for non-UV mapped textures
-     */
+    // Iterate through all materials and search for non-UV mapped textures
     for (unsigned int i = 0; i < pScene->mNumMaterials; ++i) {
         mappingStack.clear();
         aiMaterial *mat = pScene->mMaterials[i];
+        if (mat == nullptr) {
+            ASSIMP_LOG_INFO("Material pointer in nullptr, skipping.");
+            continue;
+        }
         for (unsigned int a = 0; a < mat->mNumProperties; ++a) {
             aiMaterialProperty *prop = mat->mProperties[a];
             if (!::strcmp(prop->mKey.data, "$tex.mapping")) {
diff --git a/code/PostProcessing/ComputeUVMappingProcess.h b/code/PostProcessing/ComputeUVMappingProcess.h
index c4158f402..663b4686f 100644
--- a/code/PostProcessing/ComputeUVMappingProcess.h
+++ b/code/PostProcessing/ComputeUVMappingProcess.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/ConvertToLHProcess.cpp b/code/PostProcessing/ConvertToLHProcess.cpp
index 80abf84a5..224c8df15 100644
--- a/code/PostProcessing/ConvertToLHProcess.cpp
+++ b/code/PostProcessing/ConvertToLHProcess.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/ConvertToLHProcess.h b/code/PostProcessing/ConvertToLHProcess.h
index ea001b95b..f6f876ef6 100644
--- a/code/PostProcessing/ConvertToLHProcess.h
+++ b/code/PostProcessing/ConvertToLHProcess.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -60,7 +60,7 @@ struct aiNode;
 struct aiMaterial;
 struct aiCamera;
 
-namespace Assimp    {
+namespace Assimp {
 
 // -----------------------------------------------------------------------------------
 /** @brief The MakeLeftHandedProcess converts all imported data to a left-handed
diff --git a/code/PostProcessing/DeboneProcess.cpp b/code/PostProcessing/DeboneProcess.cpp
index e91196ce2..33ef2afbc 100644
--- a/code/PostProcessing/DeboneProcess.cpp
+++ b/code/PostProcessing/DeboneProcess.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -187,7 +187,7 @@ bool DeboneProcess::ConsiderMesh(const aiMesh* pMesh) {
                     }
                 } else {
                     vertexBones[vid] = i;
-                } 
+                }
             }
 
             if(!isBoneNecessary[i]) {
diff --git a/code/PostProcessing/DeboneProcess.h b/code/PostProcessing/DeboneProcess.h
index ae4448e0e..a7fb13cd4 100644
--- a/code/PostProcessing/DeboneProcess.h
+++ b/code/PostProcessing/DeboneProcess.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/DropFaceNormalsProcess.cpp b/code/PostProcessing/DropFaceNormalsProcess.cpp
index c5f6333e0..b252547b4 100644
--- a/code/PostProcessing/DropFaceNormalsProcess.cpp
+++ b/code/PostProcessing/DropFaceNormalsProcess.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/code/PostProcessing/DropFaceNormalsProcess.h b/code/PostProcessing/DropFaceNormalsProcess.h
index df542f2ba..859ac9c05 100644
--- a/code/PostProcessing/DropFaceNormalsProcess.h
+++ b/code/PostProcessing/DropFaceNormalsProcess.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/EmbedTexturesProcess.cpp b/code/PostProcessing/EmbedTexturesProcess.cpp
index d5d2ef872..c39187391 100644
--- a/code/PostProcessing/EmbedTexturesProcess.cpp
+++ b/code/PostProcessing/EmbedTexturesProcess.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -46,6 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ProcessHelper.h"
 
 #include <fstream>
+#include <algorithm>
 
 using namespace Assimp;
 
@@ -91,25 +92,47 @@ void EmbedTexturesProcess::Execute(aiScene* pScene) {
     ASSIMP_LOG_INFO("EmbedTexturesProcess finished. Embedded ", embeddedTexturesCount, " textures." );
 }
 
+std::string EmbedTexturesProcess::tryToFindValidPath(const std::string &imagePath) const
+{
+    // Test path directly
+    if (mIOHandler->Exists(imagePath)) {
+        return imagePath;
+    }
+    ASSIMP_LOG_WARN("EmbedTexturesProcess: Cannot find image: ", imagePath, ". Will try to find it in root folder.");
+
+    // Test path in root path
+    std::string testPath = mRootPath + imagePath;
+    if (mIOHandler->Exists(testPath)) {
+        return testPath;
+    }
+
+    // Test path basename in root path
+    testPath = mRootPath + imagePath.substr(imagePath.find_last_of("\\/") + 1u);
+    if (mIOHandler->Exists(testPath)) {
+        return testPath;
+    }
+
+    // In unix systems, '\' is a valid file name character, but some files may use \ as a directory separator.
+    // Try replacing '\' by '/'.
+    if (mIOHandler->getOsSeparator() != '\\' && imagePath.find('\\') != std::string::npos) {
+        ASSIMP_LOG_WARN("EmbedTexturesProcess: Cannot find image '", imagePath, "' in root folder. Will try replacing directory separators.");
+        testPath = imagePath;
+        std::replace(testPath.begin(), testPath.end(), '\\', mIOHandler->getOsSeparator());
+        return tryToFindValidPath(testPath);
+    }
+
+    ASSIMP_LOG_ERROR("EmbedTexturesProcess: Unable to embed texture: ", imagePath, ".");
+    return {};
+}
+
 bool EmbedTexturesProcess::addTexture(aiScene *pScene, const std::string &path) const {
     std::streampos imageSize = 0;
-    std::string    imagePath = path;
+    std::string    imagePath = tryToFindValidPath(path);
 
-    // Test path directly
-    if (!mIOHandler->Exists(imagePath)) {
-        ASSIMP_LOG_WARN("EmbedTexturesProcess: Cannot find image: ", imagePath, ". Will try to find it in root folder.");
-
-        // Test path in root path
-        imagePath = mRootPath + path;
-        if (!mIOHandler->Exists(imagePath)) {
-            // Test path basename in root path
-            imagePath = mRootPath + path.substr(path.find_last_of("\\/") + 1u);
-            if (!mIOHandler->Exists(imagePath)) {
-                ASSIMP_LOG_ERROR("EmbedTexturesProcess: Unable to embed texture: ", path, ".");
-                return false;
-            }
-        }
+    if (imagePath.empty()) {
+        return false;
     }
+
     IOStream* pFile = mIOHandler->Open(imagePath);
     if (pFile == nullptr) {
         ASSIMP_LOG_ERROR("EmbedTexturesProcess: Unable to embed texture: ", path, ".");
diff --git a/code/PostProcessing/EmbedTexturesProcess.h b/code/PostProcessing/EmbedTexturesProcess.h
index 77d4d9c72..5fbc440ab 100644
--- a/code/PostProcessing/EmbedTexturesProcess.h
+++ b/code/PostProcessing/EmbedTexturesProcess.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -74,9 +73,11 @@ public:
     void SetupProperties(const Importer* pImp) override;
 
     /// Overwritten, @see BaseProcess
-    virtual void Execute(aiScene* pScene) override;
+    void Execute(aiScene* pScene) override;
 
 private:
+    // Try several ways to attempt to resolve the image path
+    std::string tryToFindValidPath(const std::string &imagePath) const;
     // Resolve the path and add the file content to the scene as a texture.
     bool addTexture(aiScene *pScene, const std::string &path) const;
 
diff --git a/code/PostProcessing/FindDegenerates.cpp b/code/PostProcessing/FindDegenerates.cpp
index d9c14425c..5006d41dd 100644
--- a/code/PostProcessing/FindDegenerates.cpp
+++ b/code/PostProcessing/FindDegenerates.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -143,9 +143,13 @@ bool FindDegeneratesProcess::ExecuteOnMesh(aiMesh *mesh) {
     for (unsigned int a = 0; a < mesh->mNumFaces; ++a) {
         aiFace &face = mesh->mFaces[a];
         bool first = true;
+        auto vertex_in_range = [numVertices = mesh->mNumVertices](unsigned int vertex_idx) { return vertex_idx < numVertices; };
 
         // check whether the face contains degenerated entries
         for (unsigned int i = 0; i < face.mNumIndices; ++i) {
+            if (!std::all_of(face.mIndices, face.mIndices + face.mNumIndices, vertex_in_range))
+                continue;
+
             // Polygons with more than 4 points are allowed to have double points, that is
             // simulating polygons with holes just with concave polygons. However,
             // double points may not come directly after another.
diff --git a/code/PostProcessing/FindDegenerates.h b/code/PostProcessing/FindDegenerates.h
index 6b37a47cf..0548da0e3 100644
--- a/code/PostProcessing/FindDegenerates.h
+++ b/code/PostProcessing/FindDegenerates.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -50,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/mesh.h>
 
 class FindDegeneratesProcessTest;
-namespace Assimp    {
+namespace Assimp {
 
 
 // ---------------------------------------------------------------------------
diff --git a/code/PostProcessing/FindInstancesProcess.cpp b/code/PostProcessing/FindInstancesProcess.cpp
index 55974b1c3..35a687773 100644
--- a/code/PostProcessing/FindInstancesProcess.cpp
+++ b/code/PostProcessing/FindInstancesProcess.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/code/PostProcessing/FindInstancesProcess.h b/code/PostProcessing/FindInstancesProcess.h
index 6927301ca..fd1bbb2d9 100644
--- a/code/PostProcessing/FindInstancesProcess.h
+++ b/code/PostProcessing/FindInstancesProcess.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/FindInvalidDataProcess.cpp b/code/PostProcessing/FindInvalidDataProcess.cpp
index 64abf7589..fa4160aca 100644
--- a/code/PostProcessing/FindInvalidDataProcess.cpp
+++ b/code/PostProcessing/FindInvalidDataProcess.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2023, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/FindInvalidDataProcess.h b/code/PostProcessing/FindInvalidDataProcess.h
index 024eb9b1e..d6fa573e8 100644
--- a/code/PostProcessing/FindInvalidDataProcess.h
+++ b/code/PostProcessing/FindInvalidDataProcess.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/FixNormalsStep.cpp b/code/PostProcessing/FixNormalsStep.cpp
index 54ac05cc8..5dcb00d32 100644
--- a/code/PostProcessing/FixNormalsStep.cpp
+++ b/code/PostProcessing/FixNormalsStep.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/code/PostProcessing/FixNormalsStep.h b/code/PostProcessing/FixNormalsStep.h
index 20be1958b..62933e40c 100644
--- a/code/PostProcessing/FixNormalsStep.h
+++ b/code/PostProcessing/FixNormalsStep.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/GenBoundingBoxesProcess.cpp b/code/PostProcessing/GenBoundingBoxesProcess.cpp
index ca8e4d6d0..7f67593f8 100644
--- a/code/PostProcessing/GenBoundingBoxesProcess.cpp
+++ b/code/PostProcessing/GenBoundingBoxesProcess.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/GenBoundingBoxesProcess.h b/code/PostProcessing/GenBoundingBoxesProcess.h
index 0cf8514f4..3efb7e6cf 100644
--- a/code/PostProcessing/GenBoundingBoxesProcess.h
+++ b/code/PostProcessing/GenBoundingBoxesProcess.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -19,7 +19,7 @@ conditions are met:
   copyright notice, this list of conditions and the
   following disclaimer in the documentation and/or other
   materials provided with the distribution.
-s
+
 * Neither the name of the assimp team, nor the names of its
   contributors may be used to endorse or promote products
   derived from this software without specific prior
@@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace Assimp {
 
-/** 
+/**
  * @brief Post-processing process to find axis-aligned bounding volumes for amm meshes
  *        used in a scene.
  */
diff --git a/code/PostProcessing/GenFaceNormalsProcess.cpp b/code/PostProcessing/GenFaceNormalsProcess.cpp
index 1d259ce22..5bf5c0e75 100644
--- a/code/PostProcessing/GenFaceNormalsProcess.cpp
+++ b/code/PostProcessing/GenFaceNormalsProcess.cpp
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -41,9 +39,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file Implementation of the post processing step to generate face
-* normals for all imported faces.
-*/
+/**
+ * @file Implementation of the post-processing step to generate face
+ * normals for all imported faces.
+ */
 
 #include "GenFaceNormalsProcess.h"
 #include <assimp/Exceptional.h>
@@ -55,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Assimp;
 
 // ------------------------------------------------------------------------------------------------
-// Returns whether the processing step is present in the given flag field.
+// Returns whether the processing step is in the given flag field.
 bool GenFaceNormalsProcess::IsActive(unsigned int pFlags) const {
     force_ = (pFlags & aiProcess_ForceGenNormals) != 0;
     flippedWindingOrder_ = (pFlags & aiProcess_FlipWindingOrder) != 0;
@@ -64,7 +63,7 @@ bool GenFaceNormalsProcess::IsActive(unsigned int pFlags) const {
 }
 
 // ------------------------------------------------------------------------------------------------
-// Executes the post processing step on the given imported data.
+// Executes the post-processing step on the given imported data.
 void GenFaceNormalsProcess::Execute(aiScene *pScene) {
     ASSIMP_LOG_DEBUG("GenFaceNormalsProcess begin");
 
@@ -88,7 +87,7 @@ void GenFaceNormalsProcess::Execute(aiScene *pScene) {
 }
 
 // ------------------------------------------------------------------------------------------------
-// Executes the post processing step on the given imported data.
+// Executes the post-processing step on the given imported data.
 bool GenFaceNormalsProcess::GenMeshFaceNormals(aiMesh *pMesh) {
     if (nullptr != pMesh->mNormals) {
         if (force_) {
@@ -107,8 +106,27 @@ bool GenFaceNormalsProcess::GenMeshFaceNormals(aiMesh *pMesh) {
     }
 
     // allocate an array to hold the output normals
-    pMesh->mNormals = new aiVector3D[pMesh->mNumVertices];
-    const float qnan = get_qnan();
+    std::vector<aiVector3D> normals;
+    normals.resize(pMesh->mNumVertices);
+
+    // mask to indicate if a vertex was already referenced and needs to be duplicated
+    std::vector<bool> alreadyReferenced;
+    alreadyReferenced.resize(pMesh->mNumVertices, false);
+    std::vector<aiVector3D> duplicatedVertices;
+
+    auto storeNormalSplitVertex = [&](unsigned int index, const aiVector3D& normal) {
+        if (!alreadyReferenced[index]) {
+            normals[index]           = normal;
+            alreadyReferenced[index] = true;
+        } else {
+            duplicatedVertices.push_back(pMesh->mVertices[index]);
+            normals.push_back(normal);
+            index = pMesh->mNumVertices + static_cast<unsigned int>(duplicatedVertices.size() - 1);
+        }
+        return index;
+    };
+
+    const aiVector3D undefinedNormal = aiVector3D(get_qnan());
 
     // iterate through all faces and compute per-face normals but store them per-vertex.
     for (unsigned int a = 0; a < pMesh->mNumFaces; a++) {
@@ -116,7 +134,7 @@ bool GenFaceNormalsProcess::GenMeshFaceNormals(aiMesh *pMesh) {
         if (face.mNumIndices < 3) {
             // either a point or a line -> no well-defined normal vector
             for (unsigned int i = 0; i < face.mNumIndices; ++i) {
-                pMesh->mNormals[face.mIndices[i]] = aiVector3D(qnan);
+                face.mIndices[i] = storeNormalSplitVertex(face.mIndices[i], undefinedNormal);
             }
             continue;
         }
@@ -124,15 +142,29 @@ bool GenFaceNormalsProcess::GenMeshFaceNormals(aiMesh *pMesh) {
         const aiVector3D *pV1 = &pMesh->mVertices[face.mIndices[0]];
         const aiVector3D *pV2 = &pMesh->mVertices[face.mIndices[1]];
         const aiVector3D *pV3 = &pMesh->mVertices[face.mIndices[face.mNumIndices - 1]];
-        // Boolean XOR - if either but not both of these flags is set, then the winding order has
-        // changed and the cross product to calculate the normal needs to be reversed
-        if (flippedWindingOrder_ != leftHanded_) 
+        // Boolean XOR - if either but not both of these flags are set, then the winding order has
+        // changed and the cross-product to calculate the normal needs to be reversed
+        if (flippedWindingOrder_ != leftHanded_)
             std::swap(pV2, pV3);
         const aiVector3D vNor = ((*pV2 - *pV1) ^ (*pV3 - *pV1)).NormalizeSafe();
 
         for (unsigned int i = 0; i < face.mNumIndices; ++i) {
-            pMesh->mNormals[face.mIndices[i]] = vNor;
+            face.mIndices[i] = storeNormalSplitVertex(face.mIndices[i], vNor);
         }
     }
+
+    // store normals (and additional vertices) back into the mesh
+    if (!duplicatedVertices.empty()) {
+        const aiVector3D * oldVertices = pMesh->mVertices;
+        auto oldNumVertices = pMesh->mNumVertices;
+        pMesh->mNumVertices += static_cast<unsigned int>(duplicatedVertices.size());
+        pMesh->mVertices = new aiVector3D[pMesh->mNumVertices];
+        memcpy(pMesh->mVertices, oldVertices, oldNumVertices * sizeof(aiVector3D));
+        memcpy(pMesh->mVertices + oldNumVertices, duplicatedVertices.data(), duplicatedVertices.size() * sizeof(aiVector3D));
+        delete[] oldVertices;
+    }
+    pMesh->mNormals = new aiVector3D[pMesh->mNumVertices];
+    memcpy(pMesh->mNormals, normals.data(), normals.size() * sizeof(aiVector3D));
+
     return true;
 }
diff --git a/code/PostProcessing/GenFaceNormalsProcess.h b/code/PostProcessing/GenFaceNormalsProcess.h
index 94794631e..a33d68df6 100644
--- a/code/PostProcessing/GenFaceNormalsProcess.h
+++ b/code/PostProcessing/GenFaceNormalsProcess.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -50,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace Assimp {
 
 // ---------------------------------------------------------------------------
-/** 
+/**
  * @brief The GenFaceNormalsProcess computes face normals for all faces of all meshes
  */
 class ASSIMP_API_WINONLY GenFaceNormalsProcess : public BaseProcess {
diff --git a/code/PostProcessing/GenVertexNormalsProcess.cpp b/code/PostProcessing/GenVertexNormalsProcess.cpp
index 4869263ab..7cfb6594d 100644
--- a/code/PostProcessing/GenVertexNormalsProcess.cpp
+++ b/code/PostProcessing/GenVertexNormalsProcess.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/GenVertexNormalsProcess.h b/code/PostProcessing/GenVertexNormalsProcess.h
index b7db9c4f2..6be1fae74 100644
--- a/code/PostProcessing/GenVertexNormalsProcess.h
+++ b/code/PostProcessing/GenVertexNormalsProcess.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/ImproveCacheLocality.cpp b/code/PostProcessing/ImproveCacheLocality.cpp
index d7bb95698..0445920d6 100644
--- a/code/PostProcessing/ImproveCacheLocality.cpp
+++ b/code/PostProcessing/ImproveCacheLocality.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2023, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -380,3 +380,4 @@ ai_real ImproveCacheLocalityProcess::ProcessMesh(aiMesh *pMesh, unsigned int mes
 }
 
 } // namespace Assimp
+
diff --git a/code/PostProcessing/ImproveCacheLocality.h b/code/PostProcessing/ImproveCacheLocality.h
index 6f4d55719..1cb081dec 100644
--- a/code/PostProcessing/ImproveCacheLocality.h
+++ b/code/PostProcessing/ImproveCacheLocality.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/JoinVerticesProcess.cpp b/code/PostProcessing/JoinVerticesProcess.cpp
index 4de6c3e1b..19c3b47e9 100644
--- a/code/PostProcessing/JoinVerticesProcess.cpp
+++ b/code/PostProcessing/JoinVerticesProcess.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -54,6 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <unordered_set>
 #include <unordered_map>
 #include <memory>
+#include <map>
 
 using namespace Assimp;
 
@@ -99,52 +100,6 @@ void JoinVerticesProcess::Execute( aiScene* pScene) {
 
 namespace {
 
-bool areVerticesEqual(
-    const Vertex &lhs,
-    const Vertex &rhs,
-    unsigned numUVChannels,
-    unsigned numColorChannels) {
-    // A little helper to find locally close vertices faster.
-    // Try to reuse the lookup table from the last step.
-    const static float epsilon = 1e-5f;
-    // Squared because we check against squared length of the vector difference
-    static const float squareEpsilon = epsilon * epsilon;
-
-    // Square compare is useful for animeshes vertices compare
-    if ((lhs.position - rhs.position).SquareLength() > squareEpsilon) {
-        return false;
-    }
-
-    // We just test the other attributes even if they're not present in the mesh.
-    // In this case they're initialized to 0 so the comparison succeeds.
-    // By this method the non-present attributes are effectively ignored in the comparison.
-    if ((lhs.normal - rhs.normal).SquareLength() > squareEpsilon) {
-        return false;
-    }
-
-    if ((lhs.tangent - rhs.tangent).SquareLength() > squareEpsilon) {
-        return false;
-    }
-
-    if ((lhs.bitangent - rhs.bitangent).SquareLength() > squareEpsilon) {
-        return false;
-    }
-
-    for (unsigned i = 0; i < numUVChannels; i++) {
-        if ((lhs.texcoords[i] - rhs.texcoords[i]).SquareLength() > squareEpsilon) {
-            return false;
-        }
-    }
-
-    for (unsigned i = 0; i < numColorChannels; i++) {
-        if (GetColorDifference(lhs.colors[i], rhs.colors[i]) > squareEpsilon) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
 template<class XMesh>
 void updateXMeshVertices(XMesh *pMesh, std::vector<int> &uniqueVertices) {
     // replace vertex data with the unique data sets
@@ -157,7 +112,7 @@ void updateXMeshVertices(XMesh *pMesh, std::vector<int> &uniqueVertices) {
     // ----------------------------------------------------------------------------
 
     // Position, if present (check made for aiAnimMesh)
-    if (pMesh->mVertices) {  
+    if (pMesh->mVertices) {
         std::unique_ptr<aiVector3D[]> oldVertices(pMesh->mVertices);
         pMesh->mVertices = new aiVector3D[pMesh->mNumVertices];
         for (unsigned int a = 0; a < pMesh->mNumVertices; a++)
@@ -204,41 +159,6 @@ void updateXMeshVertices(XMesh *pMesh, std::vector<int> &uniqueVertices) {
 } // namespace
 
 // ------------------------------------------------------------------------------------------------
-// Unites identical vertices in the given mesh
-// combine hashes
-inline void hash_combine(std::size_t &) {
-    // empty
-}
-
-template <typename T, typename... Rest>
-inline void hash_combine(std::size_t& seed, const T& v, Rest... rest) {
-    std::hash<T> hasher;
-    seed ^= hasher(v) + 0x9e3779b9 + (seed<<6) + (seed>>2);
-    hash_combine(seed, rest...);
-}
-//template specialization for std::hash for Vertex
-template<>
-struct std::hash<Vertex> {
-    std::size_t operator()(Vertex const& v) const noexcept {
-        size_t seed = 0;
-        hash_combine(seed, v.position.x ,v.position.y,v.position.z);
-        return seed;
-    }
-};
-//template specialization for std::equal_to for Vertex
-template<>
-struct std::equal_to<Vertex> {
-    equal_to(unsigned numUVChannels, unsigned numColorChannels) :
-            mNumUVChannels(numUVChannels),
-            mNumColorChannels(numColorChannels) {}
-    bool operator()(const Vertex &lhs, const Vertex &rhs) const {
-        return areVerticesEqual(lhs, rhs, mNumUVChannels, mNumColorChannels);
-    }
-
-private:
-    unsigned mNumUVChannels;
-    unsigned mNumColorChannels;
-};
 
 static constexpr size_t JOINED_VERTICES_MARK = 0x80000000u;
 
@@ -266,7 +186,6 @@ int JoinVerticesProcess::ProcessMesh( aiMesh* pMesh, unsigned int meshIndex) {
 
     // We'll never have more vertices afterwards.
     std::vector<int> uniqueVertices;
-    uniqueVertices.reserve( pMesh->mNumVertices);
 
     // For each vertex the index of the vertex it was replaced by.
     // Since the maximal number of vertices is 2^31-1, the most significand bit can be used to mark
@@ -276,31 +195,6 @@ int JoinVerticesProcess::ProcessMesh( aiMesh* pMesh, unsigned int meshIndex) {
     static_assert(AI_MAX_VERTICES == 0x7fffffff, "AI_MAX_VERTICES == 0x7fffffff");
     std::vector<unsigned int> replaceIndex( pMesh->mNumVertices, 0xffffffff);
 
-    // float posEpsilonSqr;
-    SpatialSort *vertexFinder = nullptr;
-    SpatialSort _vertexFinder;
-
-    typedef std::pair<SpatialSort,float> SpatPair;
-    if (shared) {
-        std::vector<SpatPair >* avf;
-        shared->GetProperty(AI_SPP_SPATIAL_SORT,avf);
-        if (avf)    {
-            SpatPair& blubb = (*avf)[meshIndex];
-            vertexFinder  = &blubb.first;
-            // posEpsilonSqr = blubb.second;
-        }
-    }
-    if (!vertexFinder)  {
-        // bad, need to compute it.
-        _vertexFinder.Fill(pMesh->mVertices, pMesh->mNumVertices, sizeof( aiVector3D));
-        vertexFinder = &_vertexFinder;
-        // posEpsilonSqr = ComputePositionEpsilon(pMesh);
-    }
-
-    // Again, better waste some bytes than a realloc ...
-    std::vector<unsigned int> verticesFound;
-    verticesFound.reserve(10);
-
     // Run an optimized code path if we don't have multiple UVs or vertex colors.
     // This should yield false in more than 99% of all imports ...
     const bool hasAnimMeshes = pMesh->mNumAnimMeshes > 0;
@@ -314,14 +208,8 @@ int JoinVerticesProcess::ProcessMesh( aiMesh* pMesh, unsigned int meshIndex) {
         }
     }
     // a map that maps a vertex to its new index
-    const auto numBuckets = pMesh->mNumVertices;
-    const auto hasher = std::hash<Vertex>();
-    const auto comparator = std::equal_to<Vertex>(
-            pMesh->GetNumUVChannels(),
-            pMesh->GetNumColorChannels());
-    std::unordered_map<Vertex, int> vertex2Index(numBuckets, hasher, comparator);
+    std::map<Vertex, int> vertex2Index = {};
     // we can not end up with more vertices than we started with
-    vertex2Index.reserve(pMesh->mNumVertices);
     // Now check each vertex if it brings something new to the table
     int newIndex = 0;
     for( unsigned int a = 0; a < pMesh->mNumVertices; a++)  {
@@ -336,8 +224,8 @@ int JoinVerticesProcess::ProcessMesh( aiMesh* pMesh, unsigned int meshIndex) {
         // if the vertex is not in the map then it is a new vertex add it.
         if (it == vertex2Index.end()) {
             // this is a new vertex give it a new index
-            vertex2Index[v] = newIndex;
-            //keep track of its index and increment 1
+            vertex2Index.emplace(v, newIndex);
+            // keep track of its index and increment 1
             replaceIndex[a] = newIndex++;
             // add the vertex to the unique vertices
             uniqueVertices.push_back(a);
diff --git a/code/PostProcessing/JoinVerticesProcess.h b/code/PostProcessing/JoinVerticesProcess.h
index aa8dc5794..ea72ac330 100644
--- a/code/PostProcessing/JoinVerticesProcess.h
+++ b/code/PostProcessing/JoinVerticesProcess.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -65,7 +64,7 @@ class ASSIMP_API JoinVerticesProcess : public BaseProcess {
 public:
     // -------------------------------------------------------------------
     /// The default class constructor / destructor.
-    JoinVerticesProcess() = default;    
+    JoinVerticesProcess() = default;
     ~JoinVerticesProcess() override = default;
 
     // -------------------------------------------------------------------
diff --git a/code/PostProcessing/LimitBoneWeightsProcess.cpp b/code/PostProcessing/LimitBoneWeightsProcess.cpp
index 16b32143e..33f466894 100644
--- a/code/PostProcessing/LimitBoneWeightsProcess.cpp
+++ b/code/PostProcessing/LimitBoneWeightsProcess.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2023, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -53,7 +53,8 @@ namespace Assimp {
 
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
-LimitBoneWeightsProcess::LimitBoneWeightsProcess() : mMaxWeights(AI_LMW_MAX_WEIGHTS) {
+LimitBoneWeightsProcess::LimitBoneWeightsProcess() :
+        mMaxWeights(AI_LMW_MAX_WEIGHTS), mRemoveEmptyBones(true) {
     // empty
 }
 
@@ -67,7 +68,7 @@ bool LimitBoneWeightsProcess::IsActive( unsigned int pFlags) const {
 // Executes the post processing step on the given imported data.
 void LimitBoneWeightsProcess::Execute( aiScene* pScene) {
     ai_assert(pScene != nullptr);
-              
+
     ASSIMP_LOG_DEBUG("LimitBoneWeightsProcess begin");
 
     for (unsigned int m = 0; m < pScene->mNumMeshes; ++m) {
@@ -87,7 +88,7 @@ void LimitBoneWeightsProcess::SetupProperties(const Importer* pImp) {
 // ------------------------------------------------------------------------------------------------
 static unsigned int removeEmptyBones(aiMesh *pMesh) {
     ai_assert(pMesh != nullptr);
-    
+
     unsigned int writeBone = 0;
     for (unsigned int readBone = 0; readBone< pMesh->mNumBones; ++readBone) {
         aiBone* bone = pMesh->mBones[readBone];
@@ -97,7 +98,7 @@ static unsigned int removeEmptyBones(aiMesh *pMesh) {
             delete bone;
         }
     }
-    
+
     return writeBone;
 }
 
diff --git a/code/PostProcessing/LimitBoneWeightsProcess.h b/code/PostProcessing/LimitBoneWeightsProcess.h
index 8e5ebd80d..edb713853 100644
--- a/code/PostProcessing/LimitBoneWeightsProcess.h
+++ b/code/PostProcessing/LimitBoneWeightsProcess.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/MakeVerboseFormat.cpp b/code/PostProcessing/MakeVerboseFormat.cpp
index 1cc2fdc02..837511b9c 100644
--- a/code/PostProcessing/MakeVerboseFormat.cpp
+++ b/code/PostProcessing/MakeVerboseFormat.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/code/PostProcessing/MakeVerboseFormat.h b/code/PostProcessing/MakeVerboseFormat.h
index f21f5919e..569c22495 100644
--- a/code/PostProcessing/MakeVerboseFormat.h
+++ b/code/PostProcessing/MakeVerboseFormat.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -50,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct aiMesh;
 
-namespace Assimp    {
+namespace Assimp {
 
 // ---------------------------------------------------------------------------
 /** MakeVerboseFormatProcess: Class to convert an asset to the verbose
diff --git a/code/PostProcessing/OptimizeGraph.cpp b/code/PostProcessing/OptimizeGraph.cpp
index bcd654634..7323e3f04 100644
--- a/code/PostProcessing/OptimizeGraph.cpp
+++ b/code/PostProcessing/OptimizeGraph.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -164,7 +164,7 @@ void OptimizeGraphProcess::CollectNewChildren(aiNode *nd, std::list<aiNode *> &n
 			++it;
 		}
 		if (join_master && !join.empty()) {
-			join_master->mName.length = ::ai_snprintf(join_master->mName.data, MAXLEN, "$MergedNode_%u", count_merged++);
+            join_master->mName.length = ::ai_snprintf(join_master->mName.data, AI_MAXLEN, "$MergedNode_%u", count_merged++);
 
 			unsigned int out_meshes = 0;
 			for (std::list<aiNode *>::const_iterator it = join.cbegin(); it != join.cend(); ++it) {
diff --git a/code/PostProcessing/OptimizeGraph.h b/code/PostProcessing/OptimizeGraph.h
index 23e59e67d..34ebafe2b 100644
--- a/code/PostProcessing/OptimizeGraph.h
+++ b/code/PostProcessing/OptimizeGraph.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -58,7 +57,7 @@ struct aiMesh;
 
 class OptimizeGraphProcessTest;
 
-namespace Assimp    {
+namespace Assimp {
 
 // -----------------------------------------------------------------------------
 /** @brief Postprocessing step to optimize the scenegraph
diff --git a/code/PostProcessing/OptimizeMeshes.cpp b/code/PostProcessing/OptimizeMeshes.cpp
index 0fd597808..0d9c26f6b 100644
--- a/code/PostProcessing/OptimizeMeshes.cpp
+++ b/code/PostProcessing/OptimizeMeshes.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/code/PostProcessing/OptimizeMeshes.h b/code/PostProcessing/OptimizeMeshes.h
index 0b062959a..e0fac3c41 100644
--- a/code/PostProcessing/OptimizeMeshes.h
+++ b/code/PostProcessing/OptimizeMeshes.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -56,7 +55,7 @@ struct aiMesh;
 struct aiNode;
 class OptimizeMeshesProcessTest;
 
-namespace Assimp    {
+namespace Assimp {
 
 // ---------------------------------------------------------------------------
 /** @brief Postprocessing step to optimize mesh usage
diff --git a/code/PostProcessing/PretransformVertices.cpp b/code/PostProcessing/PretransformVertices.cpp
index aff6e535a..0f96318e2 100644
--- a/code/PostProcessing/PretransformVertices.cpp
+++ b/code/PostProcessing/PretransformVertices.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -348,7 +348,7 @@ void PretransformVertices::BuildWCSMeshes(std::vector<aiMesh *> &out, aiMesh **i
 			mesh->mBones = reinterpret_cast<aiBone **>(&node->mTransformation);
 			mesh->mNumBones = UINT_MAX;
 			continue;
-		} 
+		}
 
 		// try to find us in the list of newly created meshes
 		for (unsigned int n = 0; n < out.size(); ++n) {
@@ -635,7 +635,7 @@ void PretransformVertices::Execute(aiScene *pScene) {
 				aiNode *pcNode = new aiNode();
 				*nodes = pcNode;
 				pcNode->mParent = pScene->mRootNode;
-				pcNode->mName.length = ai_snprintf(pcNode->mName.data, MAXLEN, "light_%u", i);
+				pcNode->mName.length = ai_snprintf(pcNode->mName.data, AI_MAXLEN, "light_%u", i);
 				pScene->mLights[i]->mName = pcNode->mName;
 			}
 			// generate camera nodes
@@ -643,7 +643,7 @@ void PretransformVertices::Execute(aiScene *pScene) {
 				aiNode *pcNode = new aiNode();
 				*nodes = pcNode;
 				pcNode->mParent = pScene->mRootNode;
-				pcNode->mName.length = ::ai_snprintf(pcNode->mName.data, MAXLEN, "cam_%u", i);
+				pcNode->mName.length = ::ai_snprintf(pcNode->mName.data, AI_MAXLEN, "cam_%u", i);
 				pScene->mCameras[i]->mName = pcNode->mName;
 			}
 		}
diff --git a/code/PostProcessing/PretransformVertices.h b/code/PostProcessing/PretransformVertices.h
index 69d3d8400..7f2f3db68 100644
--- a/code/PostProcessing/PretransformVertices.h
+++ b/code/PostProcessing/PretransformVertices.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/ProcessHelper.cpp b/code/PostProcessing/ProcessHelper.cpp
index e55c17648..526382578 100644
--- a/code/PostProcessing/ProcessHelper.cpp
+++ b/code/PostProcessing/ProcessHelper.cpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -52,8 +51,9 @@ namespace Assimp {
 // -------------------------------------------------------------------------------
 void ConvertListToStrings(const std::string &in, std::list<std::string> &out) {
     const char *s = in.c_str();
+    const char *end = in.c_str() + in.size();
     while (*s) {
-        SkipSpacesAndLineEnd(&s);
+        SkipSpacesAndLineEnd(&s, end);
         if (*s == '\'') {
             const char *base = ++s;
             while (*s != '\'') {
@@ -66,7 +66,7 @@ void ConvertListToStrings(const std::string &in, std::list<std::string> &out) {
             out.emplace_back(base, (size_t)(s - base));
             ++s;
         } else {
-            out.push_back(GetNextToken(s));
+            out.push_back(GetNextToken(s, end));
         }
     }
 }
@@ -176,8 +176,8 @@ unsigned int GetMeshVFormatUnique(const aiMesh *pcMesh) {
     if (pcMesh->HasTangentsAndBitangents()) iRet |= 0x4;
 
 
-    static_assert(8 >= AI_MAX_NUMBER_OF_COLOR_SETS);
-    static_assert(8 >= AI_MAX_NUMBER_OF_TEXTURECOORDS);
+    static_assert(8 >= AI_MAX_NUMBER_OF_COLOR_SETS, "static_assert(8 >= AI_MAX_NUMBER_OF_COLOR_SETS)");
+    static_assert(8 >= AI_MAX_NUMBER_OF_TEXTURECOORDS, "static_assert(8 >= AI_MAX_NUMBER_OF_TEXTURECOORDS)");
 
     // texture coordinates
     unsigned int p = 0;
diff --git a/code/PostProcessing/ProcessHelper.h b/code/PostProcessing/ProcessHelper.h
index 78df94ca1..69c45ff3c 100644
--- a/code/PostProcessing/ProcessHelper.h
+++ b/code/PostProcessing/ProcessHelper.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/RemoveRedundantMaterials.cpp b/code/PostProcessing/RemoveRedundantMaterials.cpp
index ea8d154dc..6343bd710 100644
--- a/code/PostProcessing/RemoveRedundantMaterials.cpp
+++ b/code/PostProcessing/RemoveRedundantMaterials.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -75,124 +75,129 @@ void RemoveRedundantMatsProcess::Execute( aiScene* pScene) {
     ASSIMP_LOG_DEBUG("RemoveRedundantMatsProcess begin");
 
     unsigned int redundantRemoved = 0, unreferencedRemoved = 0;
-    if (pScene->mNumMaterials) {
-        // Find out which materials are referenced by meshes
-        std::vector<bool> abReferenced(pScene->mNumMaterials,false);
-        for (unsigned int i = 0;i < pScene->mNumMeshes;++i)
-            abReferenced[pScene->mMeshes[i]->mMaterialIndex] = true;
+    if (pScene->mNumMaterials == 0) {
+        return;
+    }
 
-        // If a list of materials to be excluded was given, match the list with
-        // our imported materials and 'salt' all positive matches to ensure that
-        // we get unique hashes later.
-        if (mConfigFixedMaterials.length()) {
+    // Find out which materials are referenced by meshes
+    std::vector<bool> abReferenced(pScene->mNumMaterials,false);
+    for (unsigned int i = 0;i < pScene->mNumMeshes;++i) {
+        abReferenced[pScene->mMeshes[i]->mMaterialIndex] = true;
+    }
 
-            std::list<std::string> strings;
-            ConvertListToStrings(mConfigFixedMaterials,strings);
+    // If a list of materials to be excluded was given, match the list with
+    // our imported materials and 'salt' all positive matches to ensure that
+    // we get unique hashes later.
+    if (mConfigFixedMaterials.length()) {
+        std::list<std::string> strings;
+        ConvertListToStrings(mConfigFixedMaterials,strings);
 
-            for (unsigned int i = 0; i < pScene->mNumMaterials;++i) {
-                aiMaterial* mat = pScene->mMaterials[i];
+        for (unsigned int i = 0; i < pScene->mNumMaterials;++i) {
+            aiMaterial* mat = pScene->mMaterials[i];
+            ai_assert(mat != nullptr);
+            aiString name;
+            mat->Get(AI_MATKEY_NAME,name);
 
-                aiString name;
-                mat->Get(AI_MATKEY_NAME,name);
+            if (name.length != 0) {
+                std::list<std::string>::const_iterator it = std::find(strings.begin(), strings.end(), name.data);
+                if (it != strings.end()) {
+                    // Our brilliant 'salt': A single material property with ~ as first
+                    // character to mark it as internal and temporary.
+                    const int dummy = 1;
+                    ((aiMaterial*)mat)->AddProperty(&dummy,1,"~RRM.UniqueMaterial",0,0);
 
-                if (name.length) {
-                    std::list<std::string>::const_iterator it = std::find(strings.begin(), strings.end(), name.data);
-                    if (it != strings.end()) {
-
-                        // Our brilliant 'salt': A single material property with ~ as first
-                        // character to mark it as internal and temporary.
-                        const int dummy = 1;
-                        ((aiMaterial*)mat)->AddProperty(&dummy,1,"~RRM.UniqueMaterial",0,0);
-
-                        // Keep this material even if no mesh references it
-                        abReferenced[i] = true;
-                        ASSIMP_LOG_VERBOSE_DEBUG( "Found positive match in exclusion list: \'", name.data, "\'");
-                    }
+                    // Keep this material even if no mesh references it
+                    abReferenced[i] = true;
+                    ASSIMP_LOG_VERBOSE_DEBUG( "Found positive match in exclusion list: \'", name.data, "\'");
                 }
             }
         }
+    }
 
-        // TODO: re-implement this algorithm to work in-place
-        unsigned int *aiMappingTable = new unsigned int[pScene->mNumMaterials];
-        for ( unsigned int i=0; i<pScene->mNumMaterials; i++ ) {
-            aiMappingTable[ i ] = 0;
+    // TODO: re-implement this algorithm to work in-place
+    unsigned int *aiMappingTable = new unsigned int[pScene->mNumMaterials];
+    for ( unsigned int i=0; i<pScene->mNumMaterials; i++ ) {
+        aiMappingTable[ i ] = 0;
+    }
+    unsigned int iNewNum = 0;
+
+    // Iterate through all materials and calculate a hash for them
+    // store all hashes in a list and so a quick search whether
+    // we do already have a specific hash. This allows us to
+    // determine which materials are identical.
+    uint32_t *aiHashes = new uint32_t[ pScene->mNumMaterials ];
+    for (unsigned int i = 0; i < pScene->mNumMaterials;++i) {
+        // No mesh is referencing this material, remove it.
+        if (!abReferenced[i]) {
+            ++unreferencedRemoved;
+            delete pScene->mMaterials[i];
+            pScene->mMaterials[i] = nullptr;
+            continue;
         }
-        unsigned int iNewNum = 0;
 
-        // Iterate through all materials and calculate a hash for them
-        // store all hashes in a list and so a quick search whether
-        // we do already have a specific hash. This allows us to
-        // determine which materials are identical.
-        uint32_t *aiHashes = new uint32_t[ pScene->mNumMaterials ];;
-        for (unsigned int i = 0; i < pScene->mNumMaterials;++i) {
-            // No mesh is referencing this material, remove it.
-            if (!abReferenced[i]) {
-                ++unreferencedRemoved;
+        // Check all previously mapped materials for a matching hash.
+        // On a match we can delete this material and just make it ref to the same index.
+        uint32_t me = aiHashes[i] = ComputeMaterialHash(pScene->mMaterials[i]);
+        for (unsigned int a = 0; a < i;++a) {
+            if (abReferenced[a] && me == aiHashes[a]) {
+                ++redundantRemoved;
+                me = 0;
+                aiMappingTable[i] = aiMappingTable[a];
                 delete pScene->mMaterials[i];
                 pScene->mMaterials[i] = nullptr;
+                break;
+            }
+        }
+        // This is a new material that is referenced, add to the map.
+        if (me) {
+            aiMappingTable[i] = iNewNum++;
+        }
+    }
+    // If the new material count differs from the original,
+    // we need to rebuild the material list and remap mesh material indexes.
+    if (iNewNum < 1) {
+        delete [] aiMappingTable;
+        delete [] aiHashes;
+        pScene->mNumMaterials = 0;
+        return;
+    }
+    if (iNewNum != pScene->mNumMaterials) {
+        ai_assert(iNewNum > 0);
+        aiMaterial** ppcMaterials = new aiMaterial*[iNewNum];
+        ::memset(ppcMaterials,0,sizeof(void*)*iNewNum);
+        for (unsigned int p = 0; p < pScene->mNumMaterials;++p) {
+            // if the material is not referenced ... remove it
+            if (!abReferenced[p]) {
                 continue;
             }
 
-            // Check all previously mapped materials for a matching hash.
-            // On a match we can delete this material and just make it ref to the same index.
-            uint32_t me = aiHashes[i] = ComputeMaterialHash(pScene->mMaterials[i]);
-            for (unsigned int a = 0; a < i;++a) {
-                if (abReferenced[a] && me == aiHashes[a]) {
-                    ++redundantRemoved;
-                    me = 0;
-                    aiMappingTable[i] = aiMappingTable[a];
-                    delete pScene->mMaterials[i];
-                    pScene->mMaterials[i] = nullptr;
-                    break;
+            // generate new names for modified materials that had no names
+            const unsigned int idx = aiMappingTable[p];
+            if (ppcMaterials[idx]) {
+                aiString sz;
+                if( ppcMaterials[idx]->Get(AI_MATKEY_NAME, sz) != AI_SUCCESS ) {
+                    sz.length = ::ai_snprintf(sz.data, AI_MAXLEN,"JoinedMaterial_#%u",p);
+                    ((aiMaterial*)ppcMaterials[idx])->AddProperty(&sz,AI_MATKEY_NAME);
                 }
-            }
-            // This is a new material that is referenced, add to the map.
-            if (me) {
-                aiMappingTable[i] = iNewNum++;
+            } else {
+                ppcMaterials[idx] = pScene->mMaterials[p];
             }
         }
-        // If the new material count differs from the original,
-        // we need to rebuild the material list and remap mesh material indexes.
-        if(iNewNum < 1)
-          throw DeadlyImportError("No materials remaining");
-        if (iNewNum != pScene->mNumMaterials) {
-            ai_assert(iNewNum > 0);
-            aiMaterial** ppcMaterials = new aiMaterial*[iNewNum];
-            ::memset(ppcMaterials,0,sizeof(void*)*iNewNum);
-            for (unsigned int p = 0; p < pScene->mNumMaterials;++p)
-            {
-                // if the material is not referenced ... remove it
-                if (!abReferenced[p]) {
-                    continue;
-                }
-
-                // generate new names for modified materials that had no names
-                const unsigned int idx = aiMappingTable[p];
-                if (ppcMaterials[idx]) {
-                    aiString sz;
-                    if( ppcMaterials[idx]->Get(AI_MATKEY_NAME, sz) != AI_SUCCESS ) {
-                        sz.length = ::ai_snprintf(sz.data,MAXLEN,"JoinedMaterial_#%u",p);
-                        ((aiMaterial*)ppcMaterials[idx])->AddProperty(&sz,AI_MATKEY_NAME);
-                    }
-                } else {
-                    ppcMaterials[idx] = pScene->mMaterials[p];
-                }
-            }
-            // update all material indices
-            for (unsigned int p = 0; p < pScene->mNumMeshes;++p) {
-                aiMesh* mesh = pScene->mMeshes[p];
-                ai_assert(nullptr != mesh);
-                mesh->mMaterialIndex = aiMappingTable[mesh->mMaterialIndex];
-            }
-            // delete the old material list
-            delete[] pScene->mMaterials;
-            pScene->mMaterials = ppcMaterials;
-            pScene->mNumMaterials = iNewNum;
+        // update all material indices
+        for (unsigned int p = 0; p < pScene->mNumMeshes;++p) {
+            aiMesh* mesh = pScene->mMeshes[p];
+            ai_assert(nullptr != mesh);
+            mesh->mMaterialIndex = aiMappingTable[mesh->mMaterialIndex];
         }
-        // delete temporary storage
-        delete[] aiHashes;
-        delete[] aiMappingTable;
+        // delete the old material list
+        delete[] pScene->mMaterials;
+        pScene->mMaterials = ppcMaterials;
+        pScene->mNumMaterials = iNewNum;
     }
+    // delete temporary storage
+    delete[] aiHashes;
+    delete[] aiMappingTable;
+
     if (redundantRemoved == 0 && unreferencedRemoved == 0) {
         ASSIMP_LOG_DEBUG("RemoveRedundantMatsProcess finished ");
     } else {
diff --git a/code/PostProcessing/RemoveRedundantMaterials.h b/code/PostProcessing/RemoveRedundantMaterials.h
index 1b42bea55..e317496c7 100644
--- a/code/PostProcessing/RemoveRedundantMaterials.h
+++ b/code/PostProcessing/RemoveRedundantMaterials.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -51,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 class RemoveRedundantMatsTest;
 
-namespace Assimp    {
+namespace Assimp {
 
 // ---------------------------------------------------------------------------
 /** RemoveRedundantMatsProcess: Post-processing step to remove redundant
diff --git a/code/PostProcessing/RemoveVCProcess.cpp b/code/PostProcessing/RemoveVCProcess.cpp
index bcad65423..5ef3c04b8 100644
--- a/code/PostProcessing/RemoveVCProcess.cpp
+++ b/code/PostProcessing/RemoveVCProcess.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/RemoveVCProcess.h b/code/PostProcessing/RemoveVCProcess.h
index 45c0b3a71..27d80eec9 100644
--- a/code/PostProcessing/RemoveVCProcess.h
+++ b/code/PostProcessing/RemoveVCProcess.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -83,7 +82,7 @@ public:
     * The function is a request to the process to update its configuration
     * basing on the Importer's configuration property list.
     */
-    virtual void SetupProperties(const Importer* pImp) override;
+    void SetupProperties(const Importer* pImp) override;
 
     // -------------------------------------------------------------------
     /** Manually setup the configuration flags for the step
diff --git a/code/PostProcessing/ScaleProcess.cpp b/code/PostProcessing/ScaleProcess.cpp
index 1bb9196f1..3e28f746a 100644
--- a/code/PostProcessing/ScaleProcess.cpp
+++ b/code/PostProcessing/ScaleProcess.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/ScaleProcess.h b/code/PostProcessing/ScaleProcess.h
index ae1c3ed00..6faa38dd2 100644
--- a/code/PostProcessing/ScaleProcess.h
+++ b/code/PostProcessing/ScaleProcess.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -74,13 +73,13 @@ public:
     ai_real getScale() const;
 
     /// Overwritten, @see BaseProcess
-    virtual bool IsActive( unsigned int pFlags ) const override;
+    bool IsActive( unsigned int pFlags ) const override;
 
     /// Overwritten, @see BaseProcess
-    virtual void SetupProperties( const Importer* pImp ) override;
+    void SetupProperties( const Importer* pImp ) override;
 
     /// Overwritten, @see BaseProcess
-    virtual void Execute( aiScene* pScene ) override;
+    void Execute( aiScene* pScene ) override;
 
 private:
     void traverseNodes( aiNode *currentNode, unsigned int nested_node_id = 0 );
diff --git a/code/PostProcessing/SortByPTypeProcess.cpp b/code/PostProcessing/SortByPTypeProcess.cpp
index 47633dce5..162ddab6f 100644
--- a/code/PostProcessing/SortByPTypeProcess.cpp
+++ b/code/PostProcessing/SortByPTypeProcess.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -65,37 +65,47 @@ void SortByPTypeProcess::SetupProperties(const Importer *pImp) {
     mConfigRemoveMeshes = pImp->GetPropertyInteger(AI_CONFIG_PP_SBP_REMOVE, 0);
 }
 
+// ------------------------------------------------------------------------------------------------
+static void clearMeshesInNode(aiNode *node) {
+    delete[] node->mMeshes;
+    node->mNumMeshes = 0;
+    node->mMeshes = nullptr;
+}
+
 // ------------------------------------------------------------------------------------------------
 // Update changed meshes in all nodes
 void UpdateNodes(const std::vector<unsigned int> &replaceMeshIndex, aiNode *node) {
+    ai_assert(node != nullptr);
+
     if (node->mNumMeshes) {
         unsigned int newSize = 0;
         for (unsigned int m = 0; m < node->mNumMeshes; ++m) {
             unsigned int add = node->mMeshes[m] << 2;
             for (unsigned int i = 0; i < 4; ++i) {
-                if (UINT_MAX != replaceMeshIndex[add + i]) ++newSize;
-            }
-        }
-        if (!newSize) {
-            delete[] node->mMeshes;
-            node->mNumMeshes = 0;
-            node->mMeshes = nullptr;
-        } else {
-            // Try to reuse the old array if possible
-            unsigned int *newMeshes = (newSize > node->mNumMeshes ? new unsigned int[newSize] : node->mMeshes);
-
-            for (unsigned int m = 0; m < node->mNumMeshes; ++m) {
-                unsigned int add = node->mMeshes[m] << 2;
-                for (unsigned int i = 0; i < 4; ++i) {
-                    if (UINT_MAX != replaceMeshIndex[add + i])
-                        *newMeshes++ = replaceMeshIndex[add + i];
+                if (UINT_MAX != replaceMeshIndex[add + i]) {
+                    ++newSize;
                 }
             }
-            if (newSize > node->mNumMeshes)
-                delete[] node->mMeshes;
-
-            node->mMeshes = newMeshes - (node->mNumMeshes = newSize);
         }
+        if (newSize == 0) {
+            clearMeshesInNode(node);
+            return;
+        }
+
+        // Try to reuse the old array if possible
+        unsigned int *newMeshes = (newSize > node->mNumMeshes ? new unsigned int[newSize] : node->mMeshes);
+        for (unsigned int m = 0; m < node->mNumMeshes; ++m) {
+            unsigned int add = node->mMeshes[m] << 2;
+            for (unsigned int i = 0; i < 4; ++i) {
+                if (UINT_MAX != replaceMeshIndex[add + i]) {
+                    *newMeshes++ = replaceMeshIndex[add + i];
+                }
+            }
+        }
+        if (newSize > node->mNumMeshes) {
+            clearMeshesInNode(node);
+        }
+        node->mMeshes = newMeshes - (node->mNumMeshes = newSize);
     }
 
     // call all subnodes recursively
@@ -126,6 +136,9 @@ void SortByPTypeProcess::Execute(aiScene *pScene) {
     for (unsigned int i = 0; i < pScene->mNumMeshes; ++i) {
         aiMesh *const mesh = pScene->mMeshes[i];
         if (mesh->mPrimitiveTypes == 0) {
+            for (size_t idx = 0; idx < outMeshes.size(); ++idx) {
+                delete outMeshes[idx];
+            }
             throw DeadlyImportError("Mesh with invalid primitive type: ", mesh->mName.C_Str());
         }
 
@@ -167,6 +180,10 @@ void SortByPTypeProcess::Execute(aiScene *pScene) {
         // with the largest number of primitives
         unsigned int aiNumPerPType[4] = { 0, 0, 0, 0 };
         aiFace *pFirstFace = mesh->mFaces;
+        if (pFirstFace == nullptr) {
+            continue;
+        }
+
         aiFace *const pLastFace = pFirstFace + mesh->mNumFaces;
 
         unsigned int numPolyVerts = 0;
@@ -308,7 +325,7 @@ void SortByPTypeProcess::Execute(aiScene *pScene) {
                     if (vert) {
                         *vert++ = mesh->mVertices[idx];
                     }
-                    if (nor) 
+                    if (nor)
                         *nor++ = mesh->mNormals[idx];
                     if (tan) {
                         *tan++ = mesh->mTangents[idx];
@@ -316,13 +333,13 @@ void SortByPTypeProcess::Execute(aiScene *pScene) {
                     }
 
                     for (unsigned int pp = 0; pp < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++pp) {
-                        if (!uv[pp]) 
+                        if (!uv[pp])
                             break;
                         *uv[pp]++ = mesh->mTextureCoords[pp][idx];
                     }
 
                     for (unsigned int pp = 0; pp < AI_MAX_NUMBER_OF_COLOR_SETS; ++pp) {
-                        if (!cols[pp]) 
+                        if (!cols[pp])
                             break;
                         *cols[pp]++ = mesh->mColors[pp][idx];
                     }
diff --git a/code/PostProcessing/SortByPTypeProcess.h b/code/PostProcessing/SortByPTypeProcess.h
index ce4f7da62..d966d8522 100644
--- a/code/PostProcessing/SortByPTypeProcess.h
+++ b/code/PostProcessing/SortByPTypeProcess.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -50,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 class SortByPTypeProcessTest;
 
-namespace Assimp    {
+namespace Assimp {
 
 
 // ---------------------------------------------------------------------------
diff --git a/code/PostProcessing/SplitByBoneCountProcess.cpp b/code/PostProcessing/SplitByBoneCountProcess.cpp
index 969146fee..e2500fe8a 100644
--- a/code/PostProcessing/SplitByBoneCountProcess.cpp
+++ b/code/PostProcessing/SplitByBoneCountProcess.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -394,7 +394,7 @@ void SplitByBoneCountProcess::SplitMesh( const aiMesh* pMesh, std::vector<aiMesh
 // Recursively updates the node's mesh list to account for the changed mesh list
 void SplitByBoneCountProcess::UpdateNode( aiNode* pNode) const {
     // rebuild the node's mesh index list
-    if( pNode->mNumMeshes == 0 ) {
+    if( pNode->mNumMeshes != 0 ) {
         IndexArray newMeshList;
         for( unsigned int a = 0; a < pNode->mNumMeshes; ++a) {
             unsigned int srcIndex = pNode->mMeshes[a];
diff --git a/code/PostProcessing/SplitByBoneCountProcess.h b/code/PostProcessing/SplitByBoneCountProcess.h
index efe85824f..c41e435a3 100644
--- a/code/PostProcessing/SplitByBoneCountProcess.h
+++ b/code/PostProcessing/SplitByBoneCountProcess.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -74,7 +74,7 @@ public:
     /// @brief Called prior to ExecuteOnScene().
     /// The function is a request to the process to update its configuration
     /// basing on the Importer's configuration property list.
-    virtual void SetupProperties(const Importer* pImp) override;
+    void SetupProperties(const Importer* pImp) override;
 
     /// @brief Will return the maximal number of bones.
     /// @return The maximal number of bones.
diff --git a/code/PostProcessing/SplitLargeMeshes.cpp b/code/PostProcessing/SplitLargeMeshes.cpp
index b6e5b772a..7d6d038e9 100644
--- a/code/PostProcessing/SplitLargeMeshes.cpp
+++ b/code/PostProcessing/SplitLargeMeshes.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -100,6 +100,11 @@ void SplitLargeMeshesProcess_Triangle::SetupProperties( const Importer* pImp) {
 // ------------------------------------------------------------------------------------------------
 // Update a node after some meshes have been split
 void SplitLargeMeshesProcess_Triangle::UpdateNode(aiNode* pcNode, const std::vector<std::pair<aiMesh*, unsigned int> >& avList) {
+    if (pcNode == nullptr) {
+        ASSIMP_LOG_WARN("UpdateNode skipped, nullptr detected.");
+        return;
+    }
+
     // for every index in out list build a new entry
     std::vector<unsigned int> aiEntries;
     aiEntries.reserve(pcNode->mNumMeshes + 1);
diff --git a/code/PostProcessing/SplitLargeMeshes.h b/code/PostProcessing/SplitLargeMeshes.h
index 4e0d764c1..42133122b 100644
--- a/code/PostProcessing/SplitLargeMeshes.h
+++ b/code/PostProcessing/SplitLargeMeshes.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/TextureTransform.cpp b/code/PostProcessing/TextureTransform.cpp
index 3de357c17..7870549e1 100644
--- a/code/PostProcessing/TextureTransform.cpp
+++ b/code/PostProcessing/TextureTransform.cpp
@@ -1,8 +1,7 @@
 /*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -35,27 +34,20 @@ 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.
-
 ----------------------------------------------------------------------
 */
 
 /** @file A helper class that processes texture transformations */
 
+#include "TextureTransform.h"
+
 #include <assimp/Importer.hpp>
 #include <assimp/postprocess.h>
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/scene.h>
-
-#include "TextureTransform.h"
 #include <assimp/StringUtils.h>
 
-using namespace Assimp;
-
-// ------------------------------------------------------------------------------------------------
-// Constructor to be privately used by Importer
-TextureTransformStep::TextureTransformStep() : configFlags()  {
-    // nothing to do here
-}
+namespace Assimp {
 
 // ------------------------------------------------------------------------------------------------
 // Returns whether the processing step is present in the given flag field.
@@ -202,7 +194,6 @@ inline static const char* MappingModeToChar(aiTextureMapMode map) {
 void TextureTransformStep::Execute( aiScene* pScene) {
     ASSIMP_LOG_DEBUG("TransformUVCoordsProcess begin");
 
-
     /*  We build a per-mesh list of texture transformations we'll need
      *  to apply. To achieve this, we iterate through all materials,
      *  find all textures and get their transformations and UV indices.
@@ -390,8 +381,8 @@ void TextureTransformStep::Execute( aiScene* pScene) {
         cnt = 0;
         for (it = trafo.begin();it != trafo.end(); ++it,++cnt) {
             if ((*it).lockedPos != AI_TT_UV_IDX_LOCK_NONE && (*it).lockedPos != cnt) {
-                it2 = trafo.begin();unsigned int t = 0;
-                while (t != (*it).lockedPos)
+                it2 = trafo.begin();
+                while ((*it2).lockedPos != (*it).lockedPos)
                     ++it2;
 
                 if ((*it2).lockedPos != AI_TT_UV_IDX_LOCK_NONE) {
@@ -426,7 +417,6 @@ void TextureTransformStep::Execute( aiScene* pScene) {
         // it shouldn't be too worse if we remove them.
         unsigned int size = (unsigned int)trafo.size();
         if (size > AI_MAX_NUMBER_OF_TEXTURECOORDS) {
-
             if (!DefaultLogger::isNullLogger()) {
                 ASSIMP_LOG_ERROR(static_cast<unsigned int>(trafo.size()), " UV channels required but just ",
                     AI_MAX_NUMBER_OF_TEXTURECOORDS, " available");
@@ -434,7 +424,6 @@ void TextureTransformStep::Execute( aiScene* pScene) {
             size = AI_MAX_NUMBER_OF_TEXTURECOORDS;
         }
 
-
         aiVector3D* old[AI_MAX_NUMBER_OF_TEXTURECOORDS];
         for (unsigned int n = 0; n < AI_MAX_NUMBER_OF_TEXTURECOORDS;++n)
             old[n] = mesh->mTextureCoords[n];
@@ -443,14 +432,13 @@ void TextureTransformStep::Execute( aiScene* pScene) {
         // that we're not going to need later can be overridden.
         it = trafo.begin();
         for (unsigned int n = 0; n < trafo.size();++n,++it) {
-
             if (n >= size)  {
                 // Try to use an untransformed channel for all channels we threw over board
                 UpdateUVIndex((*it).updateList,untransformed);
                 continue;
             }
 
-            outChannels++;
+            ++outChannels;
 
             // Write to the log
             if (!DefaultLogger::isNullLogger()) {
@@ -470,15 +458,18 @@ void TextureTransformStep::Execute( aiScene* pScene) {
             // Check whether we need a new buffer here
             if (mesh->mTextureCoords[n])    {
 
-                it2 = it;++it2;
+                it2 = it;
+		++it2;
                 for (unsigned int m = n+1; m < size;++m, ++it2) {
-
                     if ((*it2).uvIndex == n){
                         it2 = trafo.begin();
                         break;
                     }
                 }
-                if (it2 == trafo.begin()){
+                if (it2 == trafo.begin()) { 	            
+		    {
+                        std::unique_ptr<aiVector3D[]> oldTextureCoords(mesh->mTextureCoords[n]);
+                    }
                     mesh->mTextureCoords[n] = new aiVector3D[mesh->mNumVertices];
                 }
             }
@@ -536,13 +527,12 @@ void TextureTransformStep::Execute( aiScene* pScene) {
 
     // Print some detailed statistics into the log
     if (!DefaultLogger::isNullLogger()) {
-
         if (transformedChannels)    {
             ASSIMP_LOG_INFO("TransformUVCoordsProcess end: ", outChannels, " output channels (in: ", inChannels, ", modified: ", transformedChannels,")");
         } else {
-            ASSIMP_LOG_DEBUG("TransformUVCoordsProcess finished");
+            ASSIMP_LOG_INFO("TransformUVCoordsProcess finished");
         }
     }
 }
 
-
+} // namespace Assimp
diff --git a/code/PostProcessing/TextureTransform.h b/code/PostProcessing/TextureTransform.h
index c9f0480ba..866b9522a 100644
--- a/code/PostProcessing/TextureTransform.h
+++ b/code/PostProcessing/TextureTransform.h
@@ -1,9 +1,7 @@
 /*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -44,142 +42,116 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_TEXTURE_TRANSFORM_H_INCLUDED
 #define AI_TEXTURE_TRANSFORM_H_INCLUDED
 
-#include <assimp/BaseImporter.h>
 #include "Common/BaseProcess.h"
 
+#include <assimp/BaseImporter.h>
 #include <assimp/material.h>
 #include <list>
 
 struct aiNode;
 struct aiMaterial;
 
-namespace Assimp    {
+namespace Assimp {
 
 #define AI_TT_UV_IDX_LOCK_TBD   0xffffffff
 #define AI_TT_UV_IDX_LOCK_NONE  0xeeeeeeee
-
-
 #define AI_TT_ROTATION_EPSILON  ((float)AI_DEG_TO_RAD(0.5))
 
 // ---------------------------------------------------------------------------
-/** Small helper structure representing a shortcut into the material list
- *  to be able to update some values quickly.
-*/
+/** 
+ * @brief Small helper structure representing a shortcut into the material list
+ *        to be able to update some values quickly.
+ */
 struct TTUpdateInfo {
-    TTUpdateInfo() AI_NO_EXCEPT
-    : directShortcut(nullptr)
-    , mat(nullptr)
-    , semantic(0)
-    , index(0) {
-        // empty
-    }
-
     //! Direct shortcut, if available
-    unsigned int* directShortcut;
+    unsigned int* directShortcut = nullptr;
 
     //! Material
-    aiMaterial *mat;
+    aiMaterial *mat = nullptr;
 
-    //! Texture type and index
-    unsigned int semantic, index;
+    //! Texture type
+    unsigned int semantic = 0;
+
+    //! Texture index
+    unsigned int index = 0;
 };
 
-
 // ---------------------------------------------------------------------------
-/** Helper class representing texture coordinate transformations
-*/
+/** 
+ * @brief  Helper class representing texture coordinate transformations
+ */
 struct STransformVecInfo : public aiUVTransform {
-    STransformVecInfo() AI_NO_EXCEPT
-    : uvIndex(0)
-    , mapU(aiTextureMapMode_Wrap)
-    , mapV(aiTextureMapMode_Wrap)
-    , lockedPos(AI_TT_UV_IDX_LOCK_NONE) {
-        // empty
-    }
-
     //! Source texture coordinate index
-    unsigned int uvIndex;
+    unsigned int uvIndex = 0;
 
-    //! Texture mapping mode in the u, v direction
-    aiTextureMapMode mapU,mapV;
+    //! Texture mapping mode in the u direction
+    aiTextureMapMode mapU = aiTextureMapMode_Wrap;
+
+    //! Texture mapping mode in the v direction
+    aiTextureMapMode mapV = aiTextureMapMode_Wrap;
 
     //! Locked destination UV index
     //! AI_TT_UV_IDX_LOCK_TBD - to be determined
     //! AI_TT_UV_IDX_LOCK_NONE - none (default)
-    unsigned int lockedPos;
+    unsigned int lockedPos = AI_TT_UV_IDX_LOCK_NONE;
 
     //! Update info - shortcuts into all materials
     //! that are referencing this transform setup
     std::list<TTUpdateInfo> updateList;
 
-
-    // -------------------------------------------------------------------
-    /** Compare two transform setups
-    */
-    inline bool operator== (const STransformVecInfo& other) const
-    {
+    inline bool operator== (const STransformVecInfo& other) const {
         // We use a small epsilon here
         const static float epsilon = 0.05f;
 
         if (std::fabs( mTranslation.x - other.mTranslation.x ) > epsilon ||
-            std::fabs( mTranslation.y - other.mTranslation.y ) > epsilon)
-        {
+                std::fabs( mTranslation.y - other.mTranslation.y ) > epsilon) {
             return false;
         }
 
         if (std::fabs( mScaling.x - other.mScaling.x ) > epsilon ||
-            std::fabs( mScaling.y - other.mScaling.y ) > epsilon)
-        {
+                std::fabs( mScaling.y - other.mScaling.y ) > epsilon) {
             return false;
         }
 
-        if (std::fabs( mRotation - other.mRotation) > epsilon)
-        {
+        if (std::fabs( mRotation - other.mRotation) > epsilon) {
             return false;
         }
         return true;
     }
 
-    inline bool operator!= (const STransformVecInfo& other) const
-    {
+    inline bool operator!= (const STransformVecInfo& other) const {
             return !(*this == other);
     }
 
-
     // -------------------------------------------------------------------
-    /** Returns whether this is an untransformed texture coordinate set
-    */
-    inline bool IsUntransformed() const
-    {
+    /** 
+     * @brief Returns whether this is an untransformed texture coordinate set
+     */
+    inline bool IsUntransformed() const {
         return (1.0f == mScaling.x && 1.f == mScaling.y &&
-            !mTranslation.x && !mTranslation.y &&
-            mRotation < AI_TT_ROTATION_EPSILON);
+            !mTranslation.x && !mTranslation.y && mRotation < AI_TT_ROTATION_EPSILON);
     }
 
     // -------------------------------------------------------------------
-    /** Build a 3x3 matrix from the transformations
-    */
-    inline void GetMatrix(aiMatrix3x3& mOut)
-    {
+    /** 
+     * @brief Build a 3x3 matrix from the transformations
+     */
+    inline void GetMatrix(aiMatrix3x3& mOut) {
         mOut = aiMatrix3x3();
-
-        if (1.0f != mScaling.x || 1.0f != mScaling.y)
-        {
+        if (1.0f != mScaling.x || 1.0f != mScaling.y) {
             aiMatrix3x3 mScale;
             mScale.a1 = mScaling.x;
             mScale.b2 = mScaling.y;
             mOut = mScale;
         }
-        if (mRotation)
-        {
+        if (mRotation) {
             aiMatrix3x3 mRot;
             mRot.a1 = mRot.b2 = std::cos(mRotation);
             mRot.a2 = mRot.b1 = std::sin(mRotation);
             mRot.a2 = -mRot.a2;
             mOut *= mRot;
         }
-        if (mTranslation.x || mTranslation.y)
-        {
+        if (mTranslation.x || mTranslation.y) {
             aiMatrix3x3 mTrans;
             mTrans.a3 = mTranslation.x;
             mTrans.b3 = mTranslation.y;
@@ -188,16 +160,18 @@ struct STransformVecInfo : public aiUVTransform {
     }
 };
 
-
 // ---------------------------------------------------------------------------
-/** Helper step to compute final UV coordinate sets if there are scalings
+/** 
+ * @brief Helper step to compute final UV coordinate sets if there are scalings
  *  or rotations in the original data read from the file.
-*/
-class TextureTransformStep : public BaseProcess {
+ */
+class TextureTransformStep final : public BaseProcess {
 public:
     // -------------------------------------------------------------------
-    /// The default class constructor / destructor.
-    TextureTransformStep();
+    /// The default class constructor. / 
+    TextureTransformStep() = default;
+
+    /// The default class destructor.
     ~TextureTransformStep() override = default;
 
     // -------------------------------------------------------------------
@@ -211,16 +185,17 @@ public:
 
 protected:
     // -------------------------------------------------------------------
-    /** Preprocess a specific UV transformation setup
+    /** 
+     * @brief Preprocess a specific UV transformation setup
      *
      *  @param info Transformation setup to be preprocessed.
-    */
+     */
     void PreProcessUVTransform(STransformVecInfo& info);
 
 private:
     unsigned int configFlags;
 };
- 
+
 } // namespace Assimp
 
 #endif //! AI_TEXTURE_TRANSFORM_H_INCLUDED
diff --git a/code/PostProcessing/TriangulateProcess.cpp b/code/PostProcessing/TriangulateProcess.cpp
index f16de2196..e58f5fa98 100644
--- a/code/PostProcessing/TriangulateProcess.cpp
+++ b/code/PostProcessing/TriangulateProcess.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -62,6 +62,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "PostProcessing/TriangulateProcess.h"
 #include "PostProcessing/ProcessHelper.h"
 #include "Common/PolyTools.h"
+#include "contrib/earcut-hpp/earcut.hpp"
 
 #include <memory>
 #include <cstdint>
@@ -74,6 +75,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define POLY_GRID_XPAD 20
 #define POLY_OUTPUT_FILE "assimp_polygons_debug.txt"
 
+namespace mapbox::util {
+
+template <>
+struct nth<0, aiVector2D> {
+    inline static auto get(const aiVector2D& t) {
+        return t.x;
+    }
+};
+template <>
+struct nth<1, aiVector2D> {
+    inline static auto get(const aiVector2D& t) {
+        return t.y;
+    }
+};
+
+} // namespace mapbox::util
+
 using namespace Assimp;
 
 namespace {
@@ -192,13 +210,13 @@ bool TriangulateProcess::TriangulateMesh( aiMesh* pMesh) {
 
         for( unsigned int a = 0; a < pMesh->mNumFaces; a++) {
             const aiFace& face = pMesh->mFaces[a];
-
             if( face.mNumIndices != 3)  {
                 bNeed = true;
             }
         }
-        if (!bNeed)
+        if (!bNeed) {
             return false;
+        }
     }
     else if (!(pMesh->mPrimitiveTypes & aiPrimitiveType_POLYGON)) {
         return false;
@@ -213,8 +231,7 @@ bool TriangulateProcess::TriangulateMesh( aiMesh* pMesh) {
             get_normals = false;
         }
         if( face.mNumIndices <= 3) {
-            numOut++;
-
+            ++numOut;
         } else {
             numOut += face.mNumIndices-2;
             max_out = std::max(max_out,face.mNumIndices);
@@ -222,7 +239,10 @@ bool TriangulateProcess::TriangulateMesh( aiMesh* pMesh) {
     }
 
     // Just another check whether aiMesh::mPrimitiveTypes is correct
-    ai_assert(numOut != pMesh->mNumFaces);
+    if (numOut == pMesh->mNumFaces) {
+        ASSIMP_LOG_ERROR( "Invalidation detected in the number of indices: does not fit to the primitive type." );
+        return false;
+    }
 
     aiVector3D *nor_out = nullptr;
 
@@ -242,7 +262,9 @@ bool TriangulateProcess::TriangulateMesh( aiMesh* pMesh) {
 
     aiFace* out = new aiFace[numOut](), *curOut = out;
     std::vector<aiVector3D> temp_verts3d(max_out+2); /* temporary storage for vertices */
-    std::vector<aiVector2D> temp_verts(max_out+2);
+    std::vector<std::vector<aiVector2D>> temp_poly(1); /* temporary storage for earcut.hpp */
+    std::vector<aiVector2D>& temp_verts = temp_poly[0];
+    temp_verts.reserve(max_out + 2);
 
     NGONEncoder ngonEncoder;
 
@@ -262,13 +284,11 @@ bool TriangulateProcess::TriangulateMesh( aiMesh* pMesh) {
 
     const aiVector3D* verts = pMesh->mVertices;
 
-    // use std::unique_ptr to avoid slow std::vector<bool> specialiations
-    std::unique_ptr<bool[]> done(new bool[max_out]);
     for( unsigned int a = 0; a < pMesh->mNumFaces; a++) {
         aiFace& face = pMesh->mFaces[a];
 
         unsigned int* idx = face.mIndices;
-        int num = (int)face.mNumIndices, ear = 0, tmp, prev = num-1, next = 0, max = num;
+        unsigned int num = face.mNumIndices;
 
         // Apply vertex colors to represent the face winding?
 #ifdef AI_BUILD_TRIANGULATE_COLOR_FACE_WINDING
@@ -361,16 +381,16 @@ bool TriangulateProcess::TriangulateMesh( aiMesh* pMesh) {
             // We project it onto a plane to get a 2d triangle.
 
             // Collect all vertices of of the polygon.
-            for (tmp = 0; tmp < max; ++tmp) {
+            for (unsigned int tmp = 0; tmp < num; ++tmp) {
                 temp_verts3d[tmp] = verts[idx[tmp]];
             }
 
             // Get newell normal of the polygon. Store it for future use if it's a polygon-only mesh
             aiVector3D n;
-            NewellNormal<3,3,3>(n,max,&temp_verts3d.front().x,&temp_verts3d.front().y,&temp_verts3d.front().z);
+            NewellNormal<3, 3, 3>(n, num, &temp_verts3d.front().x, &temp_verts3d.front().y, &temp_verts3d.front().z);
             if (nor_out) {
-                 for (tmp = 0; tmp < max; ++tmp)
-                     nor_out[idx[tmp]] = n;
+                for (unsigned int tmp = 0; tmp < num; ++tmp)
+                    nor_out[idx[tmp]] = n;
             }
 
             // Select largest normal coordinate to ignore for projection
@@ -396,10 +416,20 @@ bool TriangulateProcess::TriangulateMesh( aiMesh* pMesh) {
                 std::swap(ac,bc);
             }
 
-            for (tmp =0; tmp < max; ++tmp) {
+            temp_verts.resize(num);
+            for (unsigned int tmp = 0; tmp < num; ++tmp) {
                 temp_verts[tmp].x = verts[idx[tmp]][ac];
                 temp_verts[tmp].y = verts[idx[tmp]][bc];
-                done[tmp] = false;
+            }
+
+            auto indices = mapbox::earcut(temp_poly);
+            for (size_t i = 0; i < indices.size(); i += 3) {
+                aiFace& nface = *curOut++;
+                nface.mIndices = new unsigned int[3];
+                nface.mNumIndices = 3;
+                nface.mIndices[0] = indices[i];
+                nface.mIndices[1] = indices[i + 1];
+                nface.mIndices[2] = indices[i + 2];
             }
 
 #ifdef AI_BUILD_TRIANGULATE_DEBUG_POLYS
@@ -429,120 +459,6 @@ bool TriangulateProcess::TriangulateMesh( aiMesh* pMesh) {
 
             fprintf(fout,"\ntriangulation sequence: ");
 #endif
-
-            //
-            // FIXME: currently this is the slow O(kn) variant with a worst case
-            // complexity of O(n^2) (I think). Can be done in O(n).
-            while (num > 3) {
-
-                // Find the next ear of the polygon
-                int num_found = 0;
-                for (ear = next;;prev = ear,ear = next) {
-
-                    // break after we looped two times without a positive match
-                    for (next=ear+1;done[(next>=max?next=0:next)];++next);
-                    if (next < ear) {
-                        if (++num_found == 2) {
-                            break;
-                        }
-                    }
-                    const aiVector2D* pnt1 = &temp_verts[ear],
-                        *pnt0 = &temp_verts[prev],
-                        *pnt2 = &temp_verts[next];
-
-                    // Must be a convex point. Assuming ccw winding, it must be on the right of the line between p-1 and p+1.
-                    if (OnLeftSideOfLine2D(*pnt0,*pnt2,*pnt1) == 1) {
-                        continue;
-                    }
-
-                    // Skip when three point is in a line
-                    aiVector2D left = *pnt0 - *pnt1;
-                    aiVector2D right = *pnt2 - *pnt1;
-
-                    left.Normalize();
-                    right.Normalize();
-                    auto mul = left * right;
-
-                    // if the angle is 0 or 180
-                    if (std::abs(mul - 1.f) < ai_epsilon || std::abs(mul + 1.f) < ai_epsilon) {
-                        // skip this ear
-                        ASSIMP_LOG_WARN("Skip a ear, due to its angle is near 0 or 180.");
-                        continue;
-                    }
-
-                    // and no other point may be contained in this triangle
-                    for ( tmp = 0; tmp < max; ++tmp) {
-
-                        // We need to compare the actual values because it's possible that multiple indexes in
-                        // the polygon are referring to the same position. concave_polygon.obj is a sample
-                        //
-                        // FIXME: Use 'epsiloned' comparisons instead? Due to numeric inaccuracies in
-                        // PointInTriangle() I'm guessing that it's actually possible to construct
-                        // input data that would cause us to end up with no ears. The problem is,
-                        // which epsilon? If we chose a too large value, we'd get wrong results
-                        const aiVector2D& vtmp = temp_verts[tmp];
-                        if ( vtmp != *pnt1 && vtmp != *pnt2 && vtmp != *pnt0 && PointInTriangle2D(*pnt0,*pnt1,*pnt2,vtmp)) {
-                            break;
-                        }
-                    }
-                    if (tmp != max) {
-                        continue;
-                    }
-
-                    // this vertex is an ear
-                    break;
-                }
-                if (num_found == 2) {
-
-                    // Due to the 'two ear theorem', every simple polygon with more than three points must
-                    // have 2 'ears'. Here's definitely something wrong ... but we don't give up yet.
-                    //
-
-                    // Instead we're continuing with the standard tri-fanning algorithm which we'd
-                    // use if we had only convex polygons. That's life.
-                    ASSIMP_LOG_ERROR("Failed to triangulate polygon (no ear found). Probably not a simple polygon?");
-
-#ifdef AI_BUILD_TRIANGULATE_DEBUG_POLYS
-                    fprintf(fout,"critical error here, no ear found! ");
-#endif
-                    num = 0;
-                    break;
-                }
-
-                aiFace& nface = *curOut++;
-                nface.mNumIndices = 3;
-
-                if (!nface.mIndices) {
-                    nface.mIndices = new unsigned int[3];
-                }
-
-                // setup indices for the new triangle ...
-                nface.mIndices[0] = prev;
-                nface.mIndices[1] = ear;
-                nface.mIndices[2] = next;
-
-                // exclude the ear from most further processing
-                done[ear] = true;
-                --num;
-            }
-            if (num > 0) {
-                // We have three indices forming the last 'ear' remaining. Collect them.
-                aiFace& nface = *curOut++;
-                nface.mNumIndices = 3;
-                if (!nface.mIndices) {
-                    nface.mIndices = new unsigned int[3];
-                }
-
-                for (tmp = 0; done[tmp]; ++tmp);
-                nface.mIndices[0] = tmp;
-
-                for (++tmp; done[tmp]; ++tmp);
-                nface.mIndices[1] = tmp;
-
-                for (++tmp; done[tmp]; ++tmp);
-                nface.mIndices[2] = tmp;
-
-            }
         }
 
 #ifdef AI_BUILD_TRIANGULATE_DEBUG_POLYS
diff --git a/code/PostProcessing/TriangulateProcess.h b/code/PostProcessing/TriangulateProcess.h
index ac31e4377..485b59433 100644
--- a/code/PostProcessing/TriangulateProcess.h
+++ b/code/PostProcessing/TriangulateProcess.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/code/PostProcessing/ValidateDataStructure.cpp b/code/PostProcessing/ValidateDataStructure.cpp
index 14259e11a..fd977886c 100644
--- a/code/PostProcessing/ValidateDataStructure.cpp
+++ b/code/PostProcessing/ValidateDataStructure.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -134,7 +134,7 @@ inline void ValidateDSProcess::DoValidationEx(T **parray, unsigned int size,
     if (size == 0) {
         return;
     }
-        
+
     if (!parray) {
         ReportError("aiScene::%s is nullptr (aiScene::%s is %i)",
                 firstName, secondName, size);
@@ -371,20 +371,7 @@ void ValidateDSProcess::Validate(const aiMesh *pMesh) {
         ReportWarning("There are unreferenced vertices");
     }
 
-    // texture channel 2 may not be set if channel 1 is zero ...
-    {
-        unsigned int i = 0;
-        for (; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i) {
-            if (!pMesh->HasTextureCoords(i)) break;
-        }
-        for (; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i)
-            if (pMesh->HasTextureCoords(i)) {
-                ReportError("Texture coordinate channel %i exists "
-                            "although the previous channel was nullptr.",
-                        i);
-            }
-    }
-    // the same for the vertex colors
+    // vertex color channel 2 may not be set if channel 1 is zero ...
     {
         unsigned int i = 0;
         for (; i < AI_MAX_NUMBER_OF_COLOR_SETS; ++i) {
@@ -460,7 +447,7 @@ void ValidateDSProcess::Validate(const aiMesh *pMesh, const aiBone *pBone, float
         if (pBone->mWeights[i].mVertexId >= pMesh->mNumVertices) {
             ReportError("aiBone::mWeights[%i].mVertexId is out of range", i);
         } else if (!pBone->mWeights[i].mWeight || pBone->mWeights[i].mWeight > 1.0f) {
-            ReportWarning("aiBone::mWeights[%i].mWeight has an invalid value", i);
+                ReportWarning("aiBone::mWeights[%i].mWeight has an invalid value %i. Value must be greater than zero and less than 1.", i, pBone->mWeights[i].mWeight);
         }
         afSum[pBone->mWeights[i].mVertexId] += pBone->mWeights[i].mWeight;
     }
@@ -904,14 +891,17 @@ void ValidateDSProcess::Validate(const aiNode *pNode) {
                 ReportError("aiNode \"%s\" child %i \"%s\" parent is someone else: \"%s\"", pNode->mName.C_Str(), i, pChild->mName.C_Str(), parentName);
             }
         }
+    } else if (pNode->mChildren) {
+        ReportError("aiNode::mChildren is not nullptr for empty node %s (aiNode::mNumChildren is %i)",
+                nodeName, pNode->mNumChildren);
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 void ValidateDSProcess::Validate(const aiString *pString) {
-    if (pString->length > MAXLEN) {
+    if (pString->length > AI_MAXLEN) {
         ReportError("aiString::length is too large (%u, maximum is %lu)",
-                pString->length, MAXLEN);
+                pString->length, AI_MAXLEN);
     }
     const char *sz = pString->data;
     while (true) {
@@ -920,7 +910,7 @@ void ValidateDSProcess::Validate(const aiString *pString) {
                 ReportError("aiString::data is invalid: the terminal zero is at a wrong offset");
             }
             break;
-        } else if (sz >= &pString->data[MAXLEN]) {
+        } else if (sz >= &pString->data[AI_MAXLEN]) {
             ReportError("aiString::data is invalid. There is no terminal character");
         }
         ++sz;
diff --git a/code/PostProcessing/ValidateDataStructure.h b/code/PostProcessing/ValidateDataStructure.h
index 9cfd4ced1..a6f2780f1 100644
--- a/code/PostProcessing/ValidateDataStructure.h
+++ b/code/PostProcessing/ValidateDataStructure.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -63,7 +62,7 @@ struct aiString;
 struct aiCamera;
 struct aiLight;
 
-namespace Assimp    {
+namespace Assimp {
 
 // --------------------------------------------------------------------------------------
 /** Validates the whole ASSIMP scene data structure for correctness.
diff --git a/code/res/assimp.rc b/code/res/assimp.rc
index fd10935f6..6c9356276 100644
--- a/code/res/assimp.rc
+++ b/code/res/assimp.rc
@@ -1,4 +1,4 @@
-#include "revision.h"
+#include <assimp/revision.h>
 #ifdef __GNUC__
 #include "winresrc.h"
 #else
diff --git a/contrib/Open3DGC/o3dgcCommon.h b/contrib/Open3DGC/o3dgcCommon.h
index ff6bf7558..ea22c96c2 100644
--- a/contrib/Open3DGC/o3dgcCommon.h
+++ b/contrib/Open3DGC/o3dgcCommon.h
@@ -166,7 +166,6 @@ namespace o3dgc
                                     {
                                         memset(this, 0, sizeof(SC3DMCStats));
                                     };
-                                    ~SC3DMCStats(void){};
         
         double                      m_timeCoord;
         double                      m_timeNormal;
@@ -409,4 +408,3 @@ namespace o3dgc
     }
 }
 #endif // O3DGC_COMMON_H
-
diff --git a/contrib/Open3DGC/o3dgcIndexedFaceSet.h b/contrib/Open3DGC/o3dgcIndexedFaceSet.h
index adb8cb001..8070240a2 100644
--- a/contrib/Open3DGC/o3dgcIndexedFaceSet.h
+++ b/contrib/Open3DGC/o3dgcIndexedFaceSet.h
@@ -43,8 +43,6 @@ namespace o3dgc
                                              m_isTriangularMesh = true;
                                              m_creaseAngle      = 30;
                                          };
-        //! Destructor.
-                                         ~IndexedFaceSet(void) {};
         
         unsigned long                    GetNCoordIndex() const { return m_nCoordIndex     ;}
         // only coordIndex is supported
@@ -260,4 +258,3 @@ namespace o3dgc
 }
 #include "o3dgcIndexedFaceSet.inl"    // template implementation
 #endif // O3DGC_INDEXED_FACE_SET_H
-
diff --git a/contrib/Open3DGC/o3dgcSC3DMCEncodeParams.h b/contrib/Open3DGC/o3dgcSC3DMCEncodeParams.h
index 5f3db969c..d0af56c36 100644
--- a/contrib/Open3DGC/o3dgcSC3DMCEncodeParams.h
+++ b/contrib/Open3DGC/o3dgcSC3DMCEncodeParams.h
@@ -51,8 +51,6 @@ namespace o3dgc
                                             m_intAttributePredMode[a] = O3DGC_SC3DMC_NO_PREDICTION;
                                         }
                                     };
-        //! Destructor.
-                                    ~SC3DMCEncodeParams(void) {};
 
         O3DGCStreamType             GetStreamType()    const { return m_streamTypeMode;}
         O3DGCSC3DMCEncodingMode     GetEncodeMode()    const { return m_encodeMode;}
@@ -137,4 +135,3 @@ namespace o3dgc
     };
 }
 #endif // O3DGC_SC3DMC_ENCODE_PARAMS_H
-
diff --git a/contrib/Open3DGC/o3dgcTimer.h b/contrib/Open3DGC/o3dgcTimer.h
index f5ed0c83f..e7fa8766b 100644
--- a/contrib/Open3DGC/o3dgcTimer.h
+++ b/contrib/Open3DGC/o3dgcTimer.h
@@ -113,7 +113,6 @@ namespace o3dgc
         {
             memset(this, 0, sizeof(Timer));
         };
-        ~Timer(void){};
         void Tic() 
         {
             clock_gettime(CLOCK_REALTIME, &m_start);
diff --git a/contrib/clipper/clipper.cpp b/contrib/clipper/clipper.cpp
index d75974336..02e0b3f97 100644
--- a/contrib/clipper/clipper.cpp
+++ b/contrib/clipper/clipper.cpp
@@ -135,7 +135,7 @@ struct LocMinSorter
 
 inline cInt Round(double val)
 {
-  if ((val < 0)) return static_cast<cInt>(val - 0.5); 
+  if ((val < 0)) return static_cast<cInt>(val - 0.5);
   else return static_cast<cInt>(val + 0.5);
 }
 //------------------------------------------------------------------------------
@@ -153,7 +153,7 @@ void PolyTree::Clear()
 {
     for (PolyNodes::size_type i = 0; i < AllNodes.size(); ++i)
       delete AllNodes[i];
-    AllNodes.resize(0); 
+    AllNodes.resize(0);
     Childs.resize(0);
 }
 //------------------------------------------------------------------------------
@@ -200,27 +200,27 @@ void PolyNode::AddChild(PolyNode& child)
 //------------------------------------------------------------------------------
 
 PolyNode* PolyNode::GetNext() const
-{ 
-  if (!Childs.empty()) 
-      return Childs[0]; 
+{
+  if (!Childs.empty())
+      return Childs[0];
   else
-      return GetNextSiblingUp();    
-}  
+      return GetNextSiblingUp();
+}
 //------------------------------------------------------------------------------
 
 PolyNode* PolyNode::GetNextSiblingUp() const
-{ 
+{
   if (!Parent) //protects against PolyTree.GetNextSiblingUp()
       return 0;
   else if (Index == Parent->Childs.size() - 1)
       return Parent->GetNextSiblingUp();
   else
       return Parent->Childs[Index + 1];
-}  
+}
 //------------------------------------------------------------------------------
 
 bool PolyNode::IsHole() const
-{ 
+{
   bool result = true;
   PolyNode* node = Parent;
   while (node)
@@ -229,13 +229,13 @@ bool PolyNode::IsHole() const
       node = node->Parent;
   }
   return result;
-}  
+}
 //------------------------------------------------------------------------------
 
 bool PolyNode::IsOpen() const
-{ 
+{
   return m_IsOpen;
-}  
+}
 //------------------------------------------------------------------------------
 
 #ifndef use_int32
@@ -256,15 +256,22 @@ class Int128
 
     Int128(long64 _lo = 0)
     {
-      lo = (ulong64)_lo;   
-      if (_lo < 0)  hi = -1; else hi = 0; 
+      lo = (ulong64)_lo;
+      if (_lo < 0)  hi = -1; else hi = 0;
     }
 
 
     Int128(const Int128 &val): lo(val.lo), hi(val.hi){}
 
     Int128(const long64& _hi, const ulong64& _lo): lo(_lo), hi(_hi){}
-    
+
+  Int128& operator = (const Int128 &val)
+    {
+      lo = val.lo;
+      hi = val.hi;
+      return *this;
+    }
+
     Int128& operator = (const long64 &val)
     {
       lo = (ulong64)val;
@@ -449,7 +456,7 @@ int PointInPolygon(const IntPoint &pt, const Path &path)
     IntPoint ipNext = (i == cnt ? path[0] : path[i]);
     if (ipNext.Y == pt.Y)
     {
-        if ((ipNext.X == pt.X) || (ip.Y == pt.Y && 
+        if ((ipNext.X == pt.X) || (ip.Y == pt.Y &&
           ((ipNext.X > pt.X) == (ip.X < pt.X)))) return -1;
     }
     if ((ip.Y < pt.Y) != (ipNext.Y < pt.Y))
@@ -459,7 +466,7 @@ int PointInPolygon(const IntPoint &pt, const Path &path)
         if (ipNext.X > pt.X) result = 1 - result;
         else
         {
-          double d = (double)(ip.X - pt.X) * (ipNext.Y - pt.Y) - 
+          double d = (double)(ip.X - pt.X) * (ipNext.Y - pt.Y) -
             (double)(ipNext.X - pt.X) * (ip.Y - pt.Y);
           if (!d) return -1;
           if ((d > 0) == (ipNext.Y > ip.Y)) result = 1 - result;
@@ -468,7 +475,7 @@ int PointInPolygon(const IntPoint &pt, const Path &path)
       {
         if (ipNext.X > pt.X)
         {
-          double d = (double)(ip.X - pt.X) * (ipNext.Y - pt.Y) - 
+          double d = (double)(ip.X - pt.X) * (ipNext.Y - pt.Y) -
             (double)(ipNext.X - pt.X) * (ip.Y - pt.Y);
           if (!d) return -1;
           if ((d > 0) == (ipNext.Y > ip.Y)) result = 1 - result;
@@ -476,7 +483,7 @@ int PointInPolygon(const IntPoint &pt, const Path &path)
       }
     }
     ip = ipNext;
-  } 
+  }
   return result;
 }
 //------------------------------------------------------------------------------
@@ -490,7 +497,7 @@ int PointInPolygon (const IntPoint &pt, OutPt *op)
   {
     if (op->Next->Pt.Y == pt.Y)
     {
-        if ((op->Next->Pt.X == pt.X) || (op->Pt.Y == pt.Y && 
+        if ((op->Next->Pt.X == pt.X) || (op->Pt.Y == pt.Y &&
           ((op->Next->Pt.X > pt.X) == (op->Pt.X < pt.X)))) return -1;
     }
     if ((op->Pt.Y < pt.Y) != (op->Next->Pt.Y < pt.Y))
@@ -500,7 +507,7 @@ int PointInPolygon (const IntPoint &pt, OutPt *op)
         if (op->Next->Pt.X > pt.X) result = 1 - result;
         else
         {
-          double d = (double)(op->Pt.X - pt.X) * (op->Next->Pt.Y - pt.Y) - 
+          double d = (double)(op->Pt.X - pt.X) * (op->Next->Pt.Y - pt.Y) -
             (double)(op->Next->Pt.X - pt.X) * (op->Pt.Y - pt.Y);
           if (!d) return -1;
           if ((d > 0) == (op->Next->Pt.Y > op->Pt.Y)) result = 1 - result;
@@ -509,16 +516,16 @@ int PointInPolygon (const IntPoint &pt, OutPt *op)
       {
         if (op->Next->Pt.X > pt.X)
         {
-          double d = (double)(op->Pt.X - pt.X) * (op->Next->Pt.Y - pt.Y) - 
+          double d = (double)(op->Pt.X - pt.X) * (op->Next->Pt.Y - pt.Y) -
             (double)(op->Next->Pt.X - pt.X) * (op->Pt.Y - pt.Y);
           if (!d) return -1;
           if ((d > 0) == (op->Next->Pt.Y > op->Pt.Y)) result = 1 - result;
         }
       }
-    } 
+    }
     op = op->Next;
     if (startOp == op) break;
-  } 
+  }
   return result;
 }
 //------------------------------------------------------------------------------
@@ -531,10 +538,10 @@ bool Poly2ContainsPoly1(OutPt *OutPt1, OutPt *OutPt2)
     //nb: PointInPolygon returns 0 if false, +1 if true, -1 if pt on polygon
     int res = PointInPolygon(op->Pt, OutPt2);
     if (res >= 0) return res > 0;
-    op = op->Next; 
+    op = op->Next;
   }
   while (op != OutPt1);
-  return true; 
+  return true;
 }
 //----------------------------------------------------------------------
 
@@ -542,11 +549,11 @@ bool SlopesEqual(const TEdge &e1, const TEdge &e2, bool UseFullInt64Range)
 {
 #ifndef use_int32
   if (UseFullInt64Range)
-    return Int128Mul(e1.Top.Y - e1.Bot.Y, e2.Top.X - e2.Bot.X) == 
+    return Int128Mul(e1.Top.Y - e1.Bot.Y, e2.Top.X - e2.Bot.X) ==
     Int128Mul(e1.Top.X - e1.Bot.X, e2.Top.Y - e2.Bot.Y);
-  else 
+  else
 #endif
-    return (e1.Top.Y - e1.Bot.Y) * (e2.Top.X - e2.Bot.X) == 
+    return (e1.Top.Y - e1.Bot.Y) * (e2.Top.X - e2.Bot.X) ==
     (e1.Top.X - e1.Bot.X) * (e2.Top.Y - e2.Bot.Y);
 }
 //------------------------------------------------------------------------------
@@ -557,7 +564,7 @@ bool SlopesEqual(const IntPoint pt1, const IntPoint pt2,
 #ifndef use_int32
   if (UseFullInt64Range)
     return Int128Mul(pt1.Y-pt2.Y, pt2.X-pt3.X) == Int128Mul(pt1.X-pt2.X, pt2.Y-pt3.Y);
-  else 
+  else
 #endif
     return (pt1.Y-pt2.Y)*(pt2.X-pt3.X) == (pt1.X-pt2.X)*(pt2.Y-pt3.Y);
 }
@@ -569,7 +576,7 @@ bool SlopesEqual(const IntPoint pt1, const IntPoint pt2,
 #ifndef use_int32
   if (UseFullInt64Range)
     return Int128Mul(pt1.Y-pt2.Y, pt3.X-pt4.X) == Int128Mul(pt1.X-pt2.X, pt3.Y-pt4.Y);
-  else 
+  else
 #endif
     return (pt1.Y-pt2.Y)*(pt3.X-pt4.X) == (pt1.X-pt2.X)*(pt3.Y-pt4.Y);
 }
@@ -621,7 +628,7 @@ inline cInt TopX(TEdge &edge, const cInt currentY)
 
 void IntersectPoint(TEdge &Edge1, TEdge &Edge2, IntPoint &ip)
 {
-#ifdef use_xyz  
+#ifdef use_xyz
   ip.Z = 0;
 #endif
 
@@ -653,8 +660,8 @@ void IntersectPoint(TEdge &Edge1, TEdge &Edge2, IntPoint &ip)
       b1 = Edge1.Bot.Y - (Edge1.Bot.X / Edge1.Dx);
       ip.Y = Round(ip.X / Edge1.Dx + b1);
     }
-  } 
-  else 
+  }
+  else
   {
     b1 = Edge1.Bot.X - Edge1.Bot.Y * Edge1.Dx;
     b2 = Edge2.Bot.X - Edge2.Bot.Y * Edge2.Dx;
@@ -662,11 +669,11 @@ void IntersectPoint(TEdge &Edge1, TEdge &Edge2, IntPoint &ip)
     ip.Y = Round(q);
     if (std::fabs(Edge1.Dx) < std::fabs(Edge2.Dx))
       ip.X = Round(Edge1.Dx * q + b1);
-    else 
+    else
       ip.X = Round(Edge2.Dx * q + b2);
   }
 
-  if (ip.Y < Edge1.Top.Y || ip.Y < Edge2.Top.Y) 
+  if (ip.Y < Edge1.Top.Y || ip.Y < Edge2.Top.Y)
   {
     if (Edge1.Top.Y > Edge2.Top.Y)
       ip.Y = Edge1.Top.Y;
@@ -676,7 +683,7 @@ void IntersectPoint(TEdge &Edge1, TEdge &Edge2, IntPoint &ip)
       ip.X = TopX(Edge1, ip.Y);
     else
       ip.X = TopX(Edge2, ip.Y);
-  } 
+  }
   //finally, don't allow 'ip' to be BELOW curr.Y (ie bottom of scanbeam) ...
   if (ip.Y > Edge1.Curr.Y)
   {
@@ -760,7 +767,7 @@ inline void ReverseHorizontal(TEdge &e)
   //progression of the bounds - ie so their xbots will align with the
   //adjoining lower edge. [Helpful in the ProcessHorizontal() method.]
   std::swap(e.Top.X, e.Bot.X);
-#ifdef use_xyz  
+#ifdef use_xyz
   std::swap(e.Top.Z, e.Bot.Z);
 #endif
 }
@@ -898,10 +905,10 @@ void RangeTest(const IntPoint& Pt, bool& useFullRange)
 {
   if (useFullRange)
   {
-    if (Pt.X > hiRange || Pt.Y > hiRange || -Pt.X > hiRange || -Pt.Y > hiRange) 
+    if (Pt.X > hiRange || Pt.Y > hiRange || -Pt.X > hiRange || -Pt.Y > hiRange)
       throw clipperException("Coordinate outside allowed range");
   }
-  else if (Pt.X > loRange|| Pt.Y > loRange || -Pt.X > loRange || -Pt.Y > loRange) 
+  else if (Pt.X > loRange|| Pt.Y > loRange || -Pt.X > loRange || -Pt.Y > loRange)
   {
     useFullRange = true;
     RangeTest(Pt, useFullRange);
@@ -978,9 +985,9 @@ TEdge* ClipperBase::ProcessBound(TEdge* E, bool NextIsForward)
     //We need to be careful with open paths because this may not be a
     //true local minima (ie E may be following a skip edge).
     //Also, consecutive horz. edges may start heading left before going right.
-    if (NextIsForward) 
+    if (NextIsForward)
       EStart = E->Prev;
-    else 
+    else
       EStart = E->Next;
     if (IsHorizontal(*EStart)) //ie an adjoining horizontal skip edge
       {
@@ -990,7 +997,7 @@ TEdge* ClipperBase::ProcessBound(TEdge* E, bool NextIsForward)
       else if (EStart->Bot.X != E->Bot.X)
         ReverseHorizontal(*E);
   }
-  
+
   EStart = E;
   if (NextIsForward)
   {
@@ -1005,19 +1012,19 @@ TEdge* ClipperBase::ProcessBound(TEdge* E, bool NextIsForward)
       while (IsHorizontal(*Horz->Prev)) Horz = Horz->Prev;
       if (Horz->Prev->Top.X > Result->Next->Top.X) Result = Horz->Prev;
     }
-    while (E != Result) 
+    while (E != Result)
     {
       E->NextInLML = E->Next;
       if (IsHorizontal(*E) && E != EStart &&
         E->Bot.X != E->Prev->Top.X) ReverseHorizontal(*E);
       E = E->Next;
     }
-    if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Prev->Top.X) 
+    if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Prev->Top.X)
       ReverseHorizontal(*E);
     Result = Result->Next; //move to the edge just beyond current bound
   } else
   {
-    while (Result->Top.Y == Result->Prev->Bot.Y && Result->Prev->OutIdx != Skip) 
+    while (Result->Top.Y == Result->Prev->Bot.Y && Result->Prev->OutIdx != Skip)
       Result = Result->Prev;
     if (IsHorizontal(*Result) && Result->Prev->OutIdx != Skip)
     {
@@ -1030,11 +1037,11 @@ TEdge* ClipperBase::ProcessBound(TEdge* E, bool NextIsForward)
     while (E != Result)
     {
       E->NextInLML = E->Prev;
-      if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Next->Top.X) 
+      if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Next->Top.X)
         ReverseHorizontal(*E);
       E = E->Prev;
     }
-    if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Next->Top.X) 
+    if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Next->Top.X)
       ReverseHorizontal(*E);
     Result = Result->Prev; //move to the edge just beyond current bound
   }
@@ -1096,10 +1103,10 @@ bool ClipperBase::AddPath(const Path &pg, PolyType PolyTyp, bool Closed)
       eLoopStop = E;
       continue;
     }
-    if (E->Prev == E->Next) 
+    if (E->Prev == E->Next)
       break; //only two vertices
     else if (Closed &&
-      SlopesEqual(E->Prev->Curr, E->Curr, E->Next->Curr, m_UseFullRange) && 
+      SlopesEqual(E->Prev->Curr, E->Curr, E->Next->Curr, m_UseFullRange) &&
       (!m_PreserveCollinear ||
       !Pt2IsBetweenPt1AndPt3(E->Prev->Curr, E->Curr, E->Next->Curr)))
     {
@@ -1124,7 +1131,7 @@ bool ClipperBase::AddPath(const Path &pg, PolyType PolyTyp, bool Closed)
   }
 
   if (!Closed)
-  { 
+  {
     m_HasOpenPaths = true;
     eStart->Prev->OutIdx = Skip;
   }
@@ -1143,9 +1150,9 @@ bool ClipperBase::AddPath(const Path &pg, PolyType PolyTyp, bool Closed)
 
   //Totally flat paths must be handled differently when adding them
   //to LocalMinima list to avoid endless loops etc ...
-  if (IsFlat) 
+  if (IsFlat)
   {
-    if (Closed) 
+    if (Closed)
     {
       delete [] edges;
       return false;
@@ -1187,7 +1194,7 @@ bool ClipperBase::AddPath(const Path &pg, PolyType PolyTyp, bool Closed)
     //Compare their slopes to find which starts which bound ...
     MinimaList::value_type locMin;
     locMin.Y = E->Bot.Y;
-    if (E->Dx < E->Prev->Dx) 
+    if (E->Dx < E->Prev->Dx)
     {
       locMin.LeftBound = E->Prev;
       locMin.RightBound = E;
@@ -1442,7 +1449,7 @@ void ClipperBase::SwapPositionsInAEL(TEdge *Edge1, TEdge *Edge2)
 
 void ClipperBase::UpdateEdgeIntoAEL(TEdge *&e)
 {
-  if (!e->NextInLML) 
+  if (!e->NextInLML)
     throw clipperException("UpdateEdgeIntoAEL: invalid call");
 
   e->NextInLML->OutIdx = e->OutIdx;
@@ -1480,15 +1487,15 @@ Clipper::Clipper(int initOptions) : ClipperBase() //constructor
   m_StrictSimple = ((initOptions & ioStrictlySimple) != 0);
   m_PreserveCollinear = ((initOptions & ioPreserveCollinear) != 0);
   m_HasOpenPaths = false;
-#ifdef use_xyz  
+#ifdef use_xyz
   m_ZFill = 0;
 #endif
 }
 //------------------------------------------------------------------------------
 
-#ifdef use_xyz  
+#ifdef use_xyz
 void Clipper::ZFillFunction(ZFillCallback zFillFunc)
-{  
+{
   m_ZFill = zFillFunc;
 }
 //------------------------------------------------------------------------------
@@ -1547,7 +1554,7 @@ void Clipper::FixHoleLinkage(OutRec &outrec)
 {
   //skip OutRecs that (a) contain outermost polygons or
   //(b) already have the correct owner/child linkage ...
-  if (!outrec.FirstLeft ||                
+  if (!outrec.FirstLeft ||
       (outrec.IsHole != outrec.FirstLeft->IsHole &&
       outrec.FirstLeft->Pts)) return;
 
@@ -1567,7 +1574,7 @@ bool Clipper::ExecuteInternal()
     m_SortedEdges = 0;
 
     succeeded = true;
-    cInt botY, topY;
+    cInt botY = 0, topY = 0;
     if (!PopScanbeam(botY)) return false;
     InsertLocalMinimaIntoAEL(botY);
     while (PopScanbeam(topY) || LocalMinimaPending())
@@ -1584,7 +1591,7 @@ bool Clipper::ExecuteInternal()
       InsertLocalMinimaIntoAEL(botY);
     }
   }
-  catch(...) 
+  catch(...)
   {
     succeeded = false;
   }
@@ -1638,7 +1645,7 @@ void Clipper::SetWindingCount(TEdge &edge)
       edge.WindCnt = edge.WindDelta;
     edge.WindCnt2 = 0;
     e = m_ActiveEdges; //ie get ready to calc WindCnt2
-  }   
+  }
   else if (edge.WindDelta == 0 && m_ClipType != ctUnion)
   {
     edge.WindCnt = 1;
@@ -1655,7 +1662,7 @@ void Clipper::SetWindingCount(TEdge &edge)
       TEdge *e2 = e->PrevInAEL;
       while (e2)
       {
-        if (e2->PolyTyp == e->PolyTyp && e2->WindDelta != 0) 
+        if (e2->PolyTyp == e->PolyTyp && e2->WindDelta != 0)
           Inside = !Inside;
         e2 = e2->PrevInAEL;
       }
@@ -1667,7 +1674,7 @@ void Clipper::SetWindingCount(TEdge &edge)
     }
     edge.WindCnt2 = e->WindCnt2;
     e = e->NextInAEL; //ie get ready to calc WindCnt2
-  } 
+  }
   else
   {
     //nonZero, Positive or Negative filling ...
@@ -1678,11 +1685,11 @@ void Clipper::SetWindingCount(TEdge &edge)
       if (Abs(e->WindCnt) > 1)
       {
         //outside prev poly but still inside another.
-        //when reversing direction of prev poly use the same WC 
+        //when reversing direction of prev poly use the same WC
         if (e->WindDelta * edge.WindDelta < 0) edge.WindCnt = e->WindCnt;
         //otherwise continue to 'decrease' WC ...
         else edge.WindCnt = e->WindCnt + edge.WindDelta;
-      } 
+      }
       else
         //now outside all polys of same polytype so set own WC ...
         edge.WindCnt = (edge.WindDelta == 0 ? 1 : edge.WindDelta);
@@ -1690,7 +1697,7 @@ void Clipper::SetWindingCount(TEdge &edge)
     {
       //prev edge is 'increasing' WindCount (WC) away from zero
       //so we're inside the previous polygon ...
-      if (edge.WindDelta == 0) 
+      if (edge.WindDelta == 0)
         edge.WindCnt = (e->WindCnt < 0 ? e->WindCnt - 1 : e->WindCnt + 1);
       //if wind direction is reversing prev then use same WC
       else if (e->WindDelta * edge.WindDelta < 0) edge.WindCnt = e->WindCnt;
@@ -1754,14 +1761,14 @@ bool Clipper::IsContributing(const TEdge& edge) const
 
   switch(pft)
   {
-    case pftEvenOdd: 
+    case pftEvenOdd:
       //return false if a subj line has been flagged as inside a subj polygon
       if (edge.WindDelta == 0 && edge.WindCnt != 1) return false;
       break;
     case pftNonZero:
       if (Abs(edge.WindCnt) != 1) return false;
       break;
-    case pftPositive: 
+    case pftPositive:
       if (edge.WindCnt != 1) return false;
       break;
     default: //pftNegative
@@ -1773,24 +1780,24 @@ bool Clipper::IsContributing(const TEdge& edge) const
     case ctIntersection:
       switch(pft2)
       {
-        case pftEvenOdd: 
-        case pftNonZero: 
+        case pftEvenOdd:
+        case pftNonZero:
           return (edge.WindCnt2 != 0);
-        case pftPositive: 
+        case pftPositive:
           return (edge.WindCnt2 > 0);
-        default: 
+        default:
           return (edge.WindCnt2 < 0);
       }
       break;
     case ctUnion:
       switch(pft2)
       {
-        case pftEvenOdd: 
-        case pftNonZero: 
+        case pftEvenOdd:
+        case pftNonZero:
           return (edge.WindCnt2 == 0);
-        case pftPositive: 
+        case pftPositive:
           return (edge.WindCnt2 <= 0);
-        default: 
+        default:
           return (edge.WindCnt2 >= 0);
       }
       break;
@@ -1798,23 +1805,23 @@ bool Clipper::IsContributing(const TEdge& edge) const
       if (edge.PolyTyp == ptSubject)
         switch(pft2)
         {
-          case pftEvenOdd: 
-          case pftNonZero: 
+          case pftEvenOdd:
+          case pftNonZero:
             return (edge.WindCnt2 == 0);
-          case pftPositive: 
+          case pftPositive:
             return (edge.WindCnt2 <= 0);
-          default: 
+          default:
             return (edge.WindCnt2 >= 0);
         }
       else
         switch(pft2)
         {
-          case pftEvenOdd: 
-          case pftNonZero: 
+          case pftEvenOdd:
+          case pftNonZero:
             return (edge.WindCnt2 != 0);
-          case pftPositive: 
+          case pftPositive:
             return (edge.WindCnt2 > 0);
-          default: 
+          default:
             return (edge.WindCnt2 < 0);
         }
       break;
@@ -1822,15 +1829,15 @@ bool Clipper::IsContributing(const TEdge& edge) const
       if (edge.WindDelta == 0) //XOr always contributing unless open
         switch(pft2)
         {
-          case pftEvenOdd: 
-          case pftNonZero: 
+          case pftEvenOdd:
+          case pftNonZero:
             return (edge.WindCnt2 == 0);
-          case pftPositive: 
+          case pftPositive:
             return (edge.WindCnt2 <= 0);
-          default: 
+          default:
             return (edge.WindCnt2 >= 0);
         }
-      else 
+      else
         return true;
       break;
     default:
@@ -1851,7 +1858,7 @@ OutPt* Clipper::AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &Pt)
     e2->Side = esRight;
     e = e1;
     if (e->PrevInAEL == e2)
-      prevE = e2->PrevInAEL; 
+      prevE = e2->PrevInAEL;
     else
       prevE = e->PrevInAEL;
   } else
@@ -1867,7 +1874,7 @@ OutPt* Clipper::AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &Pt)
         prevE = e->PrevInAEL;
   }
 
-  if (prevE && prevE->OutIdx >= 0 && prevE->Top.Y < Pt.Y && e->Top.Y < Pt.Y) 
+  if (prevE && prevE->OutIdx >= 0 && prevE->Top.Y < Pt.Y && e->Top.Y < Pt.Y)
   {
     cInt xPrev = TopX(*prevE, Pt.Y);
     cInt xE = TopX(*e, Pt.Y);
@@ -1891,9 +1898,9 @@ void Clipper::AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &Pt)
     e1->OutIdx = Unassigned;
     e2->OutIdx = Unassigned;
   }
-  else if (e1->OutIdx < e2->OutIdx) 
-    AppendPolygon(e1, e2); 
-  else 
+  else if (e1->OutIdx < e2->OutIdx)
+    AppendPolygon(e1, e2);
+  else
     AppendPolygon(e2, e1);
 }
 //------------------------------------------------------------------------------
@@ -1983,7 +1990,7 @@ void Clipper::InsertLocalMinimaIntoAEL(const cInt botY)
   {
     TEdge* lb = lm->LeftBound;
     TEdge* rb = lm->RightBound;
-    
+
     OutPt *Op1 = 0;
     if (!lb)
     {
@@ -1991,8 +1998,8 @@ void Clipper::InsertLocalMinimaIntoAEL(const cInt botY)
       InsertEdgeIntoAEL(rb, 0);
       SetWindingCount(*rb);
       if (IsContributing(*rb))
-        Op1 = AddOutPt(rb, rb->Bot); 
-    } 
+        Op1 = AddOutPt(rb, rb->Bot);
+    }
     else if (!rb)
     {
       InsertEdgeIntoAEL(lb, 0);
@@ -2009,7 +2016,7 @@ void Clipper::InsertLocalMinimaIntoAEL(const cInt botY)
       rb->WindCnt = lb->WindCnt;
       rb->WindCnt2 = lb->WindCnt2;
       if (IsContributing(*lb))
-        Op1 = AddLocalMinPoly(lb, rb, lb->Bot);      
+        Op1 = AddLocalMinPoly(lb, rb, lb->Bot);
       InsertScanbeam(lb->Top.Y);
     }
 
@@ -2018,7 +2025,7 @@ void Clipper::InsertLocalMinimaIntoAEL(const cInt botY)
 		 if (IsHorizontal(*rb))
 		 {
 			 AddEdgeToSEL(rb);
-			 if (rb->NextInLML) 
+			 if (rb->NextInLML)
 				 InsertScanbeam(rb->NextInLML->Top.Y);
 		 }
 		 else InsertScanbeam( rb->Top.Y );
@@ -2027,7 +2034,7 @@ void Clipper::InsertLocalMinimaIntoAEL(const cInt botY)
     if (!lb || !rb) continue;
 
     //if any output polygons share an edge, they'll need joining later ...
-    if (Op1 && IsHorizontal(*rb) && 
+    if (Op1 && IsHorizontal(*rb) &&
       m_GhostJoins.size() > 0 && (rb->WindDelta != 0))
     {
       for (JoinList::size_type i = 0; i < m_GhostJoins.size(); ++i)
@@ -2040,7 +2047,7 @@ void Clipper::InsertLocalMinimaIntoAEL(const cInt botY)
       }
     }
 
-    if (lb->OutIdx >= 0 && lb->PrevInAEL && 
+    if (lb->OutIdx >= 0 && lb->PrevInAEL &&
       lb->PrevInAEL->Curr.X == lb->Bot.X &&
       lb->PrevInAEL->OutIdx >= 0 &&
       SlopesEqual(lb->PrevInAEL->Bot, lb->PrevInAEL->Top, lb->Curr, lb->Top, m_UseFullRange) &&
@@ -2073,7 +2080,7 @@ void Clipper::InsertLocalMinimaIntoAEL(const cInt botY)
         }
       }
     }
-    
+
   }
 }
 //------------------------------------------------------------------------------
@@ -2099,7 +2106,7 @@ void Clipper::SetZ(IntPoint& pt, TEdge& e1, TEdge& e2)
   else if (pt == e1.Top) pt.Z = e1.Top.Z;
   else if (pt == e2.Bot) pt.Z = e2.Bot.Z;
   else if (pt == e2.Top) pt.Z = e2.Top.Z;
-  else (*m_ZFill)(e1.Bot, e1.Top, e2.Bot, e2.Top, pt); 
+  else (*m_ZFill)(e1.Bot, e1.Top, e2.Bot, e2.Top, pt);
 }
 //------------------------------------------------------------------------------
 #endif
@@ -2122,7 +2129,7 @@ void Clipper::IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &Pt)
 	if (e1->WindDelta == 0 && e2->WindDelta == 0) return;
 
     //if intersecting a subj line with a subj poly ...
-    else if (e1->PolyTyp == e2->PolyTyp && 
+    else if (e1->PolyTyp == e2->PolyTyp &&
       e1->WindDelta != e2->WindDelta && m_ClipType == ctUnion)
     {
       if (e1->WindDelta == 0)
@@ -2145,13 +2152,13 @@ void Clipper::IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &Pt)
     else if (e1->PolyTyp != e2->PolyTyp)
     {
       //toggle subj open path OutIdx on/off when Abs(clip.WndCnt) == 1 ...
-      if ((e1->WindDelta == 0) && abs(e2->WindCnt) == 1 && 
+      if ((e1->WindDelta == 0) && abs(e2->WindCnt) == 1 &&
         (m_ClipType != ctUnion || e2->WindCnt2 == 0))
       {
         AddOutPt(e1, Pt);
         if (e1Contributing) e1->OutIdx = Unassigned;
       }
-      else if ((e2->WindDelta == 0) && (abs(e1->WindCnt) == 1) && 
+      else if ((e2->WindDelta == 0) && (abs(e1->WindCnt) == 1) &&
         (m_ClipType != ctUnion || e1->WindCnt2 == 0))
       {
         AddOutPt(e2, Pt);
@@ -2225,7 +2232,7 @@ void Clipper::IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &Pt)
     if ((e1Wc != 0 && e1Wc != 1) || (e2Wc != 0 && e2Wc != 1) ||
       (e1->PolyTyp != e2->PolyTyp && m_ClipType != ctXor) )
     {
-      AddLocalMaxPoly(e1, e2, Pt); 
+      AddLocalMaxPoly(e1, e2, Pt);
     }
     else
     {
@@ -2237,7 +2244,7 @@ void Clipper::IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &Pt)
   }
   else if ( e1Contributing )
   {
-    if (e2Wc == 0 || e2Wc == 1) 
+    if (e2Wc == 0 || e2Wc == 1)
     {
       AddOutPt(e1, Pt);
       SwapSides(*e1, *e2);
@@ -2246,13 +2253,13 @@ void Clipper::IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &Pt)
   }
   else if ( e2Contributing )
   {
-    if (e1Wc == 0 || e1Wc == 1) 
+    if (e1Wc == 0 || e1Wc == 1)
     {
       AddOutPt(e2, Pt);
       SwapSides(*e1, *e2);
       SwapPolyIndexes(*e1, *e2);
     }
-  } 
+  }
   else if ( (e1Wc == 0 || e1Wc == 1) && (e2Wc == 0 || e2Wc == 1))
   {
     //neither edge is currently contributing ...
@@ -2308,7 +2315,7 @@ void Clipper::SetHoleState(TEdge *e, OutRec *outrec)
     if (e2->OutIdx >= 0 && e2->WindDelta != 0)
     {
       if (!eTmp) eTmp = e2;
-      else if (eTmp->OutIdx == e2->OutIdx) eTmp = 0;        
+      else if (eTmp->OutIdx == e2->OutIdx) eTmp = 0;
     }
     e2 = e2->PrevInAEL;
   }
@@ -2328,9 +2335,9 @@ void Clipper::SetHoleState(TEdge *e, OutRec *outrec)
 OutRec* GetLowermostRec(OutRec *outRec1, OutRec *outRec2)
 {
   //work out which polygon fragment has the correct hole state ...
-  if (!outRec1->BottomPt) 
+  if (!outRec1->BottomPt)
     outRec1->BottomPt = GetBottomPt(outRec1->Pts);
-  if (!outRec2->BottomPt) 
+  if (!outRec2->BottomPt)
     outRec2->BottomPt = GetBottomPt(outRec2->Pts);
   OutPt *OutPt1 = outRec1->BottomPt;
   OutPt *OutPt2 = outRec2->BottomPt;
@@ -2376,7 +2383,7 @@ void Clipper::AppendPolygon(TEdge *e1, TEdge *e2)
     holeStateRec = outRec2;
   else if (OutRec1RightOfOutRec2(outRec2, outRec1))
     holeStateRec = outRec1;
-  else 
+  else
     holeStateRec = GetLowermostRec(outRec1, outRec2);
 
   //get the start and ends of both output polygons and
@@ -2643,7 +2650,7 @@ void Clipper::ProcessHorizontal(TEdge *horzEdge)
   GetHorzDirection(*horzEdge, dir, horzLeft, horzRight);
 
   TEdge* eLastHorz = horzEdge, *eMaxPair = 0;
-  while (eLastHorz->NextInLML && IsHorizontal(*eLastHorz->NextInLML)) 
+  while (eLastHorz->NextInLML && IsHorizontal(*eLastHorz->NextInLML))
     eLastHorz = eLastHorz->NextInLML;
   if (!eLastHorz->NextInLML)
     eMaxPair = GetMaximaPair(eLastHorz);
@@ -2673,7 +2680,7 @@ void Clipper::ProcessHorizontal(TEdge *horzEdge)
 
   for (;;) //loop through consec. horizontal edges
   {
-		  
+
     bool IsLastHorz = (horzEdge == eLastHorz);
     TEdge* e = GetNextInAEL(horzEdge, dir);
     while(e)
@@ -2686,7 +2693,7 @@ void Clipper::ProcessHorizontal(TEdge *horzEdge)
         {
             if (dir == dLeftToRight)
             {
-                while (maxIt != m_Maxima.end() && *maxIt < e->Curr.X) 
+                while (maxIt != m_Maxima.end() && *maxIt < e->Curr.X)
                 {
                   if (horzEdge->OutIdx >= 0 && !IsOpen)
                     AddOutPt(horzEdge, IntPoint(*maxIt, horzEdge->Bot.Y));
@@ -2709,7 +2716,7 @@ void Clipper::ProcessHorizontal(TEdge *horzEdge)
 
 		//Also break if we've got to the end of an intermediate horizontal edge ...
 		//nb: Smaller Dx's are to the right of larger Dx's ABOVE the horizontal.
-		if (e->Curr.X == horzEdge->Top.X && horzEdge->NextInLML && 
+		if (e->Curr.X == horzEdge->Top.X && horzEdge->NextInLML &&
 			e->Dx < horzEdge->NextInLML->Dx) break;
 
     if (horzEdge->OutIdx >= 0 && !IsOpen)  //note: may be done multiple times
@@ -2717,7 +2724,7 @@ void Clipper::ProcessHorizontal(TEdge *horzEdge)
 #ifdef use_xyz
 			if (dir == dLeftToRight) SetZ(e->Curr, *horzEdge, *e);
 			else SetZ(e->Curr, *e, *horzEdge);
-#endif      
+#endif
 			op1 = AddOutPt(horzEdge, e->Curr);
 			TEdge* eNextHorz = m_SortedEdges;
 			while (eNextHorz)
@@ -2733,7 +2740,7 @@ void Clipper::ProcessHorizontal(TEdge *horzEdge)
 			}
 			AddGhostJoin(op1, horzEdge->Bot);
 		}
-		
+
 		//OK, so far we're still in range of the horizontal Edge  but make sure
         //we're at the last of consec. horizontals when matching with eMaxPair
         if(e == eMaxPair && IsLastHorz)
@@ -2744,7 +2751,7 @@ void Clipper::ProcessHorizontal(TEdge *horzEdge)
           DeleteFromAEL(eMaxPair);
           return;
         }
-        
+
 		if(dir == dLeftToRight)
         {
           IntPoint Pt = IntPoint(e->Curr.X, horzEdge->Curr.Y);
@@ -2815,7 +2822,7 @@ void Clipper::ProcessHorizontal(TEdge *horzEdge)
       }
     }
     else
-      UpdateEdgeIntoAEL(horzEdge); 
+      UpdateEdgeIntoAEL(horzEdge);
   }
   else
   {
@@ -2835,7 +2842,7 @@ bool Clipper::ProcessIntersections(const cInt topY)
     if (IlSize == 1 || FixupIntersectionOrder()) ProcessIntersectList();
     else return false;
   }
-  catch(...) 
+  catch(...)
   {
     m_SortedEdges = 0;
     DisposeIntersectNodes();
@@ -2940,7 +2947,7 @@ bool Clipper::FixupIntersectionOrder()
   CopyAELToSEL();
   std::sort(m_IntersectList.begin(), m_IntersectList.end(), IntersectListSort);
   size_t cnt = m_IntersectList.size();
-  for (size_t i = 0; i < cnt; ++i) 
+  for (size_t i = 0; i < cnt; ++i)
   {
     if (!EdgesAdjacent(*m_IntersectList[i]))
     {
@@ -2988,7 +2995,7 @@ void Clipper::DoMaxima(TEdge *e)
 #ifdef use_lines
   else if (e->WindDelta == 0)
   {
-    if (e->OutIdx >= 0) 
+    if (e->OutIdx >= 0)
     {
       AddOutPt(e, e->Top);
       e->OutIdx = Unassigned;
@@ -3001,7 +3008,7 @@ void Clipper::DoMaxima(TEdge *e)
       eMaxPair->OutIdx = Unassigned;
     }
     DeleteFromAEL(eMaxPair);
-  } 
+  }
 #endif
   else throw clipperException("DoMaxima error");
 }
@@ -3039,7 +3046,7 @@ void Clipper::ProcessEdgesAtTopOfScanbeam(const cInt topY)
         if (e->OutIdx >= 0)
           AddOutPt(e, e->Bot);
         AddEdgeToSEL(e);
-      } 
+      }
       else
       {
         e->Curr.X = TopX( *e, topY );
@@ -3052,7 +3059,7 @@ void Clipper::ProcessEdgesAtTopOfScanbeam(const cInt topY)
       //When StrictlySimple and 'e' is being touched by another edge, then
       //make sure both edges have a vertex here ...
       if (m_StrictSimple)
-      {  
+      {
         TEdge* ePrev = e->PrevInAEL;
         if ((e->OutIdx >= 0) && (e->WindDelta != 0) && ePrev && (ePrev->OutIdx >= 0) &&
           (ePrev->Curr.X == e->Curr.X) && (ePrev->WindDelta != 0))
@@ -3083,7 +3090,7 @@ void Clipper::ProcessEdgesAtTopOfScanbeam(const cInt topY)
     if(IsIntermediate(e, topY))
     {
       OutPt* op = 0;
-      if( e->OutIdx >= 0 ) 
+      if( e->OutIdx >= 0 )
         op = AddOutPt(e, e->Top);
       UpdateEdgeIntoAEL(e);
 
@@ -3250,12 +3257,12 @@ void Clipper::BuildResult2(PolyTree& polytree)
     {
         OutRec* outRec = m_PolyOuts[i];
         if (!outRec->PolyNd) continue;
-        if (outRec->IsOpen) 
+        if (outRec->IsOpen)
         {
           outRec->PolyNd->m_IsOpen = true;
           polytree.AddChild(*outRec->PolyNd);
         }
-        else if (outRec->FirstLeft && outRec->FirstLeft->PolyNd) 
+        else if (outRec->FirstLeft && outRec->FirstLeft->PolyNd)
           outRec->FirstLeft->PolyNd->AddChild(*outRec->PolyNd);
         else
           polytree.AddChild(*outRec->PolyNd);
@@ -3278,24 +3285,24 @@ void SwapIntersectNodes(IntersectNode &int1, IntersectNode &int2)
 
 inline bool E2InsertsBeforeE1(TEdge &e1, TEdge &e2)
 {
-  if (e2.Curr.X == e1.Curr.X) 
+  if (e2.Curr.X == e1.Curr.X)
   {
     if (e2.Top.Y > e1.Top.Y)
-      return e2.Top.X < TopX(e1, e2.Top.Y); 
+      return e2.Top.X < TopX(e1, e2.Top.Y);
       else return e1.Top.X > TopX(e2, e1.Top.Y);
-  } 
+  }
   else return e2.Curr.X < e1.Curr.X;
 }
 //------------------------------------------------------------------------------
 
-bool GetOverlap(const cInt a1, const cInt a2, const cInt b1, const cInt b2, 
+bool GetOverlap(const cInt a1, const cInt a2, const cInt b1, const cInt b2,
     cInt& Left, cInt& Right)
 {
   if (a1 < a2)
   {
     if (b1 < b2) {Left = std::max(a1,b1); Right = std::min(a2,b2);}
     else {Left = std::max(a1,b2); Right = std::min(a2,b1);}
-  } 
+  }
   else
   {
     if (b1 < b2) {Left = std::max(a2,b1); Right = std::min(a1,b2);}
@@ -3306,7 +3313,7 @@ bool GetOverlap(const cInt a1, const cInt a2, const cInt b1, const cInt b2,
 //------------------------------------------------------------------------------
 
 inline void UpdateOutPtIdxs(OutRec& outrec)
-{  
+{
   OutPt* op = outrec.Pts;
   do
   {
@@ -3331,11 +3338,11 @@ void Clipper::InsertEdgeIntoAEL(TEdge *edge, TEdge* startEdge)
       edge->NextInAEL = m_ActiveEdges;
       m_ActiveEdges->PrevInAEL = edge;
       m_ActiveEdges = edge;
-  } 
+  }
   else
   {
     if(!startEdge) startEdge = m_ActiveEdges;
-    while(startEdge->NextInAEL  && 
+    while(startEdge->NextInAEL  &&
       !E2InsertsBeforeE1(*startEdge->NextInAEL , *edge))
         startEdge = startEdge->NextInAEL;
     edge->NextInAEL = startEdge->NextInAEL;
@@ -3357,7 +3364,7 @@ OutPt* DupOutPt(OutPt* outPt, bool InsertAfter)
     result->Prev = outPt;
     outPt->Next->Prev = result;
     outPt->Next = result;
-  } 
+  }
   else
   {
     result->Prev = outPt->Prev;
@@ -3381,24 +3388,24 @@ bool JoinHorz(OutPt* op1, OutPt* op1b, OutPt* op2, OutPt* op2b,
   //So, to facilitate this while inserting Op1b and Op2b ...
   //when DiscardLeft, make sure we're AT or RIGHT of Pt before adding Op1b,
   //otherwise make sure we're AT or LEFT of Pt. (Likewise with Op2b.)
-  if (Dir1 == dLeftToRight) 
+  if (Dir1 == dLeftToRight)
   {
-    while (op1->Next->Pt.X <= Pt.X && 
-      op1->Next->Pt.X >= op1->Pt.X && op1->Next->Pt.Y == Pt.Y)  
+    while (op1->Next->Pt.X <= Pt.X &&
+      op1->Next->Pt.X >= op1->Pt.X && op1->Next->Pt.Y == Pt.Y)
         op1 = op1->Next;
     if (DiscardLeft && (op1->Pt.X != Pt.X)) op1 = op1->Next;
     op1b = DupOutPt(op1, !DiscardLeft);
-    if (op1b->Pt != Pt) 
+    if (op1b->Pt != Pt)
     {
       op1 = op1b;
       op1->Pt = Pt;
       op1b = DupOutPt(op1, !DiscardLeft);
     }
-  } 
+  }
   else
   {
-    while (op1->Next->Pt.X >= Pt.X && 
-      op1->Next->Pt.X <= op1->Pt.X && op1->Next->Pt.Y == Pt.Y) 
+    while (op1->Next->Pt.X >= Pt.X &&
+      op1->Next->Pt.X <= op1->Pt.X && op1->Next->Pt.Y == Pt.Y)
         op1 = op1->Next;
     if (!DiscardLeft && (op1->Pt.X != Pt.X)) op1 = op1->Next;
     op1b = DupOutPt(op1, DiscardLeft);
@@ -3412,7 +3419,7 @@ bool JoinHorz(OutPt* op1, OutPt* op1b, OutPt* op2, OutPt* op2b,
 
   if (Dir2 == dLeftToRight)
   {
-    while (op2->Next->Pt.X <= Pt.X && 
+    while (op2->Next->Pt.X <= Pt.X &&
       op2->Next->Pt.X >= op2->Pt.X && op2->Next->Pt.Y == Pt.Y)
         op2 = op2->Next;
     if (DiscardLeft && (op2->Pt.X != Pt.X)) op2 = op2->Next;
@@ -3425,8 +3432,8 @@ bool JoinHorz(OutPt* op1, OutPt* op1b, OutPt* op2, OutPt* op2b,
     };
   } else
   {
-    while (op2->Next->Pt.X >= Pt.X && 
-      op2->Next->Pt.X <= op2->Pt.X && op2->Next->Pt.Y == Pt.Y) 
+    while (op2->Next->Pt.X >= Pt.X &&
+      op2->Next->Pt.X <= op2->Pt.X && op2->Next->Pt.Y == Pt.Y)
         op2 = op2->Next;
     if (!DiscardLeft && (op2->Pt.X != Pt.X)) op2 = op2->Next;
     op2b = DupOutPt(op2, DiscardLeft);
@@ -3476,11 +3483,11 @@ bool Clipper::JoinPoints(Join *j, OutRec* outRec1, OutRec* outRec2)
     //Strictly Simple join ...
     if (outRec1 != outRec2) return false;
     op1b = j->OutPt1->Next;
-    while (op1b != op1 && (op1b->Pt == j->OffPt)) 
+    while (op1b != op1 && (op1b->Pt == j->OffPt))
       op1b = op1b->Next;
     bool reverse1 = (op1b->Pt.Y > j->OffPt.Y);
     op2b = j->OutPt2->Next;
-    while (op2b != op2 && (op2b->Pt == j->OffPt)) 
+    while (op2b != op2 && (op2b->Pt == j->OffPt))
       op2b = op2b->Next;
     bool reverse2 = (op2b->Pt.Y > j->OffPt.Y);
     if (reverse1 == reverse2) return false;
@@ -3507,7 +3514,7 @@ bool Clipper::JoinPoints(Join *j, OutRec* outRec1, OutRec* outRec2)
       j->OutPt2 = op1b;
       return true;
     }
-  } 
+  }
   else if (isHorizontal)
   {
     //treat horizontal joins differently to non-horizontal joins since with
@@ -3537,18 +3544,18 @@ bool Clipper::JoinPoints(Join *j, OutRec* outRec1, OutRec* outRec2)
     //on the discard Side as either may still be needed for other joins ...
     IntPoint Pt;
     bool DiscardLeftSide;
-    if (op1->Pt.X >= Left && op1->Pt.X <= Right) 
+    if (op1->Pt.X >= Left && op1->Pt.X <= Right)
     {
       Pt = op1->Pt; DiscardLeftSide = (op1->Pt.X > op1b->Pt.X);
-    } 
-    else if (op2->Pt.X >= Left&& op2->Pt.X <= Right) 
+    }
+    else if (op2->Pt.X >= Left&& op2->Pt.X <= Right)
     {
       Pt = op2->Pt; DiscardLeftSide = (op2->Pt.X > op2b->Pt.X);
-    } 
+    }
     else if (op1b->Pt.X >= Left && op1b->Pt.X <= Right)
     {
       Pt = op1b->Pt; DiscardLeftSide = op1b->Pt.X > op1->Pt.X;
-    } 
+    }
     else
     {
       Pt = op2b->Pt; DiscardLeftSide = (op2b->Pt.X > op2->Pt.X);
@@ -3624,7 +3631,7 @@ static OutRec* ParseFirstLeft(OutRec* FirstLeft)
 //------------------------------------------------------------------------------
 
 void Clipper::FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec)
-{ 
+{
   //tests if NewOutRec contains the polygon before reassigning FirstLeft
   for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
   {
@@ -3721,7 +3728,7 @@ void Clipper::JoinCommonEdges()
 
         if ((outRec2->IsHole ^ m_ReverseOutput) == (Area(*outRec2) > 0))
           ReversePolyPtLinks(outRec2->Pts);
-            
+
       } else if (Poly2ContainsPoly1(outRec1->Pts, outRec2->Pts))
       {
         //outRec2 contains outRec1 ...
@@ -3734,7 +3741,7 @@ void Clipper::JoinCommonEdges()
 
         if ((outRec1->IsHole ^ m_ReverseOutput) == (Area(*outRec1) > 0))
           ReversePolyPtLinks(outRec1->Pts);
-      } 
+      }
       else
       {
         //the 2 polygons are completely separate ...
@@ -3744,7 +3751,7 @@ void Clipper::JoinCommonEdges()
         //fixup FirstLeft pointers that may need reassigning to OutRec2
         if (m_UsingPolyTree) FixupFirstLefts1(outRec1, outRec2);
       }
-     
+
     } else
     {
       //joined 2 polygons together ...
@@ -3754,7 +3761,7 @@ void Clipper::JoinCommonEdges()
       outRec2->Idx = outRec1->Idx;
 
       outRec1->IsHole = holeStateRec->IsHole;
-      if (holeStateRec == outRec2) 
+      if (holeStateRec == outRec2)
         outRec1->FirstLeft = outRec2->FirstLeft;
       outRec2->FirstLeft = outRec1;
 
@@ -3769,7 +3776,7 @@ void Clipper::JoinCommonEdges()
 
 DoublePoint GetUnitNormal(const IntPoint &pt1, const IntPoint &pt2)
 {
-  if(pt2.X == pt1.X && pt2.Y == pt1.Y) 
+  if(pt2.X == pt1.X && pt2.Y == pt1.Y)
     return DoublePoint(0, 0);
 
   double Dx = (double)(pt2.X - pt1.X);
@@ -3863,7 +3870,7 @@ void ClipperOffset::FixOrientations()
 {
   //fixup orientations of all closed paths if the orientation of the
   //closed path with the lowermost vertex is wrong ...
-  if (m_lowest.X >= 0 && 
+  if (m_lowest.X >= 0 &&
     !Orientation(m_polyNodes.Childs[(int)m_lowest.X]->Contour))
   {
     for (int i = 0; i < m_polyNodes.ChildCount(); ++i)
@@ -3890,7 +3897,7 @@ void ClipperOffset::Execute(Paths& solution, double delta)
   solution.clear();
   FixOrientations();
   DoOffset(delta);
-  
+
   //now clean up 'corners' ...
   Clipper clpr;
   clpr.AddPaths(m_destPolys, ptSubject, true);
@@ -3962,7 +3969,7 @@ void ClipperOffset::DoOffset(double delta)
   m_delta = delta;
 
   //if Zero offset, just copy any CLOSED polygons to m_p and return ...
-  if (NEAR_ZERO(delta)) 
+  if (NEAR_ZERO(delta))
   {
     m_destPolys.reserve(m_polyNodes.ChildCount());
     for (int i = 0; i < m_polyNodes.ChildCount(); i++)
@@ -3980,12 +3987,12 @@ void ClipperOffset::DoOffset(double delta)
 
   double y;
   if (ArcTolerance <= 0.0) y = def_arc_tolerance;
-  else if (ArcTolerance > std::fabs(delta) * def_arc_tolerance) 
+  else if (ArcTolerance > std::fabs(delta) * def_arc_tolerance)
     y = std::fabs(delta) * def_arc_tolerance;
   else y = ArcTolerance;
   //see offset_triginometry2.svg in the documentation folder ...
   double steps = pi / std::acos(1 - y / std::fabs(delta));
-  if (steps > std::fabs(delta) * pi) 
+  if (steps > std::fabs(delta) * pi)
     steps = std::fabs(delta) * pi;  //ie excessive precision check
   m_sin = std::sin(two_pi / steps);
   m_cos = std::cos(two_pi / steps);
@@ -4133,17 +4140,17 @@ void ClipperOffset::OffsetPoint(int j, int& k, JoinType jointype)
 {
   //cross product ...
   m_sinA = (m_normals[k].X * m_normals[j].Y - m_normals[j].X * m_normals[k].Y);
-  if (std::fabs(m_sinA * m_delta) < 1.0) 
+  if (std::fabs(m_sinA * m_delta) < 1.0)
   {
     //dot product ...
-    double cosA = (m_normals[k].X * m_normals[j].X + m_normals[j].Y * m_normals[k].Y ); 
+    double cosA = (m_normals[k].X * m_normals[j].X + m_normals[j].Y * m_normals[k].Y );
     if (cosA > 0) // angle => 0 degrees
     {
       m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].X + m_normals[k].X * m_delta),
         Round(m_srcPoly[j].Y + m_normals[k].Y * m_delta)));
-      return; 
+      return;
     }
-    //else angle => 180 degrees   
+    //else angle => 180 degrees
   }
   else if (m_sinA > 1.0) m_sinA = 1.0;
   else if (m_sinA < -1.0) m_sinA = -1.0;
@@ -4222,7 +4229,7 @@ void ClipperOffset::DoRound(int j, int k)
 void Clipper::DoSimplePolygons()
 {
   PolyOutList::size_type i = 0;
-  while (i < m_PolyOuts.size()) 
+  while (i < m_PolyOuts.size())
   {
     OutRec* outrec = m_PolyOuts[i++];
     OutPt* op = outrec->Pts;
@@ -4230,9 +4237,9 @@ void Clipper::DoSimplePolygons()
     do //for each Pt in Polygon until duplicate found do ...
     {
       OutPt* op2 = op->Next;
-      while (op2 != outrec->Pts) 
+      while (op2 != outrec->Pts)
       {
-        if ((op->Pt == op2->Pt) && op2->Next != op && op2->Prev != op) 
+        if ((op->Pt == op2->Pt) && op2->Next != op && op2->Prev != op)
         {
           //split the polygon into two ...
           OutPt* op3 = op->Prev;
@@ -4330,10 +4337,10 @@ double DistanceFromLineSqrd(
   const IntPoint& pt, const IntPoint& ln1, const IntPoint& ln2)
 {
   //The equation of a line in general form (Ax + By + C = 0)
-  //given 2 points (x�,y�) & (x�,y�) is ...
-  //(y� - y�)x + (x� - x�)y + (y� - y�)x� - (x� - x�)y� = 0
-  //A = (y� - y�); B = (x� - x�); C = (y� - y�)x� - (x� - x�)y�
-  //perpendicular distance of point (x�,y�) = (Ax� + By� + C)/Sqrt(A� + B�)
+  //given 2 points (x_1, y_1) & (x_2, y_2) is ...
+  //(y_1 - y_2)x + (x_2 - x_1)y - (y_1 - y_2)x_1 - (x_2 - x_1)y_1 = 0
+  //A = (y_1 - y_2); B = (x_2 - x_1); C = - (y_1 - y_2)x_1 - (x_2 - x_1)y_1
+  //perpendicular distance of point (x_0, y_0) = |Ax_0 + By_0 + C| / Sqrt(A^2 + B^2)
   //see http://en.wikipedia.org/wiki/Perpendicular_distance
   double A = double(ln1.Y - ln2.Y);
   double B = double(ln2.X - ln1.X);
@@ -4343,7 +4350,7 @@ double DistanceFromLineSqrd(
 }
 //---------------------------------------------------------------------------
 
-bool SlopesNearCollinear(const IntPoint& pt1, 
+bool SlopesNearCollinear(const IntPoint& pt1,
     const IntPoint& pt2, const IntPoint& pt3, double distSqrd)
 {
   //this function is more accurate when the point that's geometrically
@@ -4392,10 +4399,10 @@ void CleanPolygon(const Path& in_poly, Path& out_poly, double distance)
 {
   //distance = proximity in units/pixels below which vertices
   //will be stripped. Default ~= sqrt(2).
-  
+
   size_t size = in_poly.size();
-  
-  if (size == 0) 
+
+  if (size == 0)
   {
     out_poly.clear();
     return;
@@ -4412,13 +4419,13 @@ void CleanPolygon(const Path& in_poly, Path& out_poly, double distance)
 
   double distSqrd = distance * distance;
   OutPt* op = &outPts[0];
-  while (op->Idx == 0 && op->Next != op->Prev) 
+  while (op->Idx == 0 && op->Next != op->Prev)
   {
     if (PointsAreClose(op->Pt, op->Prev->Pt, distSqrd))
     {
       op = ExcludeOp(op);
       size--;
-    } 
+    }
     else if (PointsAreClose(op->Prev->Pt, op->Next->Pt, distSqrd))
     {
       ExcludeOp(op->Next);
@@ -4468,7 +4475,7 @@ void CleanPolygons(Paths& polys, double distance)
 }
 //------------------------------------------------------------------------------
 
-void Minkowski(const Path& poly, const Path& path, 
+void Minkowski(const Path& poly, const Path& path,
   Paths& solution, bool isSum, bool isClosed)
 {
   int delta = (isClosed ? 1 : 0);
@@ -4575,7 +4582,7 @@ void AddPolyNodeToPaths(const PolyNode& polynode, NodeType nodetype, Paths& path
 
 void PolyTreeToPaths(const PolyTree& polytree, Paths& paths)
 {
-  paths.resize(0); 
+  paths.resize(0);
   paths.reserve(polytree.Total());
   AddPolyNodeToPaths(polytree, ntAny, paths);
 }
@@ -4583,7 +4590,7 @@ void PolyTreeToPaths(const PolyTree& polytree, Paths& paths)
 
 void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths)
 {
-  paths.resize(0); 
+  paths.resize(0);
   paths.reserve(polytree.Total());
   AddPolyNodeToPaths(polytree, ntClosed, paths);
 }
@@ -4591,7 +4598,7 @@ void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths)
 
 void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths)
 {
-  paths.resize(0); 
+  paths.resize(0);
   paths.reserve(polytree.Total());
   //Open paths are top level only, so ...
   for (int i = 0; i < polytree.ChildCount(); ++i)
diff --git a/contrib/clipper/clipper.hpp b/contrib/clipper/clipper.hpp
index 5a19617bb..33043fdb6 100644
--- a/contrib/clipper/clipper.hpp
+++ b/contrib/clipper/clipper.hpp
@@ -45,9 +45,9 @@
 
 //use_lines: Enables line clipping. Adds a very minor cost to performance.
 #define use_lines
-  
+
 //use_deprecated: Enables temporary support for the obsolete functions
-//#define use_deprecated  
+//#define use_deprecated
 
 #include <vector>
 #include <list>
@@ -98,7 +98,7 @@ struct IntPoint {
   }
   friend inline bool operator!= (const IntPoint& a, const IntPoint& b)
   {
-    return a.X != b.X  || a.Y != b.Y; 
+    return a.X != b.X  || a.Y != b.Y;
   }
 };
 //------------------------------------------------------------------------------
@@ -133,8 +133,8 @@ enum EndType {etClosedPolygon, etClosedLine, etOpenButt, etOpenSquare, etOpenRou
 class PolyNode;
 typedef std::vector< PolyNode* > PolyNodes;
 
-class PolyNode 
-{ 
+class PolyNode
+{
 public:
     PolyNode();
     virtual ~PolyNode(){};
@@ -146,7 +146,7 @@ public:
     bool IsOpen() const;
     int ChildCount() const;
 private:
-    //PolyNode& operator =(PolyNode& other); 
+    //PolyNode& operator =(PolyNode& other);
     unsigned Index; //node index in Parent.Childs
     bool m_IsOpen;
     JoinType m_jointype;
@@ -154,11 +154,11 @@ private:
     PolyNode* GetNextSiblingUp() const;
     void AddChild(PolyNode& child);
     friend class Clipper; //to access Index
-    friend class ClipperOffset; 
+    friend class ClipperOffset;
 };
 
 class PolyTree: public PolyNode
-{ 
+{
 public:
     ~PolyTree(){ Clear(); };
     PolyNode* GetFirst() const;
@@ -300,10 +300,10 @@ private:
   PolyFillType     m_ClipFillType;
   PolyFillType     m_SubjFillType;
   bool             m_ReverseOutput;
-  bool             m_UsingPolyTree; 
+  bool             m_UsingPolyTree;
   bool             m_StrictSimple;
 #ifdef use_xyz
-  ZFillCallback   m_ZFill; //custom callback 
+  ZFillCallback   m_ZFill; //custom callback
 #endif
   void SetWindingCount(TEdge& edge);
   bool IsEvenOddFillType(const TEdge& edge) const;
@@ -357,7 +357,7 @@ private:
 };
 //------------------------------------------------------------------------------
 
-class ClipperOffset 
+class ClipperOffset
 {
 public:
   ClipperOffset(double miterLimit = 2.0, double roundPrecision = 0.25);
diff --git a/contrib/draco/CMakeLists.txt b/contrib/draco/CMakeLists.txt
index deba97931..e7b8f1521 100644
--- a/contrib/draco/CMakeLists.txt
+++ b/contrib/draco/CMakeLists.txt
@@ -13,6 +13,9 @@
 # the License.
 
 cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+if(DRACO_TRANSCODER_SUPPORTED)
+  set(CMAKE_CXX_STANDARD 17)
+endif()
 project(draco C CXX)
 
 if(NOT CMAKE_BUILD_TYPE)
@@ -21,7 +24,7 @@ endif()
 
 set(draco_root "${CMAKE_CURRENT_SOURCE_DIR}")
 set(draco_src_root "${draco_root}/src/draco")
-set(draco_build "${Assimp_BINARY_DIR}")
+set(draco_build "${CMAKE_BINARY_DIR}")
 
 if("${draco_root}" STREQUAL "${draco_build}")
   message(
@@ -479,10 +482,14 @@ list(
          "${draco_src_root}/metadata/geometry_metadata.h"
          "${draco_src_root}/metadata/metadata.cc"
          "${draco_src_root}/metadata/metadata.h"
+         "${draco_src_root}/metadata/property_attribute.cc"
+         "${draco_src_root}/metadata/property_attribute.h"
          "${draco_src_root}/metadata/property_table.cc"
          "${draco_src_root}/metadata/property_table.h"
          "${draco_src_root}/metadata/structural_metadata.cc"
-         "${draco_src_root}/metadata/structural_metadata.h")
+         "${draco_src_root}/metadata/structural_metadata.h"
+         "${draco_src_root}/metadata/structural_metadata_schema.cc"
+         "${draco_src_root}/metadata/structural_metadata_schema.h")
 
 list(APPEND draco_metadata_enc_sources
             "${draco_src_root}/metadata/metadata_encoder.cc"
diff --git a/contrib/draco/README.md b/contrib/draco/README.md
index 4cc717c8d..bbbe93aeb 100644
--- a/contrib/draco/README.md
+++ b/contrib/draco/README.md
@@ -14,6 +14,14 @@ delays can result in transient errors that can be difficult to diagnose when
 new Draco releases are launched. To avoid the issue pin your sites to a
 versioned release.
 
+### Version 1.5.7 release:
+* Using the versioned www.gstatic.com WASM and Javascript decoders continues
+  to be recommended. To use v1.5.7, use this URL:
+  * https://www.gstatic.com/draco/versioned/decoders/1.5.7/*
+* Added support for normalized attributes to Emscripten encoder API.
+* Bug fixes.
+* Security fixes.
+
 ### Version 1.5.6 release:
 * Using the versioned www.gstatic.com WASM and Javascript decoders continues
   to be recommended. To use v1.5.6, use this URL:
diff --git a/contrib/draco/cmake/draco_build_definitions.cmake b/contrib/draco/cmake/draco_build_definitions.cmake
index 4dc232333..4c7b3f9fe 100644
--- a/contrib/draco/cmake/draco_build_definitions.cmake
+++ b/contrib/draco/cmake/draco_build_definitions.cmake
@@ -56,7 +56,7 @@ macro(draco_set_build_definitions)
   # passed to libtool.
   #
   # We set DRACO_SOVERSION = [c-a].a.r
-  set(LT_CURRENT 8)
+  set(LT_CURRENT 9)
   set(LT_REVISION 0)
   set(LT_AGE 0)
   math(EXPR DRACO_SOVERSION_MAJOR "${LT_CURRENT} - ${LT_AGE}")
diff --git a/contrib/draco/cmake/draco_install.cmake b/contrib/draco/cmake/draco_install.cmake
index 3be1ba163..b9dda265a 100644
--- a/contrib/draco/cmake/draco_install.cmake
+++ b/contrib/draco/cmake/draco_install.cmake
@@ -23,99 +23,101 @@ include(GNUInstallDirs)
 # Sets up the draco install targets. Must be called after the static library
 # target is created.
 macro(draco_setup_install_target)
-  set(bin_path "${CMAKE_INSTALL_BINDIR}")
-  set(data_path "${CMAKE_INSTALL_DATAROOTDIR}")
-  set(includes_path "${CMAKE_INSTALL_INCLUDEDIR}")
-  set(libs_path "${CMAKE_INSTALL_LIBDIR}")
+  if(DRACO_INSTALL)
+    set(bin_path "${CMAKE_INSTALL_BINDIR}")
+    set(data_path "${CMAKE_INSTALL_DATAROOTDIR}")
+    set(includes_path "${CMAKE_INSTALL_INCLUDEDIR}")
+    set(libs_path "${CMAKE_INSTALL_LIBDIR}")
 
-  foreach(file ${draco_sources})
-    if(file MATCHES "h$")
-      list(APPEND draco_api_includes ${file})
+    foreach(file ${draco_sources})
+      if(file MATCHES "h$")
+        list(APPEND draco_api_includes ${file})
+      endif()
+    endforeach()
+
+    list(REMOVE_DUPLICATES draco_api_includes)
+
+    # Strip $draco_src_root from the file paths: we need to install relative to
+    # $include_directory.
+    list(TRANSFORM draco_api_includes REPLACE "${draco_src_root}/" "")
+
+    foreach(draco_api_include ${draco_api_includes})
+      get_filename_component(file_directory ${draco_api_include} DIRECTORY)
+      set(target_directory "${includes_path}/draco/${file_directory}")
+      install(FILES ${draco_src_root}/${draco_api_include}
+              DESTINATION "${target_directory}")
+    endforeach()
+
+    install(FILES "${draco_build}/draco/draco_features.h"
+            DESTINATION "${includes_path}/draco/")
+
+    install(TARGETS draco_decoder DESTINATION "${bin_path}")
+    install(TARGETS draco_encoder DESTINATION "${bin_path}")
+
+    if(DRACO_TRANSCODER_SUPPORTED)
+      install(TARGETS draco_transcoder DESTINATION "${bin_path}")
     endif()
-  endforeach()
 
-  list(REMOVE_DUPLICATES draco_api_includes)
-
-  # Strip $draco_src_root from the file paths: we need to install relative to
-  # $include_directory.
-  list(TRANSFORM draco_api_includes REPLACE "${draco_src_root}/" "")
-
-  foreach(draco_api_include ${draco_api_includes})
-    get_filename_component(file_directory ${draco_api_include} DIRECTORY)
-    set(target_directory "${includes_path}/draco/${file_directory}")
-    install(FILES ${draco_src_root}/${draco_api_include}
-            DESTINATION "${target_directory}")
-  endforeach()
-
-  install(FILES "${draco_build}/draco/draco_features.h"
-          DESTINATION "${includes_path}/draco/")
-
-  install(TARGETS draco_decoder DESTINATION "${bin_path}")
-  install(TARGETS draco_encoder DESTINATION "${bin_path}")
-
-  if(DRACO_TRANSCODER_SUPPORTED)
-    install(TARGETS draco_transcoder DESTINATION "${bin_path}")
-  endif()
-
-  if(MSVC)
-    install(
-      TARGETS draco
-      EXPORT dracoExport
-      RUNTIME DESTINATION "${bin_path}"
-      ARCHIVE DESTINATION "${libs_path}"
-      LIBRARY DESTINATION "${libs_path}")
-  else()
-    install(
-      TARGETS draco_static
-      EXPORT dracoExport
-      DESTINATION "${libs_path}")
-
-    if(BUILD_SHARED_LIBS)
+    if(MSVC)
       install(
-        TARGETS draco_shared
+        TARGETS draco
         EXPORT dracoExport
         RUNTIME DESTINATION "${bin_path}"
         ARCHIVE DESTINATION "${libs_path}"
         LIBRARY DESTINATION "${libs_path}")
+    else()
+      install(
+        TARGETS draco_static
+        EXPORT dracoExport
+        DESTINATION "${libs_path}")
+
+      if(BUILD_SHARED_LIBS)
+        install(
+          TARGETS draco_shared
+          EXPORT dracoExport
+          RUNTIME DESTINATION "${bin_path}"
+          ARCHIVE DESTINATION "${libs_path}"
+          LIBRARY DESTINATION "${libs_path}")
+      endif()
     endif()
-  endif()
 
-  if(DRACO_UNITY_PLUGIN)
-    install(TARGETS dracodec_unity DESTINATION "${libs_path}")
-  endif()
+    if(DRACO_UNITY_PLUGIN)
+      install(TARGETS dracodec_unity DESTINATION "${libs_path}")
+    endif()
 
-  if(DRACO_MAYA_PLUGIN)
-    install(TARGETS draco_maya_wrapper DESTINATION "${libs_path}")
-  endif()
+    if(DRACO_MAYA_PLUGIN)
+      install(TARGETS draco_maya_wrapper DESTINATION "${libs_path}")
+    endif()
 
-  # pkg-config: draco.pc
-  configure_file("${draco_root}/cmake/draco.pc.template"
-                 "${draco_build}/draco.pc" @ONLY NEWLINE_STYLE UNIX)
-  install(FILES "${draco_build}/draco.pc" DESTINATION "${libs_path}/pkgconfig")
+    # pkg-config: draco.pc
+    configure_file("${draco_root}/cmake/draco.pc.template"
+                  "${draco_build}/draco.pc" @ONLY NEWLINE_STYLE UNIX)
+    install(FILES "${draco_build}/draco.pc" DESTINATION "${libs_path}/pkgconfig")
 
-  # CMake config: draco-config.cmake
-  configure_package_config_file(
-    "${draco_root}/cmake/draco-config.cmake.template"
-    "${draco_build}/draco-config.cmake"
-    INSTALL_DESTINATION "${data_path}/cmake/draco")
+    # CMake config: draco-config.cmake
+    configure_package_config_file(
+      "${draco_root}/cmake/draco-config.cmake.template"
+      "${draco_build}/draco-config.cmake"
+      INSTALL_DESTINATION "${data_path}/cmake/draco")
 
-  write_basic_package_version_file(
-    "${draco_build}/draco-config-version.cmake"
-    VERSION ${DRACO_VERSION}
-    COMPATIBILITY AnyNewerVersion)
+    write_basic_package_version_file(
+      "${draco_build}/draco-config-version.cmake"
+      VERSION ${DRACO_VERSION}
+      COMPATIBILITY AnyNewerVersion)
 
-  export(
-    EXPORT dracoExport
-    NAMESPACE draco::
-    FILE "${draco_build}/draco-targets.cmake")
+    export(
+      EXPORT dracoExport
+      NAMESPACE draco::
+      FILE "${draco_build}/draco-targets.cmake")
 
-  install(
-    EXPORT dracoExport
-    NAMESPACE draco::
-    FILE draco-targets.cmake
-    DESTINATION "${data_path}/cmake/draco")
+    install(
+      EXPORT dracoExport
+      NAMESPACE draco::
+      FILE draco-targets.cmake
+      DESTINATION "${data_path}/cmake/draco")
 
-  install(FILES "${draco_build}/draco-config.cmake"
-                "${draco_build}/draco-config-version.cmake"
-          DESTINATION "${data_path}/cmake/draco")
+    install(FILES "${draco_build}/draco-config.cmake"
+                  "${draco_build}/draco-config-version.cmake"
+            DESTINATION "${data_path}/cmake/draco")
+  endif(DRACO_INSTALL)
 endmacro()
diff --git a/contrib/draco/cmake/draco_options.cmake b/contrib/draco/cmake/draco_options.cmake
index 085149774..1e3f750f2 100644
--- a/contrib/draco/cmake/draco_options.cmake
+++ b/contrib/draco/cmake/draco_options.cmake
@@ -131,6 +131,10 @@ macro(draco_set_default_options)
     NAME DRACO_DEBUG_COMPILER_WARNINGS
     HELPSTRING "Turn on more warnings."
     VALUE OFF)
+  draco_option(
+    NAME DRACO_INSTALL
+    HELPSTRING "Enable installation."
+    VALUE ON)
   draco_check_deprecated_options()
 endmacro()
 
diff --git a/contrib/draco/cmake/draco_tests.cmake b/contrib/draco/cmake/draco_tests.cmake
index 1d905a969..a8283e2d7 100644
--- a/contrib/draco/cmake/draco_tests.cmake
+++ b/contrib/draco/cmake/draco_tests.cmake
@@ -89,8 +89,10 @@ if(DRACO_TRANSCODER_SUPPORTED)
            "${draco_src_root}/io/texture_io_test.cc"
            "${draco_src_root}/material/material_library_test.cc"
            "${draco_src_root}/material/material_test.cc"
+           "${draco_src_root}/metadata/property_attribute_test.cc"
            "${draco_src_root}/metadata/property_table_test.cc"
            "${draco_src_root}/metadata/structural_metadata_test.cc"
+           "${draco_src_root}/metadata/structural_metadata_schema_test.cc"
            "${draco_src_root}/scene/instance_array_test.cc"
            "${draco_src_root}/scene/light_test.cc"
            "${draco_src_root}/scene/mesh_group_test.cc"
diff --git a/contrib/draco/src/draco/attributes/attribute_quantization_transform.cc b/contrib/draco/src/draco/attributes/attribute_quantization_transform.cc
index a7f93a488..667e34431 100644
--- a/contrib/draco/src/draco/attributes/attribute_quantization_transform.cc
+++ b/contrib/draco/src/draco/attributes/attribute_quantization_transform.cc
@@ -14,6 +14,11 @@
 //
 #include "draco/attributes/attribute_quantization_transform.h"
 
+#include <cmath>
+#include <cstring>
+#include <memory>
+#include <vector>
+
 #include "draco/attributes/attribute_transform_type.h"
 #include "draco/core/quantization_utils.h"
 
@@ -144,6 +149,9 @@ bool AttributeQuantizationTransform::ComputeParameters(
        ++i) {
     attribute.GetValue(i, att_val.get());
     for (int c = 0; c < num_components; ++c) {
+      if (std::isnan(att_val[c])) {
+        return false;
+      }
       if (min_values_[c] > att_val[c]) {
         min_values_[c] = att_val[c];
       }
diff --git a/contrib/draco/src/draco/attributes/geometry_attribute.cc b/contrib/draco/src/draco/attributes/geometry_attribute.cc
index 141130f43..dc5ea45b9 100644
--- a/contrib/draco/src/draco/attributes/geometry_attribute.cc
+++ b/contrib/draco/src/draco/attributes/geometry_attribute.cc
@@ -59,6 +59,9 @@ bool GeometryAttribute::CopyFrom(const GeometryAttribute &src_att) {
     }
     buffer_->Update(src_att.buffer_->data(), src_att.buffer_->data_size());
   }
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  name_ = src_att.name_;
+#endif
   return true;
 }
 
@@ -87,6 +90,11 @@ bool GeometryAttribute::operator==(const GeometryAttribute &va) const {
   if (byte_offset_ != va.byte_offset_) {
     return false;
   }
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  if (name_ != va.name_) {
+    return false;
+  }
+#endif
   return true;
 }
 
diff --git a/contrib/draco/src/draco/attributes/geometry_attribute.h b/contrib/draco/src/draco/attributes/geometry_attribute.h
index 28f743fa0..734bd73e7 100644
--- a/contrib/draco/src/draco/attributes/geometry_attribute.h
+++ b/contrib/draco/src/draco/attributes/geometry_attribute.h
@@ -245,6 +245,16 @@ class GeometryAttribute {
         return "TEX_COORD";
       case GENERIC:
         return "GENERIC";
+#ifdef DRACO_TRANSCODER_SUPPORTED
+      case TANGENT:
+        return "TANGENT";
+      case MATERIAL:
+        return "MATERIAL";
+      case JOINTS:
+        return "JOINTS";
+      case WEIGHTS:
+        return "WEIGHTS";
+#endif
       default:
         return "UNKNOWN";
     }
@@ -276,6 +286,10 @@ class GeometryAttribute {
   DataBufferDescriptor buffer_descriptor() const { return buffer_descriptor_; }
   uint32_t unique_id() const { return unique_id_; }
   void set_unique_id(uint32_t id) { unique_id_ = id; }
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  std::string name() const { return name_; }
+  void set_name(std::string name) { name_ = name; }
+#endif
 
  protected:
   // Sets a new internal storage for the attribute.
@@ -445,6 +459,10 @@ class GeometryAttribute {
   // multiple attribute of the same type in a point cloud.
   uint32_t unique_id_;
 
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  std::string name_;
+#endif
+
   friend struct GeometryAttributeHasher;
 };
 
diff --git a/contrib/draco/src/draco/attributes/point_attribute.cc b/contrib/draco/src/draco/attributes/point_attribute.cc
index e54ab5427..5c459f3c4 100644
--- a/contrib/draco/src/draco/attributes/point_attribute.cc
+++ b/contrib/draco/src/draco/attributes/point_attribute.cc
@@ -14,8 +14,8 @@
 //
 #include "draco/attributes/point_attribute.h"
 
+#include <tuple>
 #include <unordered_map>
-
 using std::unordered_map;
 
 // Shortcut for typed conditionals.
@@ -166,10 +166,12 @@ AttributeValueIndex::ValueType PointAttribute::DeduplicateFormattedValues(
   AttributeValueIndex unique_vals(0);
   typedef std::array<T, num_components_t> AttributeValue;
   typedef std::array<HashType, num_components_t> AttributeHashableValue;
+  typedef unordered_map<AttributeHashableValue, AttributeValueIndex,
+                        HashArray<AttributeHashableValue>>
+      ValueToIndexMap;
+
   // Hash map storing index of the first attribute with a given value.
-  unordered_map<AttributeHashableValue, AttributeValueIndex,
-                HashArray<AttributeHashableValue>>
-      value_to_index_map;
+  ValueToIndexMap value_to_index_map;
   AttributeValue att_value;
   AttributeHashableValue hashable_value;
   IndexTypeVector<AttributeValueIndex, AttributeValueIndex> value_map(
@@ -180,19 +182,19 @@ AttributeValueIndex::ValueType PointAttribute::DeduplicateFormattedValues(
     // Convert the value to hashable type. Bit-copy real attributes to integers.
     memcpy(&(hashable_value[0]), &(att_value[0]), sizeof(att_value));
 
-    // Check if the given attribute value has been used before already.
-    auto it = value_to_index_map.find(hashable_value);
-    if (it != value_to_index_map.end()) {
+    typename ValueToIndexMap::iterator it;
+    bool inserted;
+    std::tie(it, inserted) = value_to_index_map.insert(
+        std::pair<AttributeHashableValue, AttributeValueIndex>(hashable_value,
+                                                               unique_vals));
+
+    // Try to update the hash map with a new entry pointing to the latest unique
+    // vertex index.
+    if (!inserted) {
       // Duplicated value found. Update index mapping.
       value_map[i] = it->second;
     } else {
       // New unique value.
-      // Update the hash map with a new entry pointing to the latest unique
-      // vertex index.
-      value_to_index_map.insert(
-          std::pair<AttributeHashableValue, AttributeValueIndex>(hashable_value,
-                                                                 unique_vals));
-      // Add the unique value to the mesh builder.
       SetAttributeValue(unique_vals, &att_value);
       // Update index mapping.
       value_map[i] = unique_vals;
diff --git a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_encoder.h b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_encoder.h
index 736598b15..8845b9496 100644
--- a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_encoder.h
+++ b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_encoder.h
@@ -200,7 +200,7 @@ bool MeshPredictionSchemeConstrainedMultiParallelogramEncoder<
 
   // Bit-field used for computing permutations of excluded edges
   // (parallelograms).
-  bool exluded_parallelograms[kMaxNumParallelograms];
+  bool excluded_parallelograms[kMaxNumParallelograms];
 
   // Data about the number of used parallelogram and total number of available
   // parallelogram for each context. Used to compute overhead needed for storing
@@ -291,12 +291,12 @@ bool MeshPredictionSchemeConstrainedMultiParallelogramEncoder<
          num_used_parallelograms <= num_parallelograms;
          ++num_used_parallelograms) {
       // Mark all parallelograms as excluded.
-      std::fill(exluded_parallelograms,
-                exluded_parallelograms + num_parallelograms, true);
+      std::fill(excluded_parallelograms,
+                excluded_parallelograms + num_parallelograms, true);
       // TODO(draco-eng) maybe this should be another std::fill.
       // Mark the first |num_used_parallelograms| as not excluded.
       for (int j = 0; j < num_used_parallelograms; ++j) {
-        exluded_parallelograms[j] = false;
+        excluded_parallelograms[j] = false;
       }
       // Permute over the excluded edges and compute error for each
       // configuration (permutation of excluded parallelograms).
@@ -307,7 +307,7 @@ bool MeshPredictionSchemeConstrainedMultiParallelogramEncoder<
         }
         uint8_t configuration = 0;
         for (int j = 0; j < num_parallelograms; ++j) {
-          if (exluded_parallelograms[j]) {
+          if (excluded_parallelograms[j]) {
             continue;
           }
           for (int c = 0; c < num_components; ++c) {
@@ -322,15 +322,13 @@ bool MeshPredictionSchemeConstrainedMultiParallelogramEncoder<
         }
         error = ComputeError(multi_pred_vals.data(), in_data + dst_offset,
                              &current_residuals[0], num_components);
-        if (num_parallelograms > 0) {
-          const int64_t new_overhead_bits = ComputeOverheadBits(
-              total_used_parallelograms[num_parallelograms - 1] +
-                  num_used_parallelograms,
-              total_parallelograms[num_parallelograms - 1]);
+        const int64_t new_overhead_bits = ComputeOverheadBits(
+            total_used_parallelograms[num_parallelograms - 1] +
+                num_used_parallelograms,
+            total_parallelograms[num_parallelograms - 1]);
 
-          // Add overhead bits to the total error.
-          error.num_bits += new_overhead_bits;
-        }
+        // Add overhead bits to the total error.
+        error.num_bits += new_overhead_bits;
         if (error < best_prediction.error) {
           best_prediction.error = error;
           best_prediction.configuration = configuration;
@@ -340,8 +338,9 @@ bool MeshPredictionSchemeConstrainedMultiParallelogramEncoder<
           best_prediction.residuals.assign(current_residuals.begin(),
                                            current_residuals.end());
         }
-      } while (std::next_permutation(
-          exluded_parallelograms, exluded_parallelograms + num_parallelograms));
+      } while (
+          std::next_permutation(excluded_parallelograms,
+                                excluded_parallelograms + num_parallelograms));
     }
     if (num_parallelograms > 0) {
       total_used_parallelograms[num_parallelograms - 1] +=
diff --git a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_geometric_normal_decoder.h b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_geometric_normal_decoder.h
index da1387a30..badea22f3 100644
--- a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_geometric_normal_decoder.h
+++ b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_geometric_normal_decoder.h
@@ -151,6 +151,10 @@ bool MeshPredictionSchemeGeometricNormalDecoder<
     if (!buffer->Decode(&prediction_mode)) {
       return false;
     }
+    if (prediction_mode > TRIANGLE_AREA) {
+      // Invalid prediction mode.
+      return false;
+    }
 
     if (!predictor_.SetNormalPredictionMode(
             NormalPredictionMode(prediction_mode))) {
diff --git a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_predictor.h b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_predictor.h
index 26262fb13..985a5918f 100644
--- a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_predictor.h
+++ b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_predictor.h
@@ -169,7 +169,7 @@ bool MeshPredictionSchemeTexCoordsPortablePredictor<
       }
       const int64_t pn_uv_absmax_element =
           std::max(std::abs(pn_uv[0]), std::abs(pn_uv[1]));
-      if (cn_dot_pn >
+      if (std::abs(cn_dot_pn) >
           std::numeric_limits<int64_t>::max() / pn_uv_absmax_element) {
         // Return false if squared length calculation would overflow.
         return false;
@@ -177,7 +177,8 @@ bool MeshPredictionSchemeTexCoordsPortablePredictor<
       const Vec2 x_uv = n_uv * pn_norm2_squared + (cn_dot_pn * pn_uv);
       const int64_t pn_absmax_element =
           std::max(std::max(std::abs(pn[0]), std::abs(pn[1])), std::abs(pn[2]));
-      if (cn_dot_pn > std::numeric_limits<int64_t>::max() / pn_absmax_element) {
+      if (std::abs(cn_dot_pn) >
+          std::numeric_limits<int64_t>::max() / pn_absmax_element) {
         // Return false if squared length calculation would overflow.
         return false;
       }
diff --git a/contrib/draco/src/draco/compression/attributes/sequential_integer_attribute_decoder.cc b/contrib/draco/src/draco/compression/attributes/sequential_integer_attribute_decoder.cc
index 17f32fc16..927a4a52f 100644
--- a/contrib/draco/src/draco/compression/attributes/sequential_integer_attribute_decoder.cc
+++ b/contrib/draco/src/draco/compression/attributes/sequential_integer_attribute_decoder.cc
@@ -48,6 +48,11 @@ bool SequentialIntegerAttributeDecoder::DecodeValues(
   if (!in_buffer->Decode(&prediction_scheme_method)) {
     return false;
   }
+  // Check that decoded prediction scheme method type is valid.
+  if (prediction_scheme_method < PREDICTION_NONE ||
+      prediction_scheme_method >= NUM_PREDICTION_SCHEMES) {
+    return false;
+  }
   if (prediction_scheme_method != PREDICTION_NONE) {
     int8_t prediction_transform_type;
     if (!in_buffer->Decode(&prediction_transform_type)) {
diff --git a/contrib/draco/src/draco/compression/encode_test.cc b/contrib/draco/src/draco/compression/encode_test.cc
index 00d834703..461dddef7 100644
--- a/contrib/draco/src/draco/compression/encode_test.cc
+++ b/contrib/draco/src/draco/compression/encode_test.cc
@@ -515,6 +515,74 @@ TEST_F(EncodeTest, TestDracoCompressionOptionsGridQuantization) {
               15.f * 0.1f, 1e-6f);
 }
 
+TEST_F(EncodeTest, TestPointCloudGridQuantization) {
+  // Test verifies that we can set position quantization via grid spacing for a
+  // point cloud.
+  const auto pc = draco::ReadPointCloudFromTestFile("cube_att.obj");
+  ASSERT_NE(pc, nullptr);
+  const int pos_att_id =
+      pc->GetNamedAttributeId(draco::GeometryAttribute::POSITION);
+
+  draco::ExpertEncoder encoder(*pc);
+  encoder.SetAttributeGridQuantization(*pc, pos_att_id, 0.15);
+  draco::EncoderBuffer buffer;
+  DRACO_ASSERT_OK(encoder.EncodeToBuffer(&buffer));
+
+  // The grid options should be reflected in the |encoder|. Check that the
+  // computed values are correct.
+  draco::Vector3f origin;
+  encoder.options().GetAttributeVector(pos_att_id, "quantization_origin", 3,
+                                       &origin[0]);
+  ASSERT_EQ(origin, draco::Vector3f(0.f, 0.f, 0.f));
+
+  // We need 3 quantization bits for 8 grid values [0.00, 0.15, ...,1.05].
+  ASSERT_EQ(
+      encoder.options().GetAttributeInt(pos_att_id, "quantization_bits", -1),
+      3);
+
+  // The quantization range should be ((1 << quantization_bits) - 1) * spacing.
+  ASSERT_NEAR(encoder.options().GetAttributeFloat(pos_att_id,
+                                                  "quantization_range", 0.f),
+              1.05f, 1e-6f);
+}
+
+TEST_F(EncodeTest, TestPointCloudGridQuantizationFromCompressionOptions) {
+  // Test verifies that we can set position quantization via grid spacing for a
+  // point cloud using DracoCompressionOptions.
+  const auto pc = draco::ReadPointCloudFromTestFile("cube_att.obj");
+  ASSERT_NE(pc, nullptr);
+  pc->SetCompressionEnabled(true);
+
+  // Set grid quantization for positions.
+  draco::DracoCompressionOptions compression_options;
+  // This should result in 10x10x10 quantization.
+  compression_options.quantization_position.SetGrid(0.15);
+  pc->SetCompressionOptions(compression_options);
+
+  draco::ExpertEncoder encoder(*pc);
+  draco::EncoderBuffer buffer;
+  DRACO_ASSERT_OK(encoder.EncodeToBuffer(&buffer));
+
+  // The grid options should be reflected in the |encoder|. Check that the
+  // computed values are correct.
+  const int pos_att_id =
+      pc->GetNamedAttributeId(draco::GeometryAttribute::POSITION);
+  draco::Vector3f origin;
+  encoder.options().GetAttributeVector(pos_att_id, "quantization_origin", 3,
+                                       &origin[0]);
+  ASSERT_EQ(origin, draco::Vector3f(0.f, 0.f, 0.f));
+
+  // We need 3 quantization bits for 8 grid values [0.00, 0.15, ...,1.05].
+  ASSERT_EQ(
+      encoder.options().GetAttributeInt(pos_att_id, "quantization_bits", -1),
+      3);
+
+  // The quantization range should be ((1 << quantization_bits) - 1) * spacing.
+  ASSERT_NEAR(encoder.options().GetAttributeFloat(pos_att_id,
+                                                  "quantization_range", 0.f),
+              1.05f, 1e-6f);
+}
+
 TEST_F(EncodeTest, TestDracoCompressionOptionsGridQuantizationWithOffset) {
   // Test verifies that we can set position quantization via grid spacing when
   // the geometry is not perfectly aligned with the quantization grid.
diff --git a/contrib/draco/src/draco/compression/expert_encode.cc b/contrib/draco/src/draco/compression/expert_encode.cc
index a3e649193..9ed14de26 100644
--- a/contrib/draco/src/draco/compression/expert_encode.cc
+++ b/contrib/draco/src/draco/compression/expert_encode.cc
@@ -51,6 +51,11 @@ Status ExpertEncoder::EncodeToBuffer(EncoderBuffer *out_buffer) {
 Status ExpertEncoder::EncodePointCloudToBuffer(const PointCloud &pc,
                                                EncoderBuffer *out_buffer) {
 #ifdef DRACO_POINT_CLOUD_COMPRESSION_SUPPORTED
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  // Apply DracoCompressionOptions associated with the point cloud.
+  DRACO_RETURN_IF_ERROR(ApplyCompressionOptions(pc));
+#endif  // DRACO_TRANSCODER_SUPPORTED
+
   std::unique_ptr<PointCloudEncoder> encoder;
   const int encoding_method = options().GetGlobalInt("encoding_method", -1);
 
@@ -195,11 +200,11 @@ Status ExpertEncoder::SetAttributePredictionScheme(
 }
 
 #ifdef DRACO_TRANSCODER_SUPPORTED
-Status ExpertEncoder::ApplyCompressionOptions(const Mesh &mesh) {
-  if (!mesh.IsCompressionEnabled()) {
+Status ExpertEncoder::ApplyCompressionOptions(const PointCloud &pc) {
+  if (!pc.IsCompressionEnabled()) {
     return OkStatus();
   }
-  const auto &compression_options = mesh.GetCompressionOptions();
+  const auto &compression_options = pc.GetCompressionOptions();
 
   // Set any encoder options that haven't been explicitly set by users (don't
   // override existing options).
@@ -208,12 +213,12 @@ Status ExpertEncoder::ApplyCompressionOptions(const Mesh &mesh) {
                        10 - compression_options.compression_level);
   }
 
-  for (int ai = 0; ai < mesh.num_attributes(); ++ai) {
+  for (int ai = 0; ai < pc.num_attributes(); ++ai) {
     if (options().IsAttributeOptionSet(ai, "quantization_bits")) {
       continue;  // Don't override options that have been set.
     }
     int quantization_bits = 0;
-    const auto type = mesh.attribute(ai)->attribute_type();
+    const auto type = pc.attribute(ai)->attribute_type();
     switch (type) {
       case GeometryAttribute::POSITION:
         if (compression_options.quantization_position
@@ -221,7 +226,7 @@ Status ExpertEncoder::ApplyCompressionOptions(const Mesh &mesh) {
           quantization_bits =
               compression_options.quantization_position.quantization_bits();
         } else {
-          DRACO_RETURN_IF_ERROR(ApplyGridQuantization(mesh, ai));
+          DRACO_RETURN_IF_ERROR(ApplyGridQuantization(pc, ai));
         }
         break;
       case GeometryAttribute::TEX_COORD:
@@ -252,17 +257,29 @@ Status ExpertEncoder::ApplyCompressionOptions(const Mesh &mesh) {
   return OkStatus();
 }
 
-Status ExpertEncoder::ApplyGridQuantization(const Mesh &mesh,
+Status ExpertEncoder::ApplyGridQuantization(const PointCloud &pc,
                                             int attribute_index) {
-  const auto compression_options = mesh.GetCompressionOptions();
-  if (mesh.attribute(attribute_index)->num_components() != 3) {
+  const auto compression_options = pc.GetCompressionOptions();
+  const float spacing = compression_options.quantization_position.spacing();
+  return SetAttributeGridQuantization(pc, attribute_index, spacing);
+}
+
+Status ExpertEncoder::SetAttributeGridQuantization(const PointCloud &pc,
+                                                   int attribute_index,
+                                                   float spacing) {
+  const auto *const att = pc.attribute(attribute_index);
+  if (att->attribute_type() != GeometryAttribute::POSITION) {
+    return ErrorStatus(
+        "Invalid attribute type: Grid quantization is currently supported only "
+        "for positions.");
+  }
+  if (att->num_components() != 3) {
     return ErrorStatus(
         "Invalid number of components: Grid quantization is currently "
         "supported only for 3D positions.");
   }
-  const float spacing = compression_options.quantization_position.spacing();
   // Compute quantization properties based on the grid spacing.
-  const auto &bbox = mesh.ComputeBoundingBox();
+  const auto &bbox = pc.ComputeBoundingBox();
   // Snap min and max points of the |bbox| to the quantization grid vertices.
   Vector3f min_pos;
   int num_values = 0;  // Number of values that we need to encode.
diff --git a/contrib/draco/src/draco/compression/expert_encode.h b/contrib/draco/src/draco/compression/expert_encode.h
index 5c1485e1e..db604f1d5 100644
--- a/contrib/draco/src/draco/compression/expert_encode.h
+++ b/contrib/draco/src/draco/compression/expert_encode.h
@@ -132,6 +132,13 @@ class ExpertEncoder : public EncoderBase<EncoderOptions> {
   Status SetAttributePredictionScheme(int32_t attribute_id,
                                       int prediction_scheme_method);
 
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  // Applies grid quantization to position attribute in point cloud |pc| at
+  // |attribute_index| with a given grid |spacing|.
+  Status SetAttributeGridQuantization(const PointCloud &pc, int attribute_index,
+                                      float spacing);
+#endif  // DRACO_TRANSCODER_SUPPORTED
+
  private:
   Status EncodePointCloudToBuffer(const PointCloud &pc,
                                   EncoderBuffer *out_buffer);
@@ -139,9 +146,9 @@ class ExpertEncoder : public EncoderBase<EncoderOptions> {
   Status EncodeMeshToBuffer(const Mesh &m, EncoderBuffer *out_buffer);
 
 #ifdef DRACO_TRANSCODER_SUPPORTED
-  // Applies compression options stored in |mesh|.
-  Status ApplyCompressionOptions(const Mesh &mesh);
-  Status ApplyGridQuantization(const Mesh &mesh, int attribute_index);
+  // Applies compression options stored in |pc|.
+  Status ApplyCompressionOptions(const PointCloud &pc);
+  Status ApplyGridQuantization(const PointCloud &pc, int attribute_index);
 #endif  // DRACO_TRANSCODER_SUPPORTED
 
   const PointCloud *point_cloud_;
diff --git a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_decoder_impl.cc b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_decoder_impl.cc
index 21ad9959c..0b89ba357 100644
--- a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_decoder_impl.cc
+++ b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_decoder_impl.cc
@@ -15,6 +15,7 @@
 #include "draco/compression/mesh/mesh_edgebreaker_decoder_impl.h"
 
 #include <algorithm>
+#include <cstdint>
 
 #include "draco/compression/attributes/sequential_attribute_decoders_controller.h"
 #include "draco/compression/mesh/mesh_edgebreaker_decoder.h"
@@ -299,6 +300,22 @@ bool MeshEdgebreakerDecoderImpl<TraversalDecoder>::DecodeConnectivity() {
   if (static_cast<uint32_t>(num_encoded_vertices_) > num_faces * 3) {
     return false;  // There cannot be more vertices than 3 * num_faces.
   }
+
+  // Minimum number of edges of the mesh assuming each edge is shared between
+  // two faces.
+  const uint32_t min_num_face_edges = 3 * num_faces / 2;
+
+  // Maximum number of edges that can exist between |num_encoded_vertices_|.
+  // This is based on graph theory assuming simple connected graph.
+  const uint64_t num_encoded_vertices_64 =
+      static_cast<uint64_t>(num_encoded_vertices_);
+  const uint64_t max_num_vertex_edges =
+      num_encoded_vertices_64 * (num_encoded_vertices_64 - 1) / 2;
+  if (max_num_vertex_edges < min_num_face_edges) {
+    // It is impossible to construct a manifold mesh with these properties.
+    return false;
+  }
+
   uint8_t num_attribute_data;
   if (!decoder_->buffer()->Decode(&num_attribute_data)) {
     return false;
diff --git a/contrib/draco/src/draco/compression/mesh/mesh_sequential_decoder.cc b/contrib/draco/src/draco/compression/mesh/mesh_sequential_decoder.cc
index 595a487a4..124df3345 100644
--- a/contrib/draco/src/draco/compression/mesh/mesh_sequential_decoder.cc
+++ b/contrib/draco/src/draco/compression/mesh/mesh_sequential_decoder.cc
@@ -14,6 +14,9 @@
 //
 #include "draco/compression/mesh/mesh_sequential_decoder.h"
 
+#include <cstdint>
+#include <limits>
+
 #include "draco/compression/attributes/linear_sequencer.h"
 #include "draco/compression/attributes/sequential_attribute_decoders_controller.h"
 #include "draco/compression/entropy/symbol_decoding.h"
@@ -48,7 +51,6 @@ bool MeshSequentialDecoder::DecodeConnectivity() {
 
   // Check that num_faces and num_points are valid values.
   const uint64_t faces_64 = static_cast<uint64_t>(num_faces);
-  const uint64_t points_64 = static_cast<uint64_t>(num_points);
   // Compressed sequential encoding can only handle (2^32 - 1) / 3 indices.
   if (faces_64 > 0xffffffff / 3) {
     return false;
@@ -58,9 +60,6 @@ bool MeshSequentialDecoder::DecodeConnectivity() {
     // fit in the remaining size of the buffer.
     return false;
   }
-  if (points_64 > faces_64 * 3) {
-    return false;
-  }
   uint8_t connectivity_method;
   if (!buffer()->Decode(&connectivity_method)) {
     return false;
@@ -147,7 +146,7 @@ bool MeshSequentialDecoder::DecodeAndDecompressIndices(uint32_t num_faces) {
   }
   // Reconstruct the indices from the differences.
   // See MeshSequentialEncoder::CompressAndEncodeIndices() for more details.
-  int32_t last_index_value = 0;
+  int32_t last_index_value = 0;  // This will always be >= 0.
   int vertex_index = 0;
   for (uint32_t i = 0; i < num_faces; ++i) {
     Mesh::Face face;
@@ -155,13 +154,19 @@ bool MeshSequentialDecoder::DecodeAndDecompressIndices(uint32_t num_faces) {
       const uint32_t encoded_val = indices_buffer[vertex_index++];
       int32_t index_diff = (encoded_val >> 1);
       if (encoded_val & 1) {
+        if (index_diff > last_index_value) {
+          // Subtracting index_diff would result in a negative index.
+          return false;
+        }
         index_diff = -index_diff;
+      } else {
+        if (index_diff >
+            (std::numeric_limits<int32_t>::max() - last_index_value)) {
+          // Adding index_diff to last_index_value would overflow.
+          return false;
+        }
       }
       const int32_t index_value = index_diff + last_index_value;
-      if (index_value < 0) {
-        // Negative indices are not allowed.
-        return false;
-      }
       face[j] = index_value;
       last_index_value = index_value;
     }
diff --git a/contrib/draco/src/draco/compression/point_cloud/algorithms/float_points_tree_decoder.h b/contrib/draco/src/draco/compression/point_cloud/algorithms/float_points_tree_decoder.h
index 4f09ed2c3..57597bb58 100644
--- a/contrib/draco/src/draco/compression/point_cloud/algorithms/float_points_tree_decoder.h
+++ b/contrib/draco/src/draco/compression/point_cloud/algorithms/float_points_tree_decoder.h
@@ -76,7 +76,7 @@ class FloatPointsTreeDecoder {
 
   static const uint32_t version_ = 3;
   QuantizationInfo qinfo_;
-  PointCloudCompressionMethod method_;
+  int8_t method_;
   uint32_t num_points_;
   uint32_t compression_level_;
 
@@ -113,7 +113,7 @@ bool FloatPointsTreeDecoder::DecodePointCloud(DecoderBuffer *buffer,
       return false;
     }
 
-    method_ = static_cast<PointCloudCompressionMethod>(method_number);
+    method_ = method_number;
 
     if (method_ == KDTREE) {
       if (!DecodePointCloudKdTreeInternal(buffer, &qpoints)) {
diff --git a/contrib/draco/src/draco/core/draco_version.h b/contrib/draco/src/draco/core/draco_version.h
index 88856447f..9e9dedbd4 100644
--- a/contrib/draco/src/draco/core/draco_version.h
+++ b/contrib/draco/src/draco/core/draco_version.h
@@ -18,7 +18,7 @@
 namespace draco {
 
 // Draco version is comprised of <major>.<minor>.<revision>.
-static const char kDracoVersion[] = "1.5.6";
+static const char kDracoVersion[] = "1.5.7";
 
 }  // namespace draco
 
diff --git a/contrib/draco/src/draco/core/macros.h b/contrib/draco/src/draco/core/macros.h
index a31e7c44b..f6eeda0a4 100644
--- a/contrib/draco/src/draco/core/macros.h
+++ b/contrib/draco/src/draco/core/macros.h
@@ -34,12 +34,6 @@
 #include <iostream>
 namespace draco {
 
-#ifndef DISALLOW_COPY_AND_ASSIGN
-#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  TypeName(const TypeName &) = delete;     \
-  void operator=(const TypeName &) = delete;
-#endif  // DISALLOW_COPY_AND_ASSIGN
-
 #ifndef FALLTHROUGH_INTENDED
 #if defined(__clang__) && defined(__has_warning)
 #if __has_feature(cxx_attributes) && __has_warning("-Wimplicit-fallthrough")
@@ -67,6 +61,12 @@ namespace draco {
 
 }  // namespace draco
 
+#ifndef DISALLOW_COPY_AND_ASSIGN
+#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
+  TypeName(const TypeName &) = delete;     \
+  void operator=(const TypeName &) = delete;
+#endif  // DISALLOW_COPY_AND_ASSIGN
+
 #ifdef DRACO_DEBUG
 #define DRACO_DCHECK(x) (assert(x));
 #define DRACO_DCHECK_EQ(a, b) assert((a) == (b));
diff --git a/contrib/draco/src/draco/io/file_writer_utils.cc b/contrib/draco/src/draco/io/file_writer_utils.cc
index 3dab80bbf..08ca4c29c 100644
--- a/contrib/draco/src/draco/io/file_writer_utils.cc
+++ b/contrib/draco/src/draco/io/file_writer_utils.cc
@@ -38,11 +38,10 @@ bool DirectoryExists(const std::string &path_arg) {
   struct stat path_stat;
   std::string path = path_arg;
 
-#if defined(_WIN32) && not defined(__MINGW32__)
+#if defined(_WIN32) && !defined(__MINGW32__)
   // Avoid a silly windows issue: stat() will fail on a drive letter missing the
-  // trailing slash.
-  if (path.size() > 0 && path[path.size()] != '\\' &&
-      path[path.size()] != '/') {
+  // trailing slash. To keep it simple, append a path separator to all paths.
+  if (!path.empty() && path.back() != '\\' && path.back() != '/') {
     path.append("\\");
   }
 #endif
@@ -68,9 +67,7 @@ bool CheckAndCreatePathForFile(const std::string &filename) {
   const ghc::filesystem::path ghc_path(path);
   ghc::filesystem::create_directories(ghc_path);
 #endif  // DRACO_TRANSCODER_SUPPORTED
-  const bool directory_exists = DirectoryExists(path);
-
-  return directory_exists;
+  return DirectoryExists(path);
 }
 
 }  // namespace draco
diff --git a/contrib/draco/src/draco/io/gltf_decoder.cc b/contrib/draco/src/draco/io/gltf_decoder.cc
index 521b7524f..ebfd3ec89 100644
--- a/contrib/draco/src/draco/io/gltf_decoder.cc
+++ b/contrib/draco/src/draco/io/gltf_decoder.cc
@@ -15,6 +15,9 @@
 #include "draco/io/gltf_decoder.h"
 
 #ifdef DRACO_TRANSCODER_SUPPORTED
+#include <array>
+#include <cstdint>
+#include <map>
 #include <memory>
 #include <set>
 #include <string>
@@ -27,11 +30,15 @@
 #include "draco/core/hash_utils.h"
 #include "draco/core/status.h"
 #include "draco/core/status_or.h"
+#include "draco/io/file_utils.h"
+#include "draco/io/texture_io.h"
 #include "draco/io/tiny_gltf_utils.h"
 #include "draco/material/material_library.h"
 #include "draco/mesh/mesh.h"
 #include "draco/mesh/mesh_features.h"
 #include "draco/mesh/triangle_soup_mesh_builder.h"
+#include "draco/metadata/geometry_metadata.h"
+#include "draco/metadata/metadata.h"
 #include "draco/metadata/property_table.h"
 #include "draco/point_cloud/point_cloud_builder.h"
 #include "draco/scene/scene_indices.h"
@@ -80,6 +87,10 @@ GeometryAttribute::Type GltfAttributeToDracoAttribute(
   } else if (attribute_name.rfind("_FEATURE_ID_") == 0) {
     // Feature ID attribute like _FEATURE_ID_5 from EXT_mesh_features extension.
     return GeometryAttribute::GENERIC;
+  } else if (attribute_name.rfind('_', 0) == 0) {
+    // Feature ID attribute like _DIRECTION from EXT_structural_metadata
+    // extension whose name begins with an underscore.
+    return GeometryAttribute::GENERIC;
   }
   return GeometryAttribute::INVALID;
 }
@@ -302,7 +313,7 @@ Status CopyDataFromBufferView(const tinygltf::Model &model, int buffer_view_id,
   const uint8_t *const data_start = buffer.data.data() + buffer_view.byteOffset;
 
   data->resize(buffer_view.byteLength);
-  memcpy(&(*data)[0], data_start, buffer_view.byteLength);
+  memcpy(data->data(), data_start, buffer_view.byteLength);
   return OkStatus();
 }
 
@@ -540,6 +551,9 @@ StatusOr<std::unique_ptr<Mesh>> GltfDecoder::BuildMesh() {
     DRACO_RETURN_IF_ERROR(AddAttributesToDracoMesh(&pb_));
   }
 
+  // Clear attribute indices before populating attributes in |mb_| or |pb_|.
+  feature_id_attribute_indices_.clear();
+
   for (const tinygltf::Scene &scene : gltf_model_.scenes) {
     for (int i = 0; i < scene.nodes.size(); ++i) {
       const Eigen::Matrix4d parent_matrix = Eigen::Matrix4d::Identity();
@@ -548,43 +562,59 @@ StatusOr<std::unique_ptr<Mesh>> GltfDecoder::BuildMesh() {
   }
   DRACO_ASSIGN_OR_RETURN(
       std::unique_ptr<Mesh> mesh,
-      BuildMeshFromBuilder(total_face_indices_count_ > 0, &mb_, &pb_));
+      BuildMeshFromBuilder(total_face_indices_count_ > 0, &mb_, &pb_,
+                           deduplicate_vertices_));
 
   DRACO_RETURN_IF_ERROR(CopyTextures<Mesh>(mesh.get()));
   SetAttributePropertiesOnDracoMesh(mesh.get());
   DRACO_RETURN_IF_ERROR(AddMaterialsToDracoMesh(mesh.get()));
-  DRACO_RETURN_IF_ERROR(AddMeshFeaturesToDracoMesh(mesh.get()));
+  DRACO_RETURN_IF_ERROR(AddPrimitiveExtensionsToDracoMesh(mesh.get()));
   DRACO_RETURN_IF_ERROR(AddStructuralMetadataToGeometry(mesh.get()));
   MoveNonMaterialTextures(mesh.get());
+  DRACO_RETURN_IF_ERROR(AddAssetMetadata(mesh.get()));
   return mesh;
 }
 
-Status GltfDecoder::AddMeshFeaturesToDracoMesh(Mesh *mesh) {
+Status GltfDecoder::AddPrimitiveExtensionsToDracoMesh(Mesh *mesh) {
   for (const tinygltf::Scene &scene : gltf_model_.scenes) {
     for (int i = 0; i < scene.nodes.size(); ++i) {
-      DRACO_RETURN_IF_ERROR(AddMeshFeaturesToDracoMesh(scene.nodes[i], mesh));
+      DRACO_RETURN_IF_ERROR(
+          AddPrimitiveExtensionsToDracoMesh(scene.nodes[i], mesh));
     }
   }
   return OkStatus();
 }
 
-Status GltfDecoder::AddMeshFeaturesToDracoMesh(int node_index, Mesh *mesh) {
+Status GltfDecoder::AddPrimitiveExtensionsToDracoMesh(int node_index,
+                                                      Mesh *mesh) {
   const tinygltf::Node &node = gltf_model_.nodes[node_index];
   if (node.mesh >= 0) {
     const tinygltf::Mesh &gltf_mesh = gltf_model_.meshes[node.mesh];
     for (const auto &primitive : gltf_mesh.primitives) {
-      // Decode mesh feature ID sets if present in this primitive.
-      DRACO_RETURN_IF_ERROR(DecodeMeshFeatures(
+      // Decode extensions present in this primitive.
+      DRACO_RETURN_IF_ERROR(AddPrimitiveExtensionsToDracoMesh(
           primitive, &mesh->GetMaterialLibrary().MutableTextureLibrary(),
           mesh));
     }
   }
   for (int i = 0; i < node.children.size(); ++i) {
-    DRACO_RETURN_IF_ERROR(AddMeshFeaturesToDracoMesh(node.children[i], mesh));
+    DRACO_RETURN_IF_ERROR(
+        AddPrimitiveExtensionsToDracoMesh(node.children[i], mesh));
   }
   return OkStatus();
 }
 
+Status GltfDecoder::AddPrimitiveExtensionsToDracoMesh(
+    const tinygltf::Primitive &primitive, TextureLibrary *texture_library,
+    Mesh *mesh) {
+  // Decode mesh feature ID sets if present in this |primitive|.
+  DRACO_RETURN_IF_ERROR(DecodeMeshFeatures(primitive, texture_library, mesh));
+
+  // Decode structural metadata if present in this |primitive|.
+  DRACO_RETURN_IF_ERROR(DecodeStructuralMetadata(primitive, mesh));
+  return OkStatus();
+}
+
 Status GltfDecoder::CheckUnsupportedFeatures() {
   // Check for morph targets.
   for (const auto &mesh : gltf_model_.meshes) {
@@ -853,6 +883,12 @@ Status GltfDecoder::AddAttributesToDracoMesh(BuilderT *builder) {
       attribute_name_to_draco_mesh_attribute_id_[attribute.first] = -1;
       continue;
     }
+    // TODO(vytyaz): Check that when glTF is decoded into a single draco::Mesh
+    // the feature ID vertex attributes are consistent with geometry, e.g., the
+    // number of values in attribute with name _FEATURE_ID_5 accumulated from
+    // all primitives must be equal to the accumulated number of mesh vertices.
+    // Furthermore, accumulated attributes should probably come from mesh
+    // feature ID sets with the same labels.
     DRACO_ASSIGN_OR_RETURN(
         const int att_id,
         AddAttribute(draco_att_type, attribute.second.component_type,
@@ -875,6 +911,13 @@ Status GltfDecoder::AddAttributesToDracoMesh(BuilderT *builder) {
   return OkStatus();
 }
 
+// Returns the index from a feature ID vertex attribute name like _FEATURE_ID_5.
+int GetIndexFromFeatureIdAttributeName(const std::string &name) {
+  const std::string prefix = "_FEATURE_ID_";
+  const std::string number = name.substr(prefix.length());
+  return std::stoi(number);
+}
+
 template <typename BuilderT>
 Status GltfDecoder::AddAttributeValuesToBuilder(
     const std::string &attribute_name, const tinygltf::Accessor &accessor,
@@ -903,6 +946,16 @@ Status GltfDecoder::AddAttributeValuesToBuilder(
     DRACO_RETURN_IF_ERROR(AddFeatureIdToBuilder(
         accessor, indices_data, att_id, number_of_elements, reverse_winding,
         attribute_name, builder));
+    // Populate map from the index in attribute name like _FEATURE_ID_5 to the
+    // attribute index in the builder.
+    const int index = GetIndexFromFeatureIdAttributeName(attribute_name);
+    feature_id_attribute_indices_[index] = att_id;
+  } else if (attribute_name.rfind('_', 0) == 0) {
+    // This is a structural metadata property attribute with a name like
+    // _DIRECTION that begins with an underscore.
+    DRACO_RETURN_IF_ERROR(AddPropertyAttributeToBuilder(
+        accessor, indices_data, att_id, number_of_elements, reverse_winding,
+        attribute_name, builder));
   } else {
     DRACO_RETURN_IF_ERROR(AddAttributeDataByTypes(accessor, indices_data,
                                                   att_id, number_of_elements,
@@ -987,12 +1040,22 @@ Status GltfDecoder::AddFeatureIdToBuilder(
   DRACO_RETURN_IF_ERROR(AddAttributeDataByTypes(accessor, indices_data, att_id,
                                                 number_of_elements,
                                                 reverse_winding, builder));
+  return OkStatus();
+}
 
-  // Store feature ID attribute name with index like _FEATURE_ID_5 in Draco
-  // attribute metadata.
-  std::unique_ptr<AttributeMetadata> metadata(new draco::AttributeMetadata());
-  metadata->AddEntryString("attribute_name", attribute_name);
-  builder->AddAttributeMetadata(att_id, std::move(metadata));
+template <typename BuilderT>
+Status GltfDecoder::AddPropertyAttributeToBuilder(
+    const tinygltf::Accessor &accessor,
+    const std::vector<uint32_t> &indices_data, int att_id,
+    int number_of_elements, bool reverse_winding,
+    const std::string &attribute_name, BuilderT *builder) {
+  // Set property attribute values to mesh.
+  DRACO_RETURN_IF_ERROR(AddAttributeDataByTypes(accessor, indices_data, att_id,
+                                                number_of_elements,
+                                                reverse_winding, builder));
+
+  // Store property attribute name like _DIRECTION in Draco attribute.
+  builder->SetAttributeName(att_id, attribute_name);
   return OkStatus();
 }
 
@@ -1277,7 +1340,7 @@ Status GltfDecoder::AddMaterialsToDracoMesh(Mesh *mesh) {
   bool is_normal_map_used = false;
 
   int default_material_index = -1;
-  const auto it = gltf_primitive_material_to_draco_material_.find(-1);
+  auto it = gltf_primitive_material_to_draco_material_.find(-1);
   if (it != gltf_primitive_material_to_draco_material_.end()) {
     default_material_index = it->second;
   }
@@ -1286,14 +1349,19 @@ Status GltfDecoder::AddMaterialsToDracoMesh(Mesh *mesh) {
   for (int input_material_index = 0;
        input_material_index < gltf_model_.materials.size();
        ++input_material_index) {
+    it = gltf_primitive_material_to_draco_material_.find(input_material_index);
+    if (it == gltf_primitive_material_to_draco_material_.end()) {
+      continue;
+    }
+    output_material_index = it->second;
     if (default_material_index == input_material_index) {
       // Insert a default material here for primitives that did not have a
       // material index.
-      mesh->GetMaterialLibrary().MutableMaterial(output_material_index++);
+      mesh->GetMaterialLibrary().MutableMaterial(output_material_index);
     }
 
     Material *const output_material =
-        mesh->GetMaterialLibrary().MutableMaterial(output_material_index++);
+        mesh->GetMaterialLibrary().MutableMaterial(output_material_index);
     DRACO_RETURN_IF_ERROR(
         AddGltfMaterial(input_material_index, output_material));
     if (output_material->GetTextureMapByType(
@@ -1415,6 +1483,7 @@ Status GltfDecoder::DecodeGltfToScene() {
   DRACO_RETURN_IF_ERROR(AddMaterialsToScene());
   DRACO_RETURN_IF_ERROR(AddSkinsToScene());
   MoveNonMaterialTextures(scene_.get());
+  DRACO_RETURN_IF_ERROR(AddAssetMetadata(scene_.get()));
 
   return OkStatus();
 }
@@ -1511,172 +1580,278 @@ Status GltfDecoder::AddStructuralMetadataToGeometry(GeometryT *geometry) {
   }
   const tinygltf::Value::Object &o = e->second.Get<tinygltf::Value::Object>();
 
-  // Decode property table schema.
-  {
-    const auto &value = o.find("schema");
-    if (value == o.end()) {
-      return ErrorStatus("Structural metadata extension has no schema.");
-    }
-    const tinygltf::Value &object = value->second;
-    if (!object.IsObject()) {
-      return ErrorStatus("Structural metadata extension schema is malformed.");
-    }
+  // Decode structural metadata schema.
+  DRACO_RETURN_IF_ERROR(AddStructuralMetadataSchemaToGeometry(o, geometry));
 
-    // Decodes tinygltf::Value into PropertyTable::Schema::Object.
-    struct SchemaParser {
-      static Status Parse(const tinygltf::Value &value,
-                          PropertyTable::Schema::Object *object) {
-        switch (value.Type()) {
-          case tinygltf::OBJECT_TYPE: {
-            for (auto &it : value.Get<tinygltf::Value::Object>()) {
-              object->SetObjects().emplace_back(it.first);
-              DRACO_RETURN_IF_ERROR(
-                  Parse(it.second, &object->SetObjects().back()));
-            }
-          } break;
-          case tinygltf::ARRAY_TYPE: {
-            for (int i = 0; i < value.ArrayLen(); ++i) {
-              object->SetArray().emplace_back();
-              DRACO_RETURN_IF_ERROR(
-                  Parse(value.Get(i), &object->SetArray().back()));
-            }
-          } break;
-          case tinygltf::STRING_TYPE:
-            object->SetString(value.Get<std::string>());
-            break;
-          case tinygltf::INT_TYPE:
-            object->SetInteger(value.Get<int>());
-            break;
-          case tinygltf::BOOL_TYPE:
-            object->SetBoolean(value.Get<bool>());
-            break;
-          case tinygltf::REAL_TYPE:
-          case tinygltf::BINARY_TYPE:
-          case tinygltf::NULL_TYPE:
-          default:
-            // Not used in the schema JSON.
-            return ErrorStatus("Unsupported JSON type in schema.");
-        }
-        return OkStatus();
-      }
-    };
+  // Decode structural metadata property tables.
+  DRACO_RETURN_IF_ERROR(AddPropertyTablesToGeometry(o, geometry));
 
-    // Parse property table schema and set it to |geometry|.
-    PropertyTable::Schema schema;
-    DRACO_RETURN_IF_ERROR(SchemaParser::Parse(object, &schema.json));
-    geometry->GetStructuralMetadata().SetPropertyTableSchema(schema);
+  // Decode structural metadata property attributes.
+  DRACO_RETURN_IF_ERROR(AddPropertyAttributesToGeometry(o, geometry));
+
+  // Check that structural metadata has either property tables, or property
+  // attribute, or property textures (in the future).
+  if (geometry->GetStructuralMetadata().NumPropertyTables() == 0 &&
+      geometry->GetStructuralMetadata().NumPropertyAttributes() == 0) {
+    return ErrorStatus(
+        "Structural metadata has no property tables, no property attributes.");
+  }
+  return OkStatus();
+}
+
+template <typename GeometryT>
+Status GltfDecoder::AddStructuralMetadataSchemaToGeometry(
+    const tinygltf::Value::Object &extension, GeometryT *geometry) {
+  const auto &value = extension.find("schema");
+  if (value == extension.end()) {
+    return ErrorStatus("Structural metadata extension has no schema.");
+  }
+  const tinygltf::Value &object = value->second;
+  if (!object.IsObject()) {
+    return ErrorStatus("Structural metadata extension schema is malformed.");
   }
 
-  // Decode property tables.
-  {
-    const auto &tables = o.find("propertyTables");
-    if (tables == o.end()) {
-      return ErrorStatus(
-          "Structural metadata extension has no property tables.");
+  // Decodes tinygltf::Value into StructuralMetadataSchema::Object.
+  struct SchemaParser {
+    static Status Parse(const tinygltf::Value &value,
+                        StructuralMetadataSchema::Object *object) {
+      switch (value.Type()) {
+        case tinygltf::OBJECT_TYPE: {
+          for (auto &it : value.Get<tinygltf::Value::Object>()) {
+            object->SetObjects().emplace_back(it.first);
+            DRACO_RETURN_IF_ERROR(
+                Parse(it.second, &object->SetObjects().back()));
+          }
+        } break;
+        case tinygltf::ARRAY_TYPE: {
+          for (int i = 0; i < value.ArrayLen(); ++i) {
+            object->SetArray().emplace_back();
+            DRACO_RETURN_IF_ERROR(
+                Parse(value.Get(i), &object->SetArray().back()));
+          }
+        } break;
+        case tinygltf::STRING_TYPE:
+          object->SetString(value.Get<std::string>());
+          break;
+        case tinygltf::INT_TYPE:
+          object->SetInteger(value.Get<int>());
+          break;
+        case tinygltf::BOOL_TYPE:
+          object->SetBoolean(value.Get<bool>());
+          break;
+        case tinygltf::REAL_TYPE:
+        case tinygltf::BINARY_TYPE:
+        case tinygltf::NULL_TYPE:
+        default:
+          // Not used in the schema JSON.
+          return ErrorStatus("Unsupported JSON type in schema.");
+      }
+      return OkStatus();
     }
-    const tinygltf::Value &tables_array = tables->second;
-    if (!tables_array.IsArray()) {
-      return ErrorStatus("Property tables array is malformed.");
+  };
+
+  // Parse schema of the structural metadata and set it to |geometry|.
+  StructuralMetadataSchema schema;
+  DRACO_RETURN_IF_ERROR(SchemaParser::Parse(object, &schema.json));
+  geometry->GetStructuralMetadata().SetSchema(schema);
+  return OkStatus();
+}
+
+template <typename GeometryT>
+Status GltfDecoder::AddPropertyTablesToGeometry(
+    const tinygltf::Value::Object &extension, GeometryT *geometry) {
+  const auto &tables = extension.find("propertyTables");
+  if (tables == extension.end()) {
+    // Structural metadata has no property tables.
+    return OkStatus();
+  }
+  const tinygltf::Value &tables_array = tables->second;
+  if (!tables_array.IsArray()) {
+    return ErrorStatus("Property tables array is malformed.");
+  }
+
+  // Loop over all property tables.
+  for (int i = 0; i < tables_array.Size(); i++) {
+    // Create a property table and populate it below.
+    std::unique_ptr<PropertyTable> property_table(new PropertyTable());
+
+    const auto &object = tables_array.Get(i);
+    if (!object.IsObject()) {
+      return ErrorStatus("Property table is malformed.");
+    }
+    const auto o = object.Get<tinygltf::Value::Object>();
+
+    // The "class" property is required.
+    bool success;
+    std::string str_value;
+    DRACO_ASSIGN_OR_RETURN(success, DecodeString("class", o, &str_value));
+    if (success) {
+      property_table->SetClass(str_value);
+    } else {
+      return ErrorStatus("Property class is malformed.");
     }
 
-    // Loop over all property tables.
-    for (int i = 0; i < tables_array.Size(); i++) {
-      // Create a property table and populate it below.
-      std::unique_ptr<PropertyTable> property_table(new PropertyTable());
+    // The "count" property is required.
+    int int_value;
+    DRACO_ASSIGN_OR_RETURN(success, DecodeInt("count", o, &int_value));
+    if (success) {
+      property_table->SetCount(int_value);
+    } else {
+      return ErrorStatus("Property count is malformed.");
+    }
 
-      const auto &object = tables_array.Get(i);
-      if (!object.IsObject()) {
+    // The "name" property is optional.
+    DRACO_ASSIGN_OR_RETURN(success, DecodeString("name", o, &str_value));
+    if (success) {
+      property_table->SetName(str_value);
+    }
+
+    // Decode property table properties (columns).
+    {
+      constexpr char kName[] = "properties";
+      if (!object.Has(kName)) {
         return ErrorStatus("Property table is malformed.");
       }
-      const auto o = object.Get<tinygltf::Value::Object>();
-
-      // The "class" property is required.
-      bool success;
-      std::string str_value;
-      DRACO_ASSIGN_OR_RETURN(success, DecodeString("class", o, &str_value));
-      if (success) {
-        property_table->SetClass(str_value);
-      } else {
-        return ErrorStatus("Property class is malformed.");
+      const tinygltf::Value &value = object.Get(kName);
+      if (!value.IsObject()) {
+        return ErrorStatus("Property table properties property is malformed.");
       }
 
-      // The "count" property is required.
-      int int_value;
-      DRACO_ASSIGN_OR_RETURN(success, DecodeInt("count", o, &int_value));
-      if (success) {
-        property_table->SetCount(int_value);
-      } else {
-        return ErrorStatus("Property count is malformed.");
-      }
+      // Loop over property table properties.
+      for (const auto &key : value.Keys()) {
+        // Create a property table property and populate it below.
+        std::unique_ptr<PropertyTable::Property> property(
+            new PropertyTable::Property());
 
-      // The "name" property is optional.
-      DRACO_ASSIGN_OR_RETURN(success, DecodeString("name", o, &str_value));
-      if (success) {
-        property_table->SetName(str_value);
-      }
-
-      // Decode property table properties (columns).
-      {
-        constexpr char kName[] = "properties";
-        if (!object.Has(kName)) {
-          return ErrorStatus("Property table is malformed.");
+        const auto &property_object = value.Get(key);
+        if (!property_object.IsObject()) {
+          return ErrorStatus("Property entry is malformed.");
         }
-        const tinygltf::Value &value = object.Get(kName);
-        if (!value.IsObject()) {
-          return ErrorStatus(
-              "Property table properties property is malformed.");
+        property->SetName(key);
+        const auto o = property_object.Get<tinygltf::Value::Object>();
+
+        // The "values" property is required.
+        DRACO_ASSIGN_OR_RETURN(success, DecodePropertyTableData(
+                                            "values", o, &property->GetData()));
+        if (!success) {
+          return ErrorStatus("Property values property is malformed.");
         }
 
-        // Loop over property table properties.
-        for (const auto &key : value.Keys()) {
-          // Create a property table property and populate it below.
-          std::unique_ptr<PropertyTable::Property> property(
-              new PropertyTable::Property());
-
-          const auto &property_object = value.Get(key);
-          if (!property_object.IsObject()) {
-            return ErrorStatus("Property entry is malformed.");
-          }
-          property->SetName(key);
-          const auto o = property_object.Get<tinygltf::Value::Object>();
-
-          // The "values" property is required.
-          DRACO_ASSIGN_OR_RETURN(
-              success,
-              DecodePropertyTableData("values", o, &property->GetData()));
-          if (!success) {
-            return ErrorStatus("Property values property is malformed.");
-          }
-
-          // All other properties are not required.
-          DRACO_ASSIGN_OR_RETURN(
-              success, DecodeString("stringOffsetType", o, &str_value));
-          if (success) {
-            property->GetStringOffsets().type = str_value;
-          }
-          DRACO_ASSIGN_OR_RETURN(
-              success, DecodeString("arrayOffsetType", o, &str_value));
-          if (success) {
-            property->GetArrayOffsets().type = str_value;
-          }
-          DRACO_ASSIGN_OR_RETURN(
-              success,
-              DecodePropertyTableData("arrayOffsets", o,
-                                      &property->GetArrayOffsets().data));
-          DRACO_ASSIGN_OR_RETURN(
-              success,
-              DecodePropertyTableData("stringOffsets", o,
-                                      &property->GetStringOffsets().data));
-
-          // Add property to the property table.
-          property_table->AddProperty(std::move(property));
+        // All other properties are not required.
+        DRACO_ASSIGN_OR_RETURN(success,
+                               DecodeString("stringOffsetType", o, &str_value));
+        if (success) {
+          property->GetStringOffsets().type = str_value;
         }
-      }
+        DRACO_ASSIGN_OR_RETURN(success,
+                               DecodeString("arrayOffsetType", o, &str_value));
+        if (success) {
+          property->GetArrayOffsets().type = str_value;
+        }
+        DRACO_ASSIGN_OR_RETURN(
+            success, DecodePropertyTableData(
+                         "arrayOffsets", o, &property->GetArrayOffsets().data));
+        DRACO_ASSIGN_OR_RETURN(
+            success,
+            DecodePropertyTableData("stringOffsets", o,
+                                    &property->GetStringOffsets().data));
 
-      // Add property table to structural metadata.
-      geometry->GetStructuralMetadata().AddPropertyTable(
-          std::move(property_table));
+        // Add property to the property table.
+        property_table->AddProperty(std::move(property));
+      }
     }
+
+    // Add property table to structural metadata.
+    geometry->GetStructuralMetadata().AddPropertyTable(
+        std::move(property_table));
+  }
+  return OkStatus();
+}
+
+template <typename GeometryT>
+Status GltfDecoder::AddPropertyAttributesToGeometry(
+    const tinygltf::Value::Object &extension, GeometryT *geometry) {
+  const auto &attributes = extension.find("propertyAttributes");
+  if (attributes == extension.end()) {
+    // Structural metadata has no property attributes.
+    return OkStatus();
+  }
+  const tinygltf::Value &attributes_array = attributes->second;
+  if (!attributes_array.IsArray()) {
+    return ErrorStatus("Property attributes array is malformed.");
+  }
+
+  // Loop over all property attributes.
+  for (int i = 0; i < attributes_array.Size(); i++) {
+    // Create a property attribute and populate it below.
+    std::unique_ptr<PropertyAttribute> property_attribute(
+        new PropertyAttribute());
+
+    const auto &object = attributes_array.Get(i);
+    if (!object.IsObject()) {
+      return ErrorStatus("Property attribute is malformed.");
+    }
+    const auto o = object.Get<tinygltf::Value::Object>();
+
+    // The "class" property is required.
+    bool success;
+    std::string str_value;
+    DRACO_ASSIGN_OR_RETURN(success, DecodeString("class", o, &str_value));
+    if (success) {
+      property_attribute->SetClass(str_value);
+    } else {
+      return ErrorStatus("Property class is malformed.");
+    }
+
+    // The "name" property is optional.
+    DRACO_ASSIGN_OR_RETURN(success, DecodeString("name", o, &str_value));
+    if (success) {
+      property_attribute->SetName(str_value);
+    }
+
+    // Decode property attribute properties.
+    {
+      constexpr char kName[] = "properties";
+      if (!object.Has(kName)) {
+        return ErrorStatus("Property attribute is malformed.");
+      }
+      const tinygltf::Value &value = object.Get(kName);
+      if (!value.IsObject()) {
+        return ErrorStatus(
+            "Property attribute properties property is malformed.");
+      }
+
+      // Loop over property attribute properties.
+      for (const auto &key : value.Keys()) {
+        // Create a property attribute property and populate it below.
+        std::unique_ptr<PropertyAttribute::Property> property(
+            new PropertyAttribute::Property());
+
+        // Decode property name corresponding to a schema class property name.
+        const auto &property_object = value.Get(key);
+        if (!property_object.IsObject()) {
+          return ErrorStatus("Property entry is malformed.");
+        }
+        property->SetName(key);
+        const auto o = property_object.Get<tinygltf::Value::Object>();
+
+        // The "attribute" property is required.
+        DRACO_ASSIGN_OR_RETURN(success,
+                               DecodeString("attribute", o, &str_value));
+        if (success) {
+          property->SetAttributeName(str_value);
+        } else {
+          return ErrorStatus("Property attribute is malformed.");
+        }
+
+        // Add property to the property attribute.
+        property_attribute->AddProperty(std::move(property));
+      }
+    }
+
+    // Add property attribute to structural metadata.
+    geometry->GetStructuralMetadata().AddPropertyAttribute(
+        std::move(property_attribute));
   }
   return OkStatus();
 }
@@ -1829,6 +2004,9 @@ Status GltfDecoder::DecodePrimitiveForScene(
     pb.Start(number_of_points);
   }
 
+  // Clear attribute indices before populating attributes in |mb| or |pb|.
+  feature_id_attribute_indices_.clear();
+
   std::set<int32_t> normalized_attributes;
   for (const auto &attribute : primitive.attributes) {
     if (attribute.second >= gltf_model_.accessors.size()) {
@@ -1869,15 +2047,16 @@ Status GltfDecoder::DecodePrimitiveForScene(
 
   DRACO_ASSIGN_OR_RETURN(
       std::unique_ptr<Mesh> mesh,
-      BuildMeshFromBuilder(primitive.mode == TINYGLTF_MODE_TRIANGLES, &mb,
-                           &pb));
+      BuildMeshFromBuilder(primitive.mode == TINYGLTF_MODE_TRIANGLES, &mb, &pb,
+                           deduplicate_vertices_));
 
   // Set all normalized flags for appropriate attributes.
   for (const int32_t att_id : normalized_attributes) {
     mesh->attribute(att_id)->set_normalized(true);
   }
-  // Decode mesh feature ID sets if present in this primitive.
-  DRACO_RETURN_IF_ERROR(DecodeMeshFeatures(
+
+  // Decode extensions present in this primitive.
+  DRACO_RETURN_IF_ERROR(AddPrimitiveExtensionsToDracoMesh(
       primitive, &scene_->GetMaterialLibrary().MutableTextureLibrary(),
       mesh.get()));
 
@@ -1973,6 +2152,33 @@ Status GltfDecoder::DecodeMeshFeatures(const tinygltf::Primitive &primitive,
   return OkStatus();
 }
 
+Status GltfDecoder::DecodeStructuralMetadata(
+    const tinygltf::Primitive &primitive, Mesh *mesh) {
+  const auto &e = primitive.extensions.find("EXT_structural_metadata");
+  if (e == primitive.extensions.end()) {
+    return OkStatus();
+  }
+  std::vector<int> property_attributes_indices;
+  DRACO_RETURN_IF_ERROR(DecodeStructuralMetadata(
+      e->second.Get<tinygltf::Value::Object>(), &property_attributes_indices));
+  for (const int pai : property_attributes_indices) {
+    const int index = mesh->AddPropertyAttributesIndex(pai);
+    if (scene_ == nullptr) {
+      // If we are decoding to a mesh, we need to restrict the property
+      // attributes indices to the primitive's material.
+      // TODO(ostava): This will not work properly when two primitives share the
+      // same material but have different property attributes indices. We will
+      // need to duplicate the materials in this case.
+      const auto mat_it =
+          gltf_primitive_material_to_draco_material_.find(primitive.material);
+      if (mat_it != gltf_primitive_material_to_draco_material_.end()) {
+        mesh->AddPropertyAttributesIndexMaterialMask(index, mat_it->second);
+      }
+    }
+  }
+  return OkStatus();
+}
+
 Status GltfDecoder::DecodeMeshFeatures(
     const tinygltf::Value::Object &extension, TextureLibrary *texture_library,
     std::vector<std::unique_ptr<MeshFeatures>> *mesh_features) {
@@ -2055,7 +2261,11 @@ Status GltfDecoder::DecodeMeshFeatures(
         if (!value.IsInt()) {
           return ErrorStatus("Attribute property is malformed.");
         }
-        features.SetAttributeIndex(value.Get<int>());
+        // Convert index in feature ID vertex attribute name like _FEATURE_ID_5
+        // to attribute index in draco::Mesh.
+        const int att_name_index = value.Get<int>();
+        const int att_index = feature_id_attribute_indices_[att_name_index];
+        features.SetAttributeIndex(att_index);
       }
     }
     {
@@ -2066,7 +2276,7 @@ Status GltfDecoder::DecodeMeshFeatures(
           return ErrorStatus("Texture property is malformed.");
         }
 
-        // Decode texture contining mesh feature IDs into the |features| object
+        // Decode texture containing mesh feature IDs into the |features| object
         // via a temporary |material| object.
         Material material(texture_library);
         const auto &container_object = object.Get<tinygltf::Value::Object>();
@@ -2113,6 +2323,32 @@ Status GltfDecoder::DecodeMeshFeatures(
   return OkStatus();
 }
 
+Status GltfDecoder::DecodeStructuralMetadata(
+    const tinygltf::Value::Object &extension,
+    std::vector<int> *property_attributes) {
+  // Decode all structural metadata from JSON like this in glTF primitive:
+  //   "EXT_structural_metadata": {
+  //     "propertyAttributes": [0]
+  //   }
+  const auto &object = extension.find("propertyAttributes");
+  if (object == extension.end()) {
+    // TODO(vytyaz): Extension might contain property textures, support that.
+    return OkStatus();
+  }
+  const tinygltf::Value &array = object->second;
+  if (!array.IsArray()) {
+    return ErrorStatus("Property attributes array is malformed.");
+  }
+  for (int i = 0; i < array.Size(); i++) {
+    const auto &value = array.Get(i);
+    if (!value.IsInt()) {
+      return ErrorStatus("Property attributes array entry is malformed.");
+    }
+    property_attributes->push_back(value.Get<int>());
+  }
+  return OkStatus();
+}
+
 template <typename BuilderT>
 StatusOr<int> GltfDecoder::AddAttribute(const std::string &attribute_name,
                                         int component_type, int type,
@@ -2150,9 +2386,54 @@ StatusOr<int> GltfDecoder::AddAttribute(GeometryAttribute::Type attribute_type,
   if (att_id < 0) {
     return Status(Status::DRACO_ERROR, "Could not add attribute.");
   }
+
+  // When glTF is loaded as a mesh, initialize color attribute values to white
+  // opaque color. Mesh regions corresponding to glTF primitives without vertex
+  // color will end up having the white color. Since vertex color is used as a
+  // multiplier for material base color in rendering shader, the white color
+  // will keep the model appearance unchanged.
+  if (scene_ == nullptr && attribute_type == GeometryAttribute::Type::COLOR) {
+    SetWhiteVertexColor(att_id, draco_component_type, builder);
+  }
   return att_id;
 }
 
+template <typename BuilderT>
+void GltfDecoder::SetWhiteVertexColor(int color_att_id, draco::DataType type,
+                                      BuilderT *builder) {
+  // Valid glTF vertex color types are float, unsigned byte, and unsigned short.
+  if (type == DT_FLOAT32) {
+    SetWhiteVertexColorOfType<float>(color_att_id, builder);
+  } else if (type == DT_UINT8) {
+    SetWhiteVertexColorOfType<uint8_t>(color_att_id, builder);
+  } else if (type == DT_UINT16) {
+    SetWhiteVertexColorOfType<uint16_t>(color_att_id, builder);
+  }
+}
+
+template <typename ComponentT>
+void GltfDecoder::SetWhiteVertexColorOfType(int color_att_id,
+                                            TriangleSoupMeshBuilder *builder) {
+  // The alpha component will not be copied for the RGB vertex colors.
+  std::array<ComponentT, 4> white{1, 1, 1, 1};
+  const int num_faces = total_face_indices_count_ / 3;
+  for (FaceIndex fi(0); fi < num_faces; fi++) {
+    builder->SetAttributeValuesForFace(color_att_id, fi, white.data(),
+                                       white.data(), white.data());
+  }
+}
+
+template <typename ComponentT>
+void GltfDecoder::SetWhiteVertexColorOfType(int color_att_id,
+                                            PointCloudBuilder *builder) {
+  // The alpha component will not be copied for the RGB vertex colors.
+  std::array<ComponentT, 4> white{1, 1, 1, 1};
+  const int num_points = total_point_indices_count_;
+  for (PointIndex pi(0); pi < num_points; pi++) {
+    builder->SetAttributeValueForPoint(color_att_id, pi, white.data());
+  }
+}
+
 StatusOr<bool> GltfDecoder::CheckKhrTextureTransform(
     const tinygltf::ExtensionMap &extension, TextureTransform *transform) {
   bool transform_set = false;
@@ -2870,12 +3151,13 @@ size_t GltfDecoder::PrimitiveSignature::Hash::operator()(
 }
 
 StatusOr<std::unique_ptr<Mesh>> GltfDecoder::BuildMeshFromBuilder(
-    bool use_mesh_builder, TriangleSoupMeshBuilder *mb, PointCloudBuilder *pb) {
+    bool use_mesh_builder, TriangleSoupMeshBuilder *mb, PointCloudBuilder *pb,
+    bool deduplicate_vertices) {
   std::unique_ptr<Mesh> mesh;
   if (use_mesh_builder) {
     mesh = mb->Finalize();
   } else {
-    std::unique_ptr<PointCloud> pc = pb->Finalize(true);
+    std::unique_ptr<PointCloud> pc = pb->Finalize(deduplicate_vertices);
     if (pc) {
       mesh.reset(new Mesh());
       PointCloud *mesh_pc = mesh.get();
@@ -2888,6 +3170,37 @@ StatusOr<std::unique_ptr<Mesh>> GltfDecoder::BuildMeshFromBuilder(
   return mesh;
 }
 
+Status GltfDecoder::AddAssetMetadata(Scene *scene) {
+  return AddAssetMetadata(&scene->GetMetadata());
+}
+
+Status GltfDecoder::AddAssetMetadata(Mesh *mesh) {
+  Metadata *metadata = nullptr;
+  std::unique_ptr<GeometryMetadata> metadata_owned;
+  // Use metadata of the mesh or create new one.
+  if (mesh->GetMetadata() != nullptr) {
+    metadata = mesh->metadata();
+  } else {
+    metadata_owned = std::make_unique<GeometryMetadata>();
+    metadata = metadata_owned.get();
+  }
+  DRACO_RETURN_IF_ERROR(AddAssetMetadata(metadata));
+  if (metadata_owned != nullptr && metadata->num_entries() > 0) {
+    // Some metadata was added to the |metadata_owned| instance. Add it to the
+    // mesh.
+    mesh->AddMetadata(std::move(metadata_owned));
+  }
+  return OkStatus();
+}
+
+Status GltfDecoder::AddAssetMetadata(Metadata *metadata) {
+  // Store the copyright information in the |metadata|.
+  if (!gltf_model_.asset.copyright.empty()) {
+    metadata->AddEntryString("copyright", gltf_model_.asset.copyright);
+  }
+  return OkStatus();
+}
+
 }  // namespace draco
 
 #endif  // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/io/gltf_decoder.h b/contrib/draco/src/draco/io/gltf_decoder.h
index 2ae12106e..b5fe7e558 100644
--- a/contrib/draco/src/draco/io/gltf_decoder.h
+++ b/contrib/draco/src/draco/io/gltf_decoder.h
@@ -71,6 +71,18 @@ class GltfDecoder {
     gltf_scene_graph_mode_ = mode;
   }
 
+  // By default, the decoder will attempt to deduplicate vertices after decoding
+  // the mesh. This means lower memory usage and smaller output glTFs after
+  // reencoding. However, for very large meshes, this may become an expensive
+  // operation. If that becomes an issue, you might want to consider disabling
+  // deduplication with |SetDeduplicateVertices(false)|.
+  //
+  // Note that at this moment, disabling deduplication works ONLY for point
+  // clouds.
+  void SetDeduplicateVertices(bool deduplicate_vertices) {
+    deduplicate_vertices_ = deduplicate_vertices;
+  }
+
  private:
   // Loads |file_name| into |gltf_model_|. Fills |input_files| with paths to all
   // input files when non-null.
@@ -192,6 +204,18 @@ class GltfDecoder {
                                const std::string &attribute_name,
                                BuilderT *builder);
 
+  // Copies the property attribute data from |accessor| and adds it to a
+  // Draco mesh. |indices_data| is the indices data from the glTF file. |att_id|
+  // is the attribute ID of the mesh feature ID attribute in the Draco mesh.
+  // |number_of_elements| is the number of faces or points this function will
+  // process. |reverse_winding| if set will change the orientation of the data.
+  template <typename BuilderT>
+  Status AddPropertyAttributeToBuilder(
+      const tinygltf::Accessor &accessor,
+      const std::vector<uint32_t> &indices_data, int att_id,
+      int number_of_elements, bool reverse_winding,
+      const std::string &attribute_name, BuilderT *builder);
+
   // Copies the attribute data from |accessor| and adds it to a Draco mesh.
   // This function will transform all of the data by |transform_matrix| before
   // adding the data to the Draco mesh. |indices_data| is the indices data
@@ -220,6 +244,16 @@ class GltfDecoder {
                            const std::vector<T> &data, bool reverse_winding,
                            PointCloudBuilder *builder);
 
+  // Sets colors of for all vertices to white.
+  template <typename BuilderT>
+  void SetWhiteVertexColor(int color_att_id, draco::DataType type,
+                           BuilderT *builder);
+  template <typename ComponentT>
+  void SetWhiteVertexColorOfType(int color_att_id,
+                                 TriangleSoupMeshBuilder *builder);
+  template <typename ComponentT>
+  void SetWhiteVertexColorOfType(int color_att_id, PointCloudBuilder *builder);
+
   // Sets values in |data| into the mesh builder |mb| for |att_id|.
   // |reverse_winding| if set will change the orientation of the data.
   template <typename T>
@@ -306,28 +340,55 @@ class GltfDecoder {
       const tinygltf::Value::Object &extension,
       std::vector<MeshGroup::MaterialsVariantsMapping> *mappings);
 
-  // Decodes glTF mesh feature ID sets from all glTF primitives and adds them to
-  // |mesh|.
-  Status AddMeshFeaturesToDracoMesh(Mesh *mesh);
-
-  // Decodes glTF mesh feature ID sets from glTF primitive in glTF node at
-  // |node_index| and adds them to |mesh|.
-  Status AddMeshFeaturesToDracoMesh(int node_index, Mesh *mesh);
+  // Decode extensions on all primitives of all scenes, such as mesh features
+  // and structural metadata extensions, and add their contents to |mesh|.
+  Status AddPrimitiveExtensionsToDracoMesh(Mesh *mesh);
+  Status AddPrimitiveExtensionsToDracoMesh(int node_index, Mesh *mesh);
+  Status AddPrimitiveExtensionsToDracoMesh(const tinygltf::Primitive &primitive,
+                                           TextureLibrary *texture_library,
+                                           Mesh *mesh);
 
   // Decodes glTF structural metadata from glTF model and adds it to |geometry|.
   template <typename GeometryT>
   Status AddStructuralMetadataToGeometry(GeometryT *geometry);
 
+  // Decodes glTF structural metadata schema from |extension| and adds it to
+  // |geometry|.
+  template <typename GeometryT>
+  Status AddStructuralMetadataSchemaToGeometry(
+      const tinygltf::Value::Object &extension, GeometryT *geometry);
+
+  // Decodes glTF structural metadata property tables from |extension| and adds
+  // them to |geometry|.
+  template <typename GeometryT>
+  Status AddPropertyTablesToGeometry(const tinygltf::Value::Object &extension,
+                                     GeometryT *geometry);
+
+  // Decodes glTF structural metadata property attributes from |extension| and
+  // adds them to |geometry|.
+  template <typename GeometryT>
+  Status AddPropertyAttributesToGeometry(
+      const tinygltf::Value::Object &extension, GeometryT *geometry);
+
   // Decodes glTF mesh feature ID sets from |primitive| and adds them to |mesh|.
   Status DecodeMeshFeatures(const tinygltf::Primitive &primitive,
                             TextureLibrary *texture_library, Mesh *mesh);
 
+  // Decodes glTF structural metadata from |primitive| and adds it to |mesh|.
+  Status DecodeStructuralMetadata(const tinygltf::Primitive &primitive,
+                                  Mesh *mesh);
+
   // Decodes glTF mesh feature ID sets from |extension| and adds them to the
   // |mesh_features| vector.
   Status DecodeMeshFeatures(
       const tinygltf::Value::Object &extension, TextureLibrary *texture_library,
       std::vector<std::unique_ptr<MeshFeatures>> *mesh_features);
 
+  // Decodes glTF structural metadata from |extension| of a glTF primitive and
+  // adds its property attribute indices to the |property_attributes| vector.
+  Status DecodeStructuralMetadata(const tinygltf::Value::Object &extension,
+                                  std::vector<int> *property_attributes);
+
   // Adds an attribute of type |attribute_name| to |builder|. Returns the
   // attribute id.
   template <typename BuilderT>
@@ -427,6 +488,11 @@ class GltfDecoder {
   // Adds the skins to the scene.
   Status AddSkinsToScene();
 
+  // Adds various asset metadata to the scene or mesh.
+  Status AddAssetMetadata(Scene *scene);
+  Status AddAssetMetadata(Mesh *mesh);
+  Status AddAssetMetadata(Metadata *metadata);
+
   // All material and non-material textures (e.g., from EXT_mesh_features) are
   // initially loaded into a texture library inside the the material library.
   // These methods move |non_material_textures| from material texture library
@@ -441,8 +507,8 @@ class GltfDecoder {
   // point cloud builder |pb|. Mesh builder is used if |use_mesh_builder| is set
   // to true.
   static StatusOr<std::unique_ptr<Mesh>> BuildMeshFromBuilder(
-      bool use_mesh_builder, TriangleSoupMeshBuilder *mb,
-      PointCloudBuilder *pb);
+      bool use_mesh_builder, TriangleSoupMeshBuilder *mb, PointCloudBuilder *pb,
+      bool deduplicate_vertices);
 
   // Map of glTF Mesh to Draco scene mesh group.
   std::map<int, MeshGroupIndex> gltf_mesh_to_scene_mesh_group_;
@@ -457,6 +523,10 @@ class GltfDecoder {
   TriangleSoupMeshBuilder mb_;
   PointCloudBuilder pb_;
 
+  // Map from the index in a feature ID vertex attribute name like _FEATURE_ID_5
+  // to the corresponding attribute index in the current geometry builder.
+  std::unordered_map<int, int> feature_id_attribute_indices_;
+
   // Next face index used when adding attribute data to the Draco mesh.
   int next_face_id_;
 
@@ -504,6 +574,9 @@ class GltfDecoder {
   // Selected mode of the decoded scene graph.
   GltfSceneGraphMode gltf_scene_graph_mode_ = GltfSceneGraphMode::TREE;
 
+  // Whether vertices should be deduplicated after loading.
+  bool deduplicate_vertices_ = true;
+
   // Functionality for deduping primitives on decode.
   struct PrimitiveSignature {
     const tinygltf::Primitive &primitive;
diff --git a/contrib/draco/src/draco/io/gltf_decoder_test.cc b/contrib/draco/src/draco/io/gltf_decoder_test.cc
index fade3ee26..6efc06570 100644
--- a/contrib/draco/src/draco/io/gltf_decoder_test.cc
+++ b/contrib/draco/src/draco/io/gltf_decoder_test.cc
@@ -14,9 +14,12 @@
 //
 #include "draco/io/gltf_decoder.h"
 
+#include <array>
 #include <cmath>
+#include <iostream>
 #include <limits>
 #include <memory>
+#include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ -738,17 +741,14 @@ TEST(GltfDecoderTest, TextureTransformTest) {
       "KhronosSampleModels/TextureTransformTest/glTF/TextureTransformTest.gltf";
   const std::unique_ptr<Mesh> mesh(DecodeGltfFile(filename));
   EXPECT_EQ(mesh->GetMaterialLibrary().NumMaterials(), 9);
-  for (int i = 0; i < 6; ++i) {
-    EXPECT_FALSE(TextureTransform::IsDefault(mesh->GetMaterialLibrary()
-                                                 .GetMaterial(i)
-                                                 ->GetTextureMapByIndex(0)
-                                                 ->texture_transform()));
-  }
-  for (int i = 6; i < 9; ++i) {
-    EXPECT_TRUE(TextureTransform::IsDefault(mesh->GetMaterialLibrary()
-                                                .GetMaterial(i)
-                                                ->GetTextureMapByIndex(0)
-                                                ->texture_transform()));
+  std::set<int> expected_default_transforms = {4, 5, 6};
+  for (int i = 0; i < 9; ++i) {
+    const bool expected_default = (expected_default_transforms.count(i) != 0);
+    EXPECT_EQ(TextureTransform::IsDefault(mesh->GetMaterialLibrary()
+                                              .GetMaterial(i)
+                                              ->GetTextureMapByIndex(0)
+                                              ->texture_transform()),
+              expected_default);
   }
 
   const std::unique_ptr<Scene> scene(DecodeGltfFileToScene(filename));
@@ -1139,7 +1139,7 @@ TEST(GltfDecoderTest, CorrectVolumeThicknessFactor) {
   ASSERT_NE(scene, nullptr);
   auto instances = draco::SceneUtils::ComputeAllInstances(*scene);
   ASSERT_EQ(instances.size(), 2);
-  ASSERT_EQ(instances[MeshInstanceIndex(0)].transform.col(0).norm(),
+  ASSERT_EQ(instances[MeshInstanceIndex(1)].transform.col(0).norm(),
             kDragonScale);
   ASSERT_EQ(scene->GetMaterialLibrary().GetMaterial(1)->GetThicknessFactor(),
             kDragonVolumeThickness);
@@ -1256,47 +1256,84 @@ TEST(GltfDecoderTest, MaterialsVariants) {
 TEST(GltfDecoderTest, DecodeMeshWithMeshFeaturesWithStructuralMetadata) {
   // Checks decoding of a simple glTF with mesh features and structural metadata
   // property table as draco::Mesh.
-  constexpr bool kDracoCompressionEnabled = false;
   const auto path = GetTestFileFullPath("BoxMeta/glTF/BoxMeta.gltf");
+  GltfTestHelper::UseCase use_case;
+  use_case.has_mesh_features = true;
+  use_case.has_structural_metadata = true;
+
   draco::GltfDecoder decoder;
   DRACO_ASSIGN_OR_ASSERT(auto mesh, decoder.DecodeFromFile(path));
   ASSERT_NE(mesh, nullptr);
-  GltfTestHelper::CheckBoxMetaMeshFeatures(*mesh, kDracoCompressionEnabled);
-  GltfTestHelper::CheckBoxMetaStructuralMetadata(*mesh);
+  GltfTestHelper::CheckBoxMetaMeshFeatures(*mesh, use_case);
+  GltfTestHelper::CheckBoxMetaStructuralMetadata(*mesh, use_case);
+}
+
+TEST(GltfDecoderTest, DecodeMeshWithStructuralMetadataWithEmptyStringBuffer) {
+  // Checks that the decoder correctly handles 0-length buffers. An example case
+  // where this could happen is an EXT_structural_metadata extension with a
+  // buffer containing an empty string.
+  const auto path =
+      GetTestFileFullPath("ZeroLengthBufferView/ZeroLengthBufferView.gltf");
+  GltfTestHelper::UseCase use_case;
+  use_case.has_mesh_features = true;
+  use_case.has_structural_metadata = true;
+
+  draco::GltfDecoder decoder;
+  DRACO_ASSIGN_OR_ASSERT(auto mesh, decoder.DecodeFromFile(path));
+  ASSERT_NE(mesh, nullptr);
+  ASSERT_EQ(mesh->GetStructuralMetadata().NumPropertyTables(), 1);
+  ASSERT_EQ(mesh->GetStructuralMetadata().GetPropertyTable(0).GetCount(), 1);
+  ASSERT_EQ(mesh->GetStructuralMetadata().GetPropertyTable(0).NumProperties(),
+            1);
+  ASSERT_EQ(mesh->GetStructuralMetadata()
+                .GetPropertyTable(0)
+                .GetProperty(0)
+                .GetData()
+                .data.size(),
+            0);
 }
 
 TEST(GltfDecoderTest, DecodeMeshWithMeshFeaturesWithDracoCompression) {
   // Checks decoding of a simple glTF with mesh features compressed with Draco
   // as draco::Mesh.
-  constexpr bool kDracoCompressionEnabled = true;
   const auto path = GetTestFileFullPath("BoxMetaDraco/glTF/BoxMetaDraco.gltf");
+  GltfTestHelper::UseCase use_case;
+  use_case.has_draco_compression = true;
+  use_case.has_mesh_features = true;
+
   draco::GltfDecoder decoder;
   DRACO_ASSIGN_OR_ASSERT(auto mesh, decoder.DecodeFromFile(path));
   ASSERT_NE(mesh, nullptr);
-  GltfTestHelper::CheckBoxMetaMeshFeatures(*mesh, kDracoCompressionEnabled);
+  GltfTestHelper::CheckBoxMetaMeshFeatures(*mesh, use_case);
 }
 
 TEST(GltfDecoderTest, DecodeSceneWithMeshFeaturesWithStructuralMetadata) {
   // Checks decoding of a simple glTF with mesh features and structural metadata
   // property table as draco::Scene.
-  constexpr bool kHasDracoCompression = false;
   const auto path = GetTestFileFullPath("BoxMeta/glTF/BoxMeta.gltf");
+  GltfTestHelper::UseCase use_case;
+  use_case.has_mesh_features = true;
+  use_case.has_structural_metadata = true;
+
   draco::GltfDecoder decoder;
   DRACO_ASSIGN_OR_ASSERT(auto scene, decoder.DecodeFromFileToScene(path));
   ASSERT_NE(scene, nullptr);
-  GltfTestHelper::CheckBoxMetaMeshFeatures(*scene, kHasDracoCompression);
-  GltfTestHelper::CheckBoxMetaStructuralMetadata(*scene);
+  GltfTestHelper::CheckBoxMetaMeshFeatures(*scene, use_case);
+  GltfTestHelper::CheckBoxMetaStructuralMetadata(*scene, use_case);
 }
 
 TEST(GltfDecoderTest, DecodeSceneWithMeshFeaturesWithDracoCompression) {
   // Checks decoding of a simple glTF with mesh features compressed with Draco
   // as draco::Scene.
-  constexpr bool kHasDracoCompression = true;
   const auto path = GetTestFileFullPath("BoxMetaDraco/glTF/BoxMetaDraco.gltf");
+  GltfTestHelper::UseCase use_case;
+  use_case.has_draco_compression = true;
+  use_case.has_mesh_features = true;
+
   draco::GltfDecoder decoder;
   DRACO_ASSIGN_OR_ASSERT(auto scene, decoder.DecodeFromFileToScene(path));
   ASSERT_NE(scene, nullptr);
-  GltfTestHelper::CheckBoxMetaMeshFeatures(*scene, kHasDracoCompression);
+  GltfTestHelper::CheckBoxMetaMeshFeatures(*scene, use_case);
 }
 
 TEST(GltfDecoderTest, DecodePointCloudToMesh) {
@@ -1316,6 +1353,10 @@ TEST(GltfDecoderTest, DecodePointCloudToMesh) {
   ASSERT_EQ(mesh->NumNamedAttributes(draco::GeometryAttribute::TANGENT), 1);
   ASSERT_EQ(mesh->NumNamedAttributes(draco::GeometryAttribute::MATERIAL), 1);
 
+  // Verify that vertex deduplication was performed
+  ASSERT_LT(mesh->GetNamedAttribute(draco::GeometryAttribute::NORMAL)->size(),
+            462);
+
   // Check the point cloud has two materials.
   ASSERT_EQ(mesh->GetNamedAttribute(draco::GeometryAttribute::MATERIAL)->size(),
             2);
@@ -1398,5 +1439,52 @@ TEST(GltfDecoderTest, TestLoadUnsupportedTexCoordAttributes) {
             2);
 }
 
+TEST(GltfDecoderTest, TestInvertedMaterials) {
+  // Checks that GltfDecoder assigns materials properly to sub-meshes when the
+  // material indices are in reverse order in the input glTF.
+  auto mesh = draco::ReadMeshFromTestFile("two_objects_inverse_materials.gltf");
+  ASSERT_NE(mesh, nullptr);
+  ASSERT_EQ(mesh->GetMaterialLibrary().NumMaterials(), 2);
+
+  // There are two sub-meshes. A cube with 12 faces and a sphere. The cube
+  // should be mapped to a "Red" material and the sphere to a "Green" material.
+  ASSERT_EQ(mesh->GetMaterialLibrary().GetMaterial(0)->GetName(), "Red");
+  ASSERT_EQ(mesh->GetMaterialLibrary().GetMaterial(1)->GetName(), "Green");
+
+  // Count the number of faces for each material index in the mesh.
+  std::array<int, 2> num_material_faces = {0, 0};
+  const draco::PointAttribute *const mat_att =
+      mesh->GetNamedAttribute(draco::GeometryAttribute::MATERIAL);
+  for (draco::FaceIndex i(0); i < mesh->num_faces(); ++i) {
+    const auto f = mesh->face(i);
+    uint32_t mat_index = 0;
+    mat_att->GetMappedValue(f[0], &mat_index);
+    ASSERT_TRUE(mat_index == 0 || mat_index == 1);
+    num_material_faces[mat_index]++;
+  }
+
+  // There should be 12 faces mapped to the red material (index 0), rest should
+  // be mapped to the green one.
+  ASSERT_EQ(num_material_faces[0], 12);
+}
+
+TEST(GltfDecoderTest, DecodePointCloudToMeshWithDeduplicationDisabled) {
+  // Checks that no deduplication is performed when it is explicitly disabled.
+  const auto path = GetTestFileFullPath(
+      "SphereTwoMaterials/sphere_two_materials_point_cloud.gltf");
+  draco::GltfDecoder decoder;
+  decoder.SetDeduplicateVertices(false);
+  DRACO_ASSIGN_OR_ASSERT(auto mesh, decoder.DecodeFromFile(path));
+  ASSERT_NE(mesh, nullptr);
+
+  // Check the point cloud has expected number of points and attributes.
+  ASSERT_EQ(mesh->num_faces(), 0);
+  ASSERT_EQ(mesh->num_points(), 462);
+
+  // Verify that no deduplication was performed.
+  ASSERT_EQ(mesh->GetNamedAttribute(draco::GeometryAttribute::NORMAL)->size(),
+            462);
+}
+
 }  // namespace draco
 #endif  // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/io/gltf_encoder.cc b/contrib/draco/src/draco/io/gltf_encoder.cc
index 0509b588f..0dfff991a 100644
--- a/contrib/draco/src/draco/io/gltf_encoder.cc
+++ b/contrib/draco/src/draco/io/gltf_encoder.cc
@@ -45,6 +45,7 @@
 #include "draco/mesh/mesh_features.h"
 #include "draco/mesh/mesh_splitter.h"
 #include "draco/mesh/mesh_utils.h"
+#include "draco/metadata/property_attribute.h"
 #include "draco/scene/instance_array.h"
 #include "draco/scene/scene_indices.h"
 #include "draco/scene/scene_utils.h"
@@ -90,22 +91,46 @@ int TextureAxisWrappingModeToGltfValue(TextureMap::AxisWrappingMode mode) {
   }
 }
 
-// Checks |att| metadata entry in |mesh| with key "attribute_name" and returns
-// entry value if it begins with "_FEATURE_ID_", or an empty string otherwise.
-std::string GetFeatureIdAttributeName(const PointAttribute &att,
-                                      const Mesh &mesh) {
-  const auto *const metadata =
-      mesh.GetAttributeMetadataByAttributeId(att.unique_id());
-  if (metadata) {
-    std::string attribute_name;
-    if (metadata->GetEntryString("attribute_name", &attribute_name)) {
-      constexpr char kPrefix[] = "_FEATURE_ID_";
-      if (attribute_name.rfind(kPrefix) == 0) {
-        return attribute_name;
+// Returns a boolean indicating whether |mesh| attribute at |att_index| is a
+// feature ID vertex attribute referred to by any of the feature ID sets stored
+// in the |mesh|.
+bool IsFeatureIdAttribute(int att_index, const Mesh &mesh) {
+  for (MeshFeaturesIndex i(0); i < mesh.NumMeshFeatures(); ++i) {
+    if (mesh.GetMeshFeatures(i).GetAttributeIndex() == att_index) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// Returns a boolean indicating whether |mesh| attribute at |att_index| is a
+// property attribute referred to by the |mesh| and its |structural_metadata|.
+bool IsPropertyAttribute(int att_index, const Mesh &mesh,
+                         const StructuralMetadata &structural_metadata) {
+  // First check if structural metadata has any property attributes.
+  if (structural_metadata.NumPropertyAttributes() == 0) {
+    return false;
+  }
+
+  // Property attribute name must start with an underscore like _DIRECTION.
+  const std::string attribute_name = mesh.attribute(att_index)->name();
+  if (attribute_name.rfind('_', 0) != 0) {
+    return false;
+  }
+
+  // Look for an |attribute_name| among all property attributes in the |mesh|.
+  for (int i = 0; i < mesh.NumPropertyAttributesIndices(); ++i) {
+    const int property_attribute_index = mesh.GetPropertyAttributesIndex(i);
+    const PropertyAttribute &attribute =
+        structural_metadata.GetPropertyAttribute(property_attribute_index);
+    for (int i = 0; i < attribute.NumProperties(); ++i) {
+      const PropertyAttribute::Property &property = attribute.GetProperty(i);
+      if (property.GetAttributeName() == attribute_name) {
+        return true;
       }
     }
   }
-  return std::string();
+  return false;
 }
 
 // Struct to hold glTF Scene data.
@@ -123,7 +148,7 @@ struct GltfNode {
         root_node(false) {}
 
   std::string name;
-  std::vector<int> childern_indices;
+  std::vector<int> children_indices;
   int mesh_index;
   int skin_index;
   int light_index;
@@ -220,8 +245,13 @@ struct GltfPrimitive {
   int material;
   std::vector<MeshGroup::MaterialsVariantsMapping> material_variants_mappings;
   std::vector<const MeshFeatures *> mesh_features;
+  std::vector<int> property_attributes;
   std::map<std::string, int> attributes;
   GltfDracoCompressedMesh compressed_mesh_info;
+
+  // Map from the index of a feature ID vertex attribute in draco::Mesh to the
+  // index in the feature ID vertex attribute name like _FEATURE_ID_5.
+  std::unordered_map<int, int> feature_id_name_indices;
 };
 
 struct GltfMesh {
@@ -249,6 +279,8 @@ class GltfAsset {
 
   GltfAsset();
 
+  void set_copyright(const std::string &copyright) { copyright_ = copyright; }
+  std::string copyright() const { return copyright_; }
   std::string generator() const { return generator_; }
   std::string version() const { return version_; }
   std::string buffer_name() const { return buffer_name_; }
@@ -351,13 +383,12 @@ class GltfAsset {
   int AddDracoJoints(const Mesh &mesh, int num_encoded_points);
   int AddDracoWeights(const Mesh &mesh, int num_encoded_points);
   std::vector<std::pair<std::string, int>> AddDracoGenerics(
-      const Mesh &mesh, int num_encoded_points);
+      const Mesh &mesh, int num_encoded_points,
+      std::unordered_map<int, int> *feature_id_name_indices);
 
   // Iterate through the materials that are associated with |mesh| and add them
-  // to the asset. Returns true if |mesh| does not contain any materials or all
-  // the materials are supported. Returns false if |mesh| contains materials
-  // that are not supported.
-  bool AddMaterials(const Mesh &mesh);
+  // to the asset.
+  void AddMaterials(const Mesh &mesh);
 
   // Checks whether a given Draco |attribute| has data of expected |data_type|
   // and whether the data has one of expected |num_components|. Returns true
@@ -395,10 +426,8 @@ class GltfAsset {
   Status AddSceneNode(const Scene &scene, SceneNodeIndex scene_node_index);
 
   // Iterate through the materials that are associated with |scene| and add them
-  // to the asset. Returns true if |scene| does not contain any materials or all
-  // the materials are supported. Returns false if |scene| contains materials
-  // that are not supported.
-  bool AddMaterials(const Scene &scene);
+  // to the asset.
+  void AddMaterials(const Scene &scene);
 
   // Iterate through the animations that are associated with |scene| and add
   // them to the asset. Returns OkStatus() if |scene| does not contain any
@@ -515,9 +544,26 @@ class GltfAsset {
     gltf_json_.EndArray();
   }
 
-  // Add a mesh Draco attribute |att| that is comprised of floats to the glTF
-  // data. Returns the index accessor added to the glTF data. Returns -1 on
-  // error.
+  // Add a mesh Draco attribute |att| to the glTF data. Returns the index
+  // accessor added to the glTF data. Returns -1 on error.
+  int AddAttribute(const PointAttribute &att, int num_points,
+                   int num_encoded_points, bool compress) {
+    const int nep = num_encoded_points;
+    switch (att.data_type()) {
+      case DT_UINT8:
+        return AddAttribute<uint8_t>(att, num_points, nep, compress);
+      case DT_UINT16:
+        return AddAttribute<uint16_t>(att, num_points, nep, compress);
+      case DT_FLOAT32:
+        return AddAttribute<float>(att, num_points, nep, compress);
+      default:
+        return -1;
+    }
+  }
+
+  // Add a mesh Draco attribute |att| that is comprised of |att_data_t| values
+  // to the glTF data. Returns the index accessor added to the glTF data.
+  // Returns -1 on error.
   template <class att_data_t>
   int AddAttribute(const PointAttribute &att, int num_points,
                    int num_encoded_points, bool compress) {
@@ -554,6 +600,10 @@ class GltfAsset {
                    int num_encoded_points, const std::string &type,
                    bool compress);
 
+  void SetCopyrightFromScene(const Scene &scene);
+  void SetCopyrightFromMesh(const Mesh &mesh);
+
+  std::string copyright_;
   std::string generator_;
   std::string version_;
   std::vector<GltfScene> scenes_;
@@ -609,8 +659,7 @@ class GltfAsset {
   std::vector<std::unique_ptr<Light>> lights_;
   std::vector<std::string> materials_variants_names_;
   std::vector<EncoderInstanceArray> instance_arrays_;
-  PropertyTable::Schema property_table_schema_;
-  std::vector<const PropertyTable *> property_tables_;
+  const StructuralMetadata *structural_metadata_;
 
   // Indicates whether Draco compression is used for any of the asset meshes.
   bool draco_compression_used_;
@@ -618,6 +667,9 @@ class GltfAsset {
   // Indicates whether mesh features are used.
   bool mesh_features_used_;
 
+  // Indicates whether structural metadata is used.
+  bool structural_metadata_used_;
+
   // Counter for naming mesh feature textures.
   int mesh_features_texture_index_;
 
@@ -667,8 +719,10 @@ GltfAsset::GltfAsset()
       version_("2.0"),
       scene_index_(-1),
       buffer_name_("buffer0.bin"),
+      structural_metadata_(nullptr),
       draco_compression_used_(false),
       mesh_features_used_(false),
+      structural_metadata_used_(false),
       mesh_features_texture_index_(0),
       add_images_to_buffer_(false),
       output_type_(GltfEncoder::COMPACT) {}
@@ -678,14 +732,15 @@ bool GltfAsset::AddDracoMesh(const Mesh &mesh) {
   if (scene_index < 0) {
     return false;
   }
-  if (!AddMaterials(mesh)) {
-    return false;
-  }
+  AddMaterials(mesh);
 
   GltfMesh gltf_mesh;
   meshes_.push_back(gltf_mesh);
 
   AddStructuralMetadata(mesh);
+  if (copyright_.empty()) {
+    SetCopyrightFromMesh(mesh);
+  }
 
   const int32_t material_att_id =
       mesh.GetNamedAttributeId(GeometryAttribute::MATERIAL);
@@ -713,6 +768,10 @@ bool GltfAsset::AddDracoMesh(const Mesh &mesh) {
       // Copy over mesh features for a given material index.
       Mesh::CopyMeshFeaturesForMaterial(mesh, split_meshes[i].get(), mat_index);
 
+      // Copy over property attributes indices for a given material index.
+      Mesh::CopyPropertyAttributesIndicesForMaterial(
+          mesh, split_meshes[i].get(), mat_index);
+
       // Move the split mesh to a temporary storage of the GltfAsset. This will
       // ensure the mesh will stay alive as long the asset needs it. We have to
       // do this because the split mesh may contain mesh features data that are
@@ -847,12 +906,19 @@ Status GltfAsset::CompressMeshWithDraco(const Mesh &mesh,
 
   // Create Draco encoder.
   EncoderBuffer buffer;
-  ExpertEncoder encoder(*mesh_copy);
-  encoder.SetTrackEncodedProperties(true);
+  std::unique_ptr<ExpertEncoder> encoder;
+  if (mesh_copy->num_faces() > 0) {
+    // Encode mesh.
+    encoder.reset(new ExpertEncoder(*mesh_copy));
+  } else {
+    return Status(Status::DRACO_ERROR,
+                  "Draco compression is not supported for glTF point clouds.");
+  }
+  encoder->SetTrackEncodedProperties(true);
 
   // Convert compression level to speed (that 0 = slowest, 10 = fastest).
   const int speed = 10 - compression_options.compression_level;
-  encoder.SetSpeedOptions(speed, speed);
+  encoder->SetSpeedOptions(speed, speed);
 
   // Configure attribute quantization.
   for (int i = 0; i < mesh_copy->num_attributes(); ++i) {
@@ -904,19 +970,19 @@ Status GltfAsset::CompressMeshWithDraco(const Mesh &mesh,
           num_quantization_bits = compression_options.quantization_bits_weight;
           break;
         case GeometryAttribute::GENERIC:
-          if (GetFeatureIdAttributeName(*att, *mesh_copy).empty()) {
+          if (!IsFeatureIdAttribute(i, *mesh_copy)) {
             num_quantization_bits =
                 compression_options.quantization_bits_generic;
           } else {
             // Quantization is explicitly disabled for feature ID attributes.
-            encoder.SetAttributeQuantization(i, -1);
+            encoder->SetAttributeQuantization(i, -1);
           }
           break;
         default:
           break;
       }
       if (num_quantization_bits > 0) {
-        encoder.SetAttributeQuantization(i, num_quantization_bits);
+        encoder->SetAttributeQuantization(i, num_quantization_bits);
       }
     }
   }
@@ -947,9 +1013,13 @@ Status GltfAsset::CompressMeshWithDraco(const Mesh &mesh,
   // |compression_options| may have been modified and we need to update them
   // before we start the encoding.
   mesh_copy->SetCompressionOptions(compression_options);
-  DRACO_RETURN_IF_ERROR(encoder.EncodeToBuffer(&buffer));
-  *num_encoded_points = encoder.num_encoded_points();
-  *num_encoded_faces = encoder.num_encoded_faces();
+  DRACO_RETURN_IF_ERROR(encoder->EncodeToBuffer(&buffer));
+  *num_encoded_points = encoder->num_encoded_points();
+  if (mesh_copy->num_faces() > 0) {
+    *num_encoded_faces = encoder->num_encoded_faces();
+  } else {
+    *num_encoded_faces = 0;
+  }
   const size_t buffer_start_offset = buffer_.size();
   if (!buffer_.Encode(buffer.data(), buffer.size())) {
     return Status(Status::DRACO_ERROR, "Could not copy Draco compressed data.");
@@ -1056,7 +1126,8 @@ bool GltfAsset::AddDracoMesh(
   const int joints_accessor_index = AddDracoJoints(mesh, num_encoded_points);
   const int weights_accessor_index = AddDracoWeights(mesh, num_encoded_points);
   const std::vector<std::pair<std::string, int>> generics_accessors =
-      AddDracoGenerics(mesh, num_encoded_points);
+      AddDracoGenerics(mesh, num_encoded_points,
+                       &primitive.feature_id_name_indices);
 
   if (num_encoded_faces == 0) {
     primitive.mode = 0;  // POINTS mode.
@@ -1067,6 +1138,10 @@ bool GltfAsset::AddDracoMesh(
   for (MeshFeaturesIndex i(0); i < mesh.NumMeshFeatures(); ++i) {
     primitive.mesh_features.push_back(&mesh.GetMeshFeatures(i));
   }
+  primitive.property_attributes.reserve(mesh.NumPropertyAttributesIndices());
+  for (int i = 0; i < mesh.NumPropertyAttributesIndices(); ++i) {
+    primitive.property_attributes.push_back(mesh.GetPropertyAttributesIndex(i));
+  }
   primitive.indices = indices_index;
   primitive.attributes.insert(
       std::pair<std::string, int>("POSITION", position_index));
@@ -1205,10 +1280,13 @@ int GltfAsset::AddDracoNormals(const Mesh &mesh, int num_encoded_points) {
 int GltfAsset::AddDracoColors(const Mesh &mesh, int num_encoded_points) {
   const PointAttribute *const att =
       mesh.GetNamedAttribute(GeometryAttribute::COLOR);
-  // TODO(b/200302561): Add support for DT_UINT16 with COLOR.
-  if (!CheckDracoAttribute(att, {DT_UINT8, DT_FLOAT32}, {3, 4})) {
+  if (!CheckDracoAttribute(att, {DT_UINT8, DT_UINT16, DT_FLOAT32}, {3, 4})) {
     return -1;
   }
+  if (att->data_type() == DT_UINT16) {
+    return AddAttribute<uint16_t>(*att, mesh.num_points(), num_encoded_points,
+                                  mesh.IsCompressionEnabled());
+  }
   if (att->data_type() == DT_FLOAT32) {
     return AddAttribute<float>(*att, mesh.num_points(), num_encoded_points,
                                mesh.IsCompressionEnabled());
@@ -1312,73 +1390,77 @@ int GltfAsset::AddDracoWeights(const Mesh &mesh, int num_encoded_points) {
                              mesh.IsCompressionEnabled());
 }
 
-// Adds generic attributes that have metadata describing the attribute name.
-// This allows for export of application-specific attributes and feature ID
-// attributes defined in glTF extension EXT_mesh_features. Returns a vector of
-// attribute-name, accessor pairs for each valid attribute. The length of the
-// vector is equal to the number of generic attributes. Vector entries
-// corresponding to unsupported attributes (e.g., with no metadata) contain
-// empty attribute names.
+// Adds generic attributes that have metadata describing the attribute name,
+// attributes referred to by one of the mesh feature ID sets or in the |mesh|,
+// and attributes referred to by one of the property attributes in the |mesh|.
+// This allows for export of application-specific attributes, feature ID
+// attributes defined in glTF extension EXT_mesh_features, and property
+// attributes defined in glTF extension EXT_structural_metadata. Returns a
+// vector of attribute-name, accessor pairs for each valid attribute. Populates
+// map from |mesh| attribute index in the feature ID attribute name like
+// _FEATURE_ID_5 or _DIRECTION for each feature ID and property attribute in the
+// |mesh|.
 std::vector<std::pair<std::string, int>> GltfAsset::AddDracoGenerics(
-    const Mesh &mesh, int num_encoded_points) {
-  const int num_attributes =
+    const Mesh &mesh, int num_encoded_points,
+    std::unordered_map<int, int> *feature_id_name_indices) {
+  const int num_generic_attributes =
       mesh.NumNamedAttributes(GeometryAttribute::GENERIC);
-  std::vector<std::pair<std::string, int>> attrs(num_attributes);
-  for (int i = 0; i < num_attributes; ++i) {
-    const PointAttribute *const att =
-        mesh.GetNamedAttribute(GeometryAttribute::GENERIC, i);
-    auto const *metadata =
-        mesh.GetAttributeMetadataByAttributeId(att->unique_id());
+  std::vector<std::pair<std::string, int>> attrs;
+  int feature_id_count = 0;
+  for (int i = 0; i < num_generic_attributes; ++i) {
+    const int att_index =
+        mesh.GetNamedAttributeId(GeometryAttribute::GENERIC, i);
+    const PointAttribute *const att = mesh.attribute(att_index);
+    std::string attr_name;
+    int accessor = -1;
+
+    auto const *metadata = mesh.GetAttributeMetadataByAttributeId(att_index);
     if (metadata) {
-      std::string attr_name;
       if (metadata->GetEntryString(GltfEncoder::kDracoMetadataGltfAttributeName,
                                    &attr_name)) {
         if (att->data_type() == DT_FLOAT32) {
-          int accessor =
+          accessor =
               AddAttribute<float>(*att, mesh.num_points(), num_encoded_points,
                                   mesh.IsCompressionEnabled());
-          attrs[i] = {attr_name, accessor};
-        }
-      } else {
-        // Try to find feature ID attribute name like "_FEATURE_ID_5" then check
-        // that the attribute stores scalar values of complient data types as
-        // defined by the EXT_mesh_features glTF extension.
-        attr_name = GetFeatureIdAttributeName(*att, mesh);
-        if (!attr_name.empty() && att->num_components() == 1) {
-          int accessor = -1;
-          switch (att->data_type()) {
-            case DT_UINT8:
-              accessor = AddAttribute<uint8_t>(*att, mesh.num_points(),
-                                               num_encoded_points,
-                                               mesh.IsCompressionEnabled());
-              break;
-            case DT_UINT16:
-              accessor = AddAttribute<uint16_t>(*att, mesh.num_points(),
-                                                num_encoded_points,
-                                                mesh.IsCompressionEnabled());
-              break;
-            case DT_FLOAT32:
-              accessor = AddAttribute<float>(*att, mesh.num_points(),
-                                             num_encoded_points,
-                                             mesh.IsCompressionEnabled());
-              break;
-            default:
-              continue;
-          }
-          attrs[i] = {attr_name, accessor};
         }
       }
+    } else {
+      if (IsFeatureIdAttribute(att_index, mesh) && att->num_components() == 1) {
+        // This is an attribute referred to by one of the mesh feature ID sets
+        // as defined by the EXT_mesh_features glTF extension.
+        // TODO(vytyaz): Report an error if the number of components is not one.
+        accessor = AddAttribute(*att, mesh.num_points(), num_encoded_points,
+                                mesh.IsCompressionEnabled());
+
+        // Generate attribute name like _FEATURE_ID_N where N starts at 0 for
+        // the first feature ID vertex attribute and continues with consecutive
+        // positive integers as dictated by the EXT_mesh_features extension.
+        attr_name =
+            std::string("_FEATURE_ID_") + std::to_string(feature_id_count);
+
+        // Populate map from attribute index in the |mesh| to the index in a
+        // feature ID vertex attribute name like _FEATURE_ID_5.
+        (*feature_id_name_indices)[att_index] = feature_id_count;
+        feature_id_count++;
+      } else if (IsPropertyAttribute(att_index, mesh, *structural_metadata_)) {
+        // This is a property attribute as defined by the
+        // EXT_structural_metadata glTF extension.
+        accessor = AddAttribute(*att, mesh.num_points(), num_encoded_points,
+                                mesh.IsCompressionEnabled());
+        attr_name = att->name();
+      }
+    }
+    if (accessor != -1 && !attr_name.empty()) {
+      attrs.emplace_back(attr_name, accessor);
     }
   }
   return attrs;
 }
 
-bool GltfAsset::AddMaterials(const Mesh &mesh) {
-  if (mesh.GetMaterialLibrary().NumMaterials() == 0) {
-    return true;
+void GltfAsset::AddMaterials(const Mesh &mesh) {
+  if (mesh.GetMaterialLibrary().NumMaterials()) {
+    material_library_.Copy(mesh.GetMaterialLibrary());
   }
-  material_library_.Copy(mesh.GetMaterialLibrary());
-  return true;
 }
 
 bool GltfAsset::CheckDracoAttribute(const PointAttribute *attribute,
@@ -1432,13 +1514,7 @@ StatusOr<int> GltfAsset::AddImage(const std::string &image_stem,
   image.texture = texture;
   image.owned_texture = std::move(owned_texture);
   image.num_components = num_components;
-
-  // Always maintain the mime_type. Used elsewhere to determine image type.
-  if (extension == "jpg") {
-    image.mime_type = "image/jpeg";
-  } else {
-    image.mime_type = "image/" + extension;
-  }
+  image.mime_type = TextureUtils::GetTargetMimeType(*texture);
 
   // For KTX2 with Basis compression, state that its extension is required.
   if (extension == "ktx2") {
@@ -1508,9 +1584,9 @@ Status GltfAsset::AddScene(const Scene &scene) {
   if (scene_index < 0) {
     return Status(Status::DRACO_ERROR, "Error creating a new scene.");
   }
-  if (!AddMaterials(scene)) {
-    return Status(Status::DRACO_ERROR, "Error adding materials to the scene.");
-  }
+  AddMaterials(scene);
+  AddStructuralMetadata(scene);
+
   // Initialize base mesh transforms that may be needed when the base meshes are
   // compressed with Draco.
   base_mesh_transforms_ = SceneUtils::FindLargestBaseMeshTransforms(scene);
@@ -1526,7 +1602,9 @@ Status GltfAsset::AddScene(const Scene &scene) {
   DRACO_RETURN_IF_ERROR(AddLights(scene));
   DRACO_RETURN_IF_ERROR(AddMaterialsVariantsNames(scene));
   DRACO_RETURN_IF_ERROR(AddInstanceArrays(scene));
-  AddStructuralMetadata(scene);
+  if (copyright_.empty()) {
+    SetCopyrightFromScene(scene);
+  }
   return OkStatus();
 }
 
@@ -1542,7 +1620,7 @@ Status GltfAsset::AddSceneNode(const Scene &scene,
   node.trs_matrix.Copy(scene_node->GetTrsMatrix());
 
   for (int i = 0; i < scene_node->NumChildren(); ++i) {
-    node.childern_indices.push_back(scene_node->Child(i).value());
+    node.children_indices.push_back(scene_node->Child(i).value());
   }
 
   const MeshGroupIndex mesh_group_index = scene_node->GetMeshGroupIndex();
@@ -1589,6 +1667,12 @@ Status GltfAsset::AddSceneNode(const Scene &scene,
           for (MeshFeaturesIndex j(0); j < mesh.NumMeshFeatures(); ++j) {
             primitive.mesh_features.push_back(&mesh.GetMeshFeatures(j));
           }
+          primitive.property_attributes.reserve(
+              mesh.NumPropertyAttributesIndices());
+          for (int i = 0; i < mesh.NumPropertyAttributesIndices(); ++i) {
+            primitive.property_attributes.push_back(
+                mesh.GetPropertyAttributesIndex(i));
+          }
           meshes_.back().primitives.push_back(primitive);
         }
       }
@@ -1604,12 +1688,10 @@ Status GltfAsset::AddSceneNode(const Scene &scene,
   return OkStatus();
 }
 
-bool GltfAsset::AddMaterials(const Scene &scene) {
-  if (scene.GetMaterialLibrary().NumMaterials() == 0) {
-    return true;
+void GltfAsset::AddMaterials(const Scene &scene) {
+  if (scene.GetMaterialLibrary().NumMaterials()) {
+    material_library_.Copy(scene.GetMaterialLibrary());
   }
-  material_library_.Copy(scene.GetMaterialLibrary());
-  return true;
 }
 
 Status GltfAsset::AddAnimations(const Scene &scene) {
@@ -1884,14 +1966,7 @@ Status GltfAsset::AddInstanceArrays(const Scene &scene) {
 
 template <typename GeometryT>
 void GltfAsset::AddStructuralMetadata(const GeometryT &geometry) {
-  const StructuralMetadata &structural_metadata =
-      geometry.GetStructuralMetadata();
-  if (!structural_metadata.GetPropertyTableSchema().Empty()) {
-    property_table_schema_ = structural_metadata.GetPropertyTableSchema();
-    for (int i = 0; i < structural_metadata.NumPropertyTables(); ++i) {
-      property_tables_.push_back(&structural_metadata.GetPropertyTable(i));
-    }
-  }
+  structural_metadata_ = &geometry.GetStructuralMetadata();
 }
 
 StatusOr<int> GltfAsset::AddData(const std::vector<float> &data,
@@ -1972,6 +2047,9 @@ bool GltfAsset::EncodeAssetProperty(EncoderBuffer *buf_out) {
   gltf_json_.BeginObject("asset");
   gltf_json_.OutputValue("version", version_);
   gltf_json_.OutputValue("generator", generator_);
+  if (!copyright_.empty()) {
+    gltf_json_.OutputValue("copyright", copyright_);
+  }
   gltf_json_.EndObject();
 
   const std::string asset_str = gltf_json_.MoveData();
@@ -2044,10 +2122,10 @@ bool GltfAsset::EncodeNodesProperty(EncoderBuffer *buf_out) {
       gltf_json_.EndObject();
     }
 
-    if (!nodes_[i].childern_indices.empty()) {
+    if (!nodes_[i].children_indices.empty()) {
       gltf_json_.BeginArray("children");
-      for (int j = 0; j < nodes_[i].childern_indices.size(); ++j) {
-        gltf_json_.OutputValue(nodes_[i].childern_indices[j]);
+      for (int j = 0; j < nodes_[i].children_indices.size(); ++j) {
+        gltf_json_.OutputValue(nodes_[i].children_indices[j]);
       }
       gltf_json_.EndArray();
     }
@@ -2170,9 +2248,10 @@ Status GltfAsset::EncodePrimitiveExtensionsProperty(
       primitive.compressed_mesh_info.buffer_view_index >= 0;
   const bool has_materials_variants =
       !primitive.material_variants_mappings.empty();
+  const bool has_structural_metadata = !primitive.property_attributes.empty();
   const bool has_mesh_features = !primitive.mesh_features.empty();
   if (!has_draco_mesh_compression && !has_materials_variants &&
-      !has_mesh_features) {
+      !has_mesh_features && !has_structural_metadata) {
     return OkStatus();
   }
 
@@ -2216,7 +2295,10 @@ Status GltfAsset::EncodePrimitiveExtensionsProperty(
       }
       gltf_json_.OutputValue("featureCount", features->GetFeatureCount());
       if (features->GetAttributeIndex() != -1) {
-        gltf_json_.OutputValue("attribute", features->GetAttributeIndex());
+        // Index referring to mesh feature ID attribute name like _FEATURE_ID_5.
+        const int index =
+            primitive.feature_id_name_indices.at(features->GetAttributeIndex());
+        gltf_json_.OutputValue("attribute", index);
       }
       if (features->GetPropertyTableIndex() != -1) {
         gltf_json_.OutputValue("propertyTable",
@@ -2250,6 +2332,16 @@ Status GltfAsset::EncodePrimitiveExtensionsProperty(
     gltf_json_.EndArray();   // featureIds array.
     gltf_json_.EndObject();  // EXT_mesh_features entry.
   }
+  if (has_structural_metadata) {
+    structural_metadata_used_ = true;
+    gltf_json_.BeginObject("EXT_structural_metadata");
+    gltf_json_.BeginArray("propertyAttributes");
+    for (const int property_attribute_index : primitive.property_attributes) {
+      gltf_json_.OutputValue(property_attribute_index);
+    }
+    gltf_json_.EndArray();   // propertyAttributes array.
+    gltf_json_.EndObject();  // EXT_structural_metadata entry.
+  }
   gltf_json_.EndObject();  // extensions entry.
   return OkStatus();
 }
@@ -2963,7 +3055,8 @@ Status GltfAsset::EncodeSkinsProperty(EncoderBuffer *buf_out) {
 Status GltfAsset::EncodeTopLevelExtensionsProperty(EncoderBuffer *buf_out) {
   // Return if there are no top-level asset extensions to encode.
   if (lights_.empty() && materials_variants_names_.empty() &&
-      property_tables_.empty()) {
+      structural_metadata_->NumPropertyTables() == 0 &&
+      structural_metadata_->NumPropertyAttributes() == 0) {
     return OkStatus();
   }
 
@@ -3048,38 +3141,39 @@ Status GltfAsset::EncodeMaterialsVariantsNamesProperty(EncoderBuffer *buf_out) {
 }
 
 Status GltfAsset::EncodeStructuralMetadataProperty(EncoderBuffer *buf_out) {
-  if (property_table_schema_.Empty()) {
+  if (structural_metadata_->GetSchema().Empty()) {
     return OkStatus();
   }
 
+  structural_metadata_used_ = true;
   gltf_json_.BeginObject("EXT_structural_metadata");
 
-  // Encodes property table schema.
+  // Encodes structural metadata schema.
   struct SchemaWriter {
-    static void Write(const PropertyTable::Schema::Object &object,
-                      JsonWriter *json_writer) {
+    typedef StructuralMetadataSchema::Object Object;
+    static void Write(const Object &object, JsonWriter *json_writer) {
       switch (object.GetType()) {
-        case PropertyTable::Schema::Object::OBJECT:
+        case Object::OBJECT:
           json_writer->BeginObject(object.GetName());
-          for (const PropertyTable::Schema::Object &obj : object.GetObjects()) {
+          for (const Object &obj : object.GetObjects()) {
             Write(obj, json_writer);
           }
           json_writer->EndObject();
           break;
-        case PropertyTable::Schema::Object::ARRAY:
+        case Object::ARRAY:
           json_writer->BeginArray(object.GetName());
-          for (const PropertyTable::Schema::Object &obj : object.GetArray()) {
+          for (const Object &obj : object.GetArray()) {
             Write(obj, json_writer);
           }
           json_writer->EndArray();
           break;
-        case PropertyTable::Schema::Object::STRING:
+        case Object::STRING:
           json_writer->OutputValue(object.GetName(), object.GetString());
           break;
-        case PropertyTable::Schema::Object::INTEGER:
+        case Object::INTEGER:
           json_writer->OutputValue(object.GetName(), object.GetInteger());
           break;
-        case PropertyTable::Schema::Object::BOOLEAN:
+        case Object::BOOLEAN:
           json_writer->OutputValue(object.GetName(), object.GetBoolean());
           break;
       }
@@ -3087,11 +3181,13 @@ Status GltfAsset::EncodeStructuralMetadataProperty(EncoderBuffer *buf_out) {
   };
 
   // Encode property table schema.
-  SchemaWriter::Write(property_table_schema_.json, &gltf_json_);
+  SchemaWriter::Write(structural_metadata_->GetSchema().json, &gltf_json_);
 
   // Encode all property tables.
   gltf_json_.BeginArray("propertyTables");
-  for (const PropertyTable *const table : property_tables_) {
+  for (int i = 0; i < structural_metadata_->NumPropertyTables(); i++) {
+    const PropertyTable *const table =
+        &structural_metadata_->GetPropertyTable(i);
     gltf_json_.BeginObject();
     if (!table->GetName().empty()) {
       gltf_json_.OutputValue("name", table->GetName());
@@ -3138,7 +3234,33 @@ Status GltfAsset::EncodeStructuralMetadataProperty(EncoderBuffer *buf_out) {
     gltf_json_.EndObject();  // properties entry.
     gltf_json_.EndObject();
   }
-  gltf_json_.EndArray();   // propertyTables entry.
+  gltf_json_.EndArray();  // propertyTables entry.
+
+  // Encode all property attributes.
+  gltf_json_.BeginArray("propertyAttributes");
+  for (int i = 0; i < structural_metadata_->NumPropertyAttributes(); i++) {
+    const PropertyAttribute *const attribute =
+        &structural_metadata_->GetPropertyAttribute(i);
+    gltf_json_.BeginObject();
+    if (!attribute->GetName().empty()) {
+      gltf_json_.OutputValue("name", attribute->GetName());
+    }
+    if (!attribute->GetClass().empty()) {
+      gltf_json_.OutputValue("class", attribute->GetClass());
+    }
+
+    // Encoder all property attribute properties.
+    gltf_json_.BeginObject("properties");
+    for (int i = 0; i < attribute->NumProperties(); ++i) {
+      const PropertyAttribute::Property &property = attribute->GetProperty(i);
+      gltf_json_.BeginObject(property.GetName());
+      gltf_json_.OutputValue("attribute", property.GetAttributeName());
+      gltf_json_.EndObject();  // Named property entry.
+    }
+    gltf_json_.EndObject();  // properties entry.
+    gltf_json_.EndObject();
+  }
+  gltf_json_.EndArray();   // propertyAttributes entry.
   gltf_json_.EndObject();  // EXT_structural_metadata entry.
   return OkStatus();
 }
@@ -3246,7 +3368,7 @@ Status GltfAsset::EncodeExtensionsProperties(EncoderBuffer *buf_out) {
   if (mesh_features_used_) {
     extensions_used_.insert("EXT_mesh_features");
   }
-  if (!property_table_schema_.Empty()) {
+  if (structural_metadata_used_) {
     extensions_used_.insert("EXT_structural_metadata");
   }
 
@@ -3383,6 +3505,20 @@ int GltfAsset::AddAttribute(const PointAttribute &att, int num_points,
   return static_cast<int>(accessors_.size() - 1);
 }
 
+void GltfAsset::SetCopyrightFromScene(const Scene &scene) {
+  std::string copyright;
+  scene.GetMetadata().GetEntryString("copyright", &copyright);
+  set_copyright(copyright);
+}
+
+void GltfAsset::SetCopyrightFromMesh(const Mesh &mesh) {
+  if (mesh.GetMetadata() != nullptr) {
+    std::string copyright;
+    mesh.GetMetadata()->GetEntryString("copyright", &copyright);
+    set_copyright(copyright);
+  }
+}
+
 const char GltfEncoder::kDracoMetadataGltfAttributeName[] =
     "//GLTF/ApplicationSpecificAttributeName";
 
@@ -3436,6 +3572,7 @@ Status GltfEncoder::EncodeFile(const T &geometry, const std::string &filename,
   }
 
   GltfAsset gltf_asset;
+  gltf_asset.set_copyright(copyright_);
   gltf_asset.set_output_type(output_type_);
 
   if (extension == "gltf") {
@@ -3465,6 +3602,7 @@ Status GltfEncoder::EncodeToBuffer(const T &geometry,
   gltf_asset.set_output_type(output_type_);
   gltf_asset.buffer_name("");
   gltf_asset.set_add_images_to_buffer(true);
+  gltf_asset.set_copyright(copyright_);
 
   // Encode the geometry into a buffer.
   EncoderBuffer buffer;
diff --git a/contrib/draco/src/draco/io/gltf_encoder.h b/contrib/draco/src/draco/io/gltf_encoder.h
index 16403ac31..3fcf7f50f 100644
--- a/contrib/draco/src/draco/io/gltf_encoder.h
+++ b/contrib/draco/src/draco/io/gltf_encoder.h
@@ -84,6 +84,9 @@ class GltfEncoder {
   void set_output_type(OutputType type) { output_type_ = type; }
   OutputType output_type() const { return output_type_; }
 
+  void set_copyright(const std::string &copyright) { copyright_ = copyright; }
+  std::string copyright() const { return copyright_; }
+
   // The name of the attribute metadata that contains the glTF attribute
   // name. For application-specific generic attributes, if the metadata for
   // an attribute contains this key, then the value will be used as the
@@ -126,6 +129,7 @@ class GltfEncoder {
 
   EncoderBuffer *out_buffer_;
   OutputType output_type_;
+  std::string copyright_;
 };
 
 }  // namespace draco
diff --git a/contrib/draco/src/draco/io/gltf_encoder_test.cc b/contrib/draco/src/draco/io/gltf_encoder_test.cc
index 179256dfd..438fd435e 100644
--- a/contrib/draco/src/draco/io/gltf_encoder_test.cc
+++ b/contrib/draco/src/draco/io/gltf_encoder_test.cc
@@ -15,10 +15,15 @@
 #include "draco/io/gltf_encoder.h"
 
 #ifdef DRACO_TRANSCODER_SUPPORTED
+#include <array>
+#include <iostream>
+#include <map>
+#include <memory>
 #include <sstream>
 #include <string>
 #include <unordered_set>
 #include <utility>
+#include <vector>
 
 #include "draco/core/draco_test_base.h"
 #include "draco/core/draco_test_utils.h"
@@ -1278,7 +1283,7 @@ TEST_F(GltfEncoderTest, PbrNextExtensions) {
   const std::string tmp_name = draco::GetTestTempFileFullPath("tmp.gltf");
   DRACO_ASSERT_OK(encoder.EncodeFile<Scene>(*original, tmp_name));
 
-  // Read model from the temporay file.
+  // Read model from the temporary file.
   GltfDecoder decoder;
   DRACO_ASSIGN_OR_ASSERT(auto encoded, decoder.DecodeFromFileToScene(tmp_name));
   ASSERT_NE(encoded, nullptr);
@@ -1483,6 +1488,44 @@ TEST_F(GltfEncoderTest, EncodeToBuffer) {
   ASSERT_EQ(std::memcmp(file_data.data(), buffer.data(), buffer.size()), 0);
 }
 
+TEST_F(GltfEncoderTest, CopyrightAssetIsEncoded) {
+  // Load scene from file.
+  const std::string file_name = "CesiumMilkTruck/glTF/CesiumMilkTruck.gltf";
+  const std::unique_ptr<Scene> scene = ReadSceneFromTestFile(file_name);
+  ASSERT_NE(scene, nullptr);
+
+  std::array<std::pair<std::string, std::string>, 3> test_cases = {
+      {{"Google", "Google"}, {"", ""}, {"GMaps", ""}}};
+
+  for (const std::pair<std::string, std::string> &test_case : test_cases) {
+    // Encode scene to buffer in GLB format.
+    GltfEncoder encoder;
+    encoder.set_copyright(test_case.first);
+    EncoderBuffer buffer;
+    DRACO_ASSERT_OK(encoder.EncodeToBuffer(*scene, &buffer));
+    ASSERT_NE(buffer.size(), 0);
+
+    const std::string glb_file_path =
+        draco::GetTestTempFileFullPath(test_case.first + "temp.glb");
+    std::string folder_path;
+    std::string glb_file_name;
+    draco::SplitPath(glb_file_path, &folder_path, &glb_file_name);
+    encoder.set_copyright(test_case.second);
+    encoder.EncodeToFile<Scene>(*scene, glb_file_path, folder_path);
+
+    std::vector<char> file_data;
+    ASSERT_TRUE(ReadFileToBuffer(glb_file_path, &file_data));
+    if (test_case.first == test_case.second) {
+      ASSERT_EQ(buffer.size(), draco::GetFileSize(glb_file_path))
+          << glb_file_path;
+      ASSERT_EQ(std::memcmp(file_data.data(), buffer.data(), buffer.size()), 0);
+    } else {
+      ASSERT_NE(buffer.size(), draco::GetFileSize(glb_file_path))
+          << glb_file_path;
+    }
+  }
+}
+
 // Tests that a scene with lights can be encoded into a file.
 TEST_F(GltfEncoderTest, EncodeLights) {
   const std::string file_name = "sphere_lights.gltf";
@@ -1565,9 +1608,9 @@ TEST_F(GltfEncoderTest, EncodeMaterialsVariants) {
 // structural metadata property table.
 TEST_F(GltfEncoderTest, EncodeSceneWithMeshFeaturesWithStructuralMetadata) {
   const std::string file_name = "BoxMeta/glTF/BoxMeta.gltf";
-  constexpr bool kHasMeshFeatures = true;
-  constexpr bool kHasStructuralMetadata = true;
-  constexpr bool kHasDracoCompression = false;
+  GltfTestHelper::UseCase use_case;
+  use_case.has_mesh_features = true;
+  use_case.has_structural_metadata = true;
 
   // Read test file from file.
   const std::unique_ptr<Scene> scene(DecodeTestGltfFileToScene(file_name));
@@ -1577,18 +1620,17 @@ TEST_F(GltfEncoderTest, EncodeSceneWithMeshFeaturesWithStructuralMetadata) {
   std::unique_ptr<Scene> scene_from_gltf;
   SceneToDecodedGltfScene(*scene, &scene_from_gltf);
   ASSERT_NE(scene_from_gltf, nullptr);
-  GltfTestHelper::CheckBoxMetaMeshFeatures(*scene_from_gltf,
-                                           kHasDracoCompression);
-  GltfTestHelper::CheckBoxMetaStructuralMetadata(*scene_from_gltf);
+  GltfTestHelper::CheckBoxMetaMeshFeatures(*scene_from_gltf, use_case);
+  GltfTestHelper::CheckBoxMetaStructuralMetadata(*scene_from_gltf, use_case);
 }
 
 // Tests encoding of draco::Scene with Draco compression to glTF with various
 // mesh feature ID sets.
 TEST_F(GltfEncoderTest, EncodeSceneWithMeshFeaturesWithDracoCompression) {
   const std::string file_name = "BoxMetaDraco/glTF/BoxMetaDraco.gltf";
-  constexpr bool kHasMeshFeatures = true;
-  constexpr bool kHasStructuralMetadata = false;
-  constexpr bool kHasDracoCompression = true;
+  GltfTestHelper::UseCase use_case;
+  use_case.has_draco_compression = true;
+  use_case.has_mesh_features = true;
 
   // Read test file from file.
   const std::unique_ptr<Scene> scene(DecodeTestGltfFileToScene(file_name));
@@ -1598,15 +1640,16 @@ TEST_F(GltfEncoderTest, EncodeSceneWithMeshFeaturesWithDracoCompression) {
   std::unique_ptr<Scene> scene_from_gltf;
   SceneToDecodedGltfScene(*scene, &scene_from_gltf);
   ASSERT_NE(scene_from_gltf, nullptr);
-  GltfTestHelper::CheckBoxMetaMeshFeatures(*scene_from_gltf,
-                                           kHasDracoCompression);
+  GltfTestHelper::CheckBoxMetaMeshFeatures(*scene_from_gltf, use_case);
 }
 
 // Tests encoding of draco::Mesh to glTF with various mesh feature ID sets and
 // structural metadata property table.
 TEST_F(GltfEncoderTest, EncodeMeshWithMeshFeaturesWithStructuralMetadata) {
   const std::string file_name = "BoxMeta/glTF/BoxMeta.gltf";
-  constexpr bool kHasDracoCompression = false;
+  GltfTestHelper::UseCase use_case;
+  use_case.has_mesh_features = true;
+  use_case.has_structural_metadata = true;
 
   // Read test file from file.
   const std::unique_ptr<Mesh> mesh(ReadMeshFromTestFile(file_name));
@@ -1616,16 +1659,17 @@ TEST_F(GltfEncoderTest, EncodeMeshWithMeshFeaturesWithStructuralMetadata) {
   std::unique_ptr<Mesh> mesh_from_gltf;
   MeshToDecodedGltfMesh(*mesh, &mesh_from_gltf);
   ASSERT_NE(mesh_from_gltf, nullptr);
-  GltfTestHelper::CheckBoxMetaMeshFeatures(*mesh_from_gltf,
-                                           kHasDracoCompression);
-  GltfTestHelper::CheckBoxMetaStructuralMetadata(*mesh_from_gltf);
+  GltfTestHelper::CheckBoxMetaMeshFeatures(*mesh_from_gltf, use_case);
+  GltfTestHelper::CheckBoxMetaStructuralMetadata(*mesh_from_gltf, use_case);
 }
 
 // Tests encoding of draco::Mesh with Draco compression to glTF with various
 // mesh feature ID sets.
 TEST_F(GltfEncoderTest, EncodeMeshWithMeshFeaturesWithDracoCompression) {
-  constexpr bool kHasDracoCompression = true;
   const std::string file_name = "BoxMetaDraco/glTF/BoxMetaDraco.gltf";
+  GltfTestHelper::UseCase use_case;
+  use_case.has_draco_compression = true;
+  use_case.has_mesh_features = true;
 
   // Read test file from file.
   const std::unique_ptr<Mesh> mesh(ReadMeshFromTestFile(file_name));
@@ -1635,8 +1679,37 @@ TEST_F(GltfEncoderTest, EncodeMeshWithMeshFeaturesWithDracoCompression) {
   std::unique_ptr<Mesh> mesh_from_gltf;
   MeshToDecodedGltfMesh(*mesh, &mesh_from_gltf);
   ASSERT_NE(mesh_from_gltf, nullptr);
-  GltfTestHelper::CheckBoxMetaMeshFeatures(*mesh_from_gltf,
-                                           kHasDracoCompression);
+  GltfTestHelper::CheckBoxMetaMeshFeatures(*mesh_from_gltf, use_case);
+}
+
+// This test verifies that b/245519530 is fixed. It loads mesh with various mesh
+// feature ID sets, enables Draco compression, converts mesh to scene, and
+// encodes the scene to glTF.
+TEST_F(GltfEncoderTest, EncodeMeshWithMeshFeaturesWithDracoCompressionAsScene) {
+  // Note that although the mesh is loaded from file with no Draco compression,
+  // the compression is enabled later on.
+  const std::string file_name = "BoxMeta/glTF/BoxMeta.gltf";
+  GltfTestHelper::UseCase use_case;
+  use_case.has_draco_compression = true;
+  use_case.has_mesh_features = true;
+  use_case.has_structural_metadata = true;
+
+  // Read test file from file.
+  std::unique_ptr<Mesh> mesh(ReadMeshFromTestFile(file_name));
+  ASSERT_NE(mesh, nullptr);
+
+  // Enable Draco compression.
+  mesh->SetCompressionEnabled(use_case.has_draco_compression);
+
+  // Convert mesh to scene.
+  std::unique_ptr<Scene> scene =
+      draco::SceneUtils::MeshToScene(std::move(mesh)).value();
+
+  // Encode the scene to glTF and decode it back to draco::Scene and check.
+  std::unique_ptr<Scene> scene_from_gltf;
+  SceneToDecodedGltfScene(*scene, &scene_from_gltf);
+  ASSERT_NE(scene_from_gltf, nullptr);
+  GltfTestHelper::CheckBoxMetaMeshFeatures(*scene_from_gltf, use_case);
 }
 
 // Tests encoding of draco::Mesh with mesh features associated with different
@@ -1688,6 +1761,49 @@ TEST_F(GltfEncoderTest, EncodeMeshWithMeshFeaturesWithMultiplePrimitives) {
   ASSERT_EQ(scene_from_gltf->GetNonMaterialTextureLibrary().NumTextures(), 2);
 }
 
+// Tests encoding of draco::Mesh with property attributes associated with
+// different mesh primitives.
+TEST_F(GltfEncoderTest,
+       EncodeMeshWithPropertyAttributesWithMultiplePrimitives) {
+  const std::string file_name = "BoxesMeta/glTF/BoxesMeta.gltf";
+
+  // Read test file from file.
+  const std::unique_ptr<Mesh> mesh(ReadMeshFromTestFile(file_name));
+  ASSERT_NE(mesh, nullptr);
+  ASSERT_EQ(mesh->NumPropertyAttributesIndices(), 2);
+
+  // Encode the scene to glTF and decode it back to draco::Mesh and check.
+  std::unique_ptr<Mesh> mesh_from_gltf;
+  MeshToDecodedGltfMesh(*mesh, &mesh_from_gltf);
+  ASSERT_NE(mesh_from_gltf, nullptr);
+
+  ASSERT_EQ(mesh_from_gltf->GetMaterialLibrary().NumMaterials(), 2);
+  ASSERT_EQ(mesh_from_gltf->NumPropertyAttributesIndices(), 2);
+
+  // First property attribute should be used by material 0 and the second by
+  // material 1.
+  ASSERT_EQ(mesh_from_gltf->NumPropertyAttributesIndexMaterialMasks(0), 1);
+  ASSERT_EQ(mesh_from_gltf->NumPropertyAttributesIndexMaterialMasks(1), 1);
+  ASSERT_EQ(mesh_from_gltf->GetPropertyAttributesIndexMaterialMask(0, 0), 0);
+  ASSERT_EQ(mesh_from_gltf->GetPropertyAttributesIndexMaterialMask(1, 0), 1);
+
+  // Ensure it still works correctly when we re-encode the source |mesh| as a
+  // scene.
+  std::unique_ptr<Scene> scene_from_gltf;
+  MeshToDecodedGltfScene(*mesh, &scene_from_gltf);
+  ASSERT_NE(scene_from_gltf, nullptr);
+
+  ASSERT_EQ(scene_from_gltf->NumMeshes(), 2);
+
+  // Both meshes should have one property attributes indices.
+  ASSERT_EQ(scene_from_gltf->GetMesh(draco::MeshIndex(0))
+                .NumPropertyAttributesIndices(),
+            1);
+  ASSERT_EQ(scene_from_gltf->GetMesh(draco::MeshIndex(1))
+                .NumPropertyAttributesIndices(),
+            1);
+}
+
 // Tests encoding of draco::Mesh containing a point cloud and two materials.
 TEST_F(GltfEncoderTest, EncodePointCloudWithMaterials) {
   const std::string file_name =
diff --git a/contrib/draco/src/draco/io/gltf_test_helper.cc b/contrib/draco/src/draco/io/gltf_test_helper.cc
index 13cce6f4e..4e8ed8680 100644
--- a/contrib/draco/src/draco/io/gltf_test_helper.cc
+++ b/contrib/draco/src/draco/io/gltf_test_helper.cc
@@ -20,8 +20,10 @@
 #include <utility>
 #include <vector>
 
+#include "draco/attributes/geometry_attribute.h"
 #include "draco/core/draco_test_base.h"
 #include "draco/core/draco_test_utils.h"
+#include "draco/metadata/property_attribute.h"
 #include "draco/metadata/property_table.h"
 #include "draco/texture/texture_library.h"
 
@@ -59,9 +61,6 @@ void GltfTestHelper::AddBoxMetaMeshFeatures(Scene *scene) {
       pa->SetAttributeValue(avi, &val);
     }
     const int att_id = mesh.AddPerFaceAttribute(std::move(pa));
-    std::unique_ptr<AttributeMetadata> metadata(new AttributeMetadata());
-    metadata->AddEntryString("attribute_name", "_FEATURE_ID_0");
-    mesh.AddAttributeMetadata(att_id, std::move(metadata));
 
     // Add feature ID set to the mesh.
     std::unique_ptr<MeshFeatures> features(new MeshFeatures());
@@ -69,7 +68,7 @@ void GltfTestHelper::AddBoxMetaMeshFeatures(Scene *scene) {
     features->SetFeatureCount(num_faces);
     features->SetNullFeatureId(100);
     features->SetPropertyTableIndex(0);
-    features->SetAttributeIndex(0);
+    features->SetAttributeIndex(att_id);
     mesh.AddMeshFeatures(std::move(features));
   }
 
@@ -84,9 +83,6 @@ void GltfTestHelper::AddBoxMetaMeshFeatures(Scene *scene) {
       pa->SetAttributeValue(avi, &val);
     }
     const int att_id = mesh.AddPerVertexAttribute(std::move(pa));
-    std::unique_ptr<AttributeMetadata> metadata(new AttributeMetadata());
-    metadata->AddEntryString("attribute_name", "_FEATURE_ID_1");
-    mesh.AddAttributeMetadata(att_id, std::move(metadata));
 
     // Add feature ID set to the mesh.
     std::unique_ptr<MeshFeatures> features(new MeshFeatures());
@@ -94,7 +90,7 @@ void GltfTestHelper::AddBoxMetaMeshFeatures(Scene *scene) {
     features->SetFeatureCount(num_vertices);
     features->SetNullFeatureId(101);
     features->SetPropertyTableIndex(1);
-    features->SetAttributeIndex(1);
+    features->SetAttributeIndex(att_id);
     mesh.AddMeshFeatures(std::move(features));
   }
 
@@ -113,14 +109,11 @@ void GltfTestHelper::AddBoxMetaMeshFeatures(Scene *scene) {
     }
     const int att_id =
         mesh.AddAttributeWithConnectivity(std::move(pa), corner_to_value);
-    std::unique_ptr<AttributeMetadata> metadata(new AttributeMetadata());
-    metadata->AddEntryString("attribute_name", "_FEATURE_ID_2");
-    mesh.AddAttributeMetadata(att_id, std::move(metadata));
 
     // Add feature ID set to the mesh.
     std::unique_ptr<MeshFeatures> features(new MeshFeatures());
     features->SetFeatureCount(num_corners);
-    features->SetAttributeIndex(2);
+    features->SetAttributeIndex(att_id);
     mesh.AddMeshFeatures(std::move(features));
   }
 
@@ -163,7 +156,7 @@ void GltfTestHelper::AddBoxMetaMeshFeatures(Scene *scene) {
 }
 
 void GltfTestHelper::AddBoxMetaStructuralMetadata(Scene *scene) {
-  // Add structural metadata property table schema in the following JSON:
+  // Add structural metadata schema in the following JSON:
   // "schema": {
   //   "id": "galaxy",
   //   "classes": {
@@ -181,11 +174,30 @@ void GltfTestHelper::AddBoxMetaStructuralMetadata(Scene *scene) {
   //           "type": "STRING"
   //         }
   //         "sequence": {
+  //           "componentType": "FLOAT32",
   //           "description": "The number sequence.",
   //           "required": false,
   //           "type": "SCALAR"
   //         }
   //       }
+  //     },
+  //     "movement": {
+  //       "name": "The movement.",
+  //       "description": "Vertex movement.",
+  //       "properties": {
+  //         "direction": {
+  //           "description": "Movement direction.",
+  //           "type": "VEC3",
+  //           "componentType": "FLOAT32",
+  //           "required": true
+  //         },
+  //         "magnitude": {
+  //           "description": "Movement magnitude.",
+  //           "type": "SCALAR",
+  //           "componentType": "FLOAT32",
+  //           "required": true
+  //         }
+  //       }
   //     }
   //   },
   //   "enums": {
@@ -201,35 +213,76 @@ void GltfTestHelper::AddBoxMetaStructuralMetadata(Scene *scene) {
   //       ]
   //     }
   //   }
-  // }
-  typedef PropertyTable::Schema::Object Object;
-  PropertyTable::Schema schema;
+  // },
+  // "propertyAttributes": [{
+  //   "name": "The movement.",
+  //   "class": "movement",
+  //   "properties": {
+  //     "direction": {
+  //       "attribute": "_DIRECTION",
+  //     },
+  //     "magnitude": {
+  //       "attribute": "_MAGNITUDE",
+  //     }
+  //   }
+  // }]
+  typedef StructuralMetadataSchema::Object Object;
+  StructuralMetadataSchema schema;
   Object &json = schema.json;
   json.SetObjects().emplace_back("id", "galaxy");
   json.SetObjects().emplace_back("classes");
-  json.SetObjects().back().SetObjects().emplace_back("planet");
-  Object &planet = json.SetObjects().back().SetObjects().back();
-  planet.SetObjects().emplace_back("properties");
-  Object &properties = planet.SetObjects().back();
 
-  properties.SetObjects().emplace_back("color");
-  Object &color = properties.SetObjects().back();
-  color.SetObjects().emplace_back("componentType", "UINT8");
-  color.SetObjects().emplace_back("description", "The RGB color.");
-  color.SetObjects().emplace_back("required", true);
-  color.SetObjects().emplace_back("type", "VEC3");
+  // Add class "planet" to schema.
+  {
+    json.SetObjects().back().SetObjects().emplace_back("planet");
+    Object &planet = json.SetObjects().back().SetObjects().back();
+    planet.SetObjects().emplace_back("properties");
+    Object &properties = planet.SetObjects().back();
 
-  properties.SetObjects().emplace_back("name");
-  Object &name = properties.SetObjects().back();
-  name.SetObjects().emplace_back("description", "The name.");
-  name.SetObjects().emplace_back("required", true);
-  name.SetObjects().emplace_back("type", "STRING");
+    properties.SetObjects().emplace_back("color");
+    Object &color = properties.SetObjects().back();
+    color.SetObjects().emplace_back("componentType", "UINT8");
+    color.SetObjects().emplace_back("description", "The RGB color.");
+    color.SetObjects().emplace_back("required", true);
+    color.SetObjects().emplace_back("type", "VEC3");
 
-  properties.SetObjects().emplace_back("sequence");
-  Object &sequence = properties.SetObjects().back();
-  sequence.SetObjects().emplace_back("description", "The number sequence.");
-  sequence.SetObjects().emplace_back("required", false);
-  sequence.SetObjects().emplace_back("type", "SCALAR");
+    properties.SetObjects().emplace_back("name");
+    Object &name = properties.SetObjects().back();
+    name.SetObjects().emplace_back("description", "The name.");
+    name.SetObjects().emplace_back("required", true);
+    name.SetObjects().emplace_back("type", "STRING");
+
+    properties.SetObjects().emplace_back("sequence");
+    Object &sequence = properties.SetObjects().back();
+    sequence.SetObjects().emplace_back("componentType", "FLOAT32");
+    sequence.SetObjects().emplace_back("description", "The number sequence.");
+    sequence.SetObjects().emplace_back("required", false);
+    sequence.SetObjects().emplace_back("type", "SCALAR");
+  }
+
+  // Add class "movement" to schema.
+  {
+    json.SetObjects().back().SetObjects().emplace_back("movement");
+    Object &movement = json.SetObjects().back().SetObjects().back();
+    movement.SetObjects().emplace_back("name", "The movement.");
+    movement.SetObjects().emplace_back("description", "Vertex movement.");
+    movement.SetObjects().emplace_back("properties");
+    Object &properties = movement.SetObjects().back();
+
+    properties.SetObjects().emplace_back("direction");
+    Object &direction = properties.SetObjects().back();
+    direction.SetObjects().emplace_back("componentType", "FLOAT32");
+    direction.SetObjects().emplace_back("description", "Movement direction.");
+    direction.SetObjects().emplace_back("required", true);
+    direction.SetObjects().emplace_back("type", "VEC3");
+
+    properties.SetObjects().emplace_back("magnitude");
+    Object &mag = properties.SetObjects().back();
+    mag.SetObjects().emplace_back("componentType", "FLOAT32");
+    mag.SetObjects().emplace_back("description", "Movement magnitude.");
+    mag.SetObjects().emplace_back("required", true);
+    mag.SetObjects().emplace_back("type", "SCALAR");
+  }
 
   json.SetObjects().emplace_back("enums");
   json.SetObjects().back().SetObjects().emplace_back("classifications");
@@ -260,8 +313,8 @@ void GltfTestHelper::AddBoxMetaStructuralMetadata(Scene *scene) {
   values.SetArray().back().SetObjects().emplace_back("name", "Ordnance");
   values.SetArray().back().SetObjects().emplace_back("value", 4);
 
-  // Add property table schema to the scene.
-  scene->GetStructuralMetadata().SetPropertyTableSchema(schema);
+  // Add structural metadata schema to the scene.
+  scene->GetStructuralMetadata().SetSchema(schema);
 
   // Add structural metadata property table.
   std::unique_ptr<PropertyTable> table(new PropertyTable());
@@ -334,9 +387,9 @@ void GltfTestHelper::AddBoxMetaStructuralMetadata(Scene *scene) {
                                               212, 0, 0, 0,  // Mustafar
                                               232, 0, 0, 0,  // Bespin
                                               250, 0, 0, 0,  // Yavin
-                                              12,  1, 0, 0,  // Geonosis
-                                              32,  1, 0, 0,  // UNLABELED
-                                              41,  1, 0, 0};
+                                              11,  1, 0, 0,  // Geonosis
+                                              31,  1, 0, 0,  // UNLABELED
+                                              40,  1, 0, 0};
     table->AddProperty(std::move(property));
   }
 
@@ -391,36 +444,95 @@ void GltfTestHelper::AddBoxMetaStructuralMetadata(Scene *scene) {
 
   // Add property table to the scene.
   scene->GetStructuralMetadata().AddPropertyTable(std::move(table));
+
+  // Add structural metadata property attribute.
+  std::unique_ptr<PropertyAttribute> attribute(new PropertyAttribute());
+  attribute->SetName("The movement.");
+  attribute->SetClass("movement");
+  {
+    std::unique_ptr<PropertyAttribute::Property> property(
+        new PropertyAttribute::Property());
+    property->SetName("direction");
+    property->SetAttributeName("_DIRECTION");
+    attribute->AddProperty(std::move(property));
+  }
+  {
+    std::unique_ptr<PropertyAttribute::Property> property(
+        new PropertyAttribute::Property());
+    property->SetName("magnitude");
+    property->SetAttributeName("_MAGNITUDE");
+    attribute->AddProperty(std::move(property));
+  }
+  scene->GetStructuralMetadata().AddPropertyAttribute(std::move(attribute));
+
+  // Get mesh element counts.
+  Mesh &mesh = scene->GetMesh(MeshIndex(0));
+  ASSERT_EQ(mesh.num_faces(), 12);
+  ASSERT_EQ(mesh.num_points(), 36);
+  const int num_vertices =
+      mesh.GetNamedAttribute(GeometryAttribute::POSITION)->size();
+
+  // Add per-vertex Float32 3D vector property attribute named _DIRECTION.
+  {
+    // Create property attribute.
+    constexpr DataType kType = DataType::DT_FLOAT32;
+    std::unique_ptr<PointAttribute> pa(new PointAttribute());
+    pa->Init(GeometryAttribute::GENERIC, 3, kType, false, num_vertices);
+    for (AttributeValueIndex avi(0); avi < num_vertices; ++avi) {
+      const std::array<float, 3> val = {
+          avi.value() + 0.10f, avi.value() + 0.20f, avi.value() + 0.30f};
+      pa->SetAttributeValue(avi, &val);
+    }
+    const int att_id = mesh.AddPerVertexAttribute(std::move(pa));
+    mesh.attribute(att_id)->set_name("_DIRECTION");
+  }
+
+  // Add per-vertex Float32 scalar property attribute named _MAGNITUDE.
+  {
+    // Create property attribute.
+    constexpr DataType kType = DataType::DT_FLOAT32;
+    std::unique_ptr<PointAttribute> pa(new PointAttribute());
+    pa->Init(GeometryAttribute::GENERIC, 1, kType, false, num_vertices);
+    for (AttributeValueIndex avi(0); avi < num_vertices; ++avi) {
+      const float val = avi.value();
+      pa->SetAttributeValue(avi, &val);
+    }
+    const int att_id = mesh.AddPerVertexAttribute(std::move(pa));
+    mesh.attribute(att_id)->set_name("_MAGNITUDE");
+  }
+
+  // Add property attribute to the mesh.
+  mesh.AddPropertyAttributesIndex(0);
 }
 
 template <>
 void GltfTestHelper::CheckBoxMetaMeshFeatures(const Mesh &geometry,
-                                              bool has_draco_compression) {
+                                              const UseCase &use_case) {
   CheckBoxMetaMeshFeatures(geometry, geometry.GetNonMaterialTextureLibrary(),
-                           has_draco_compression);
+                           use_case);
 }
 
 template <>
 void GltfTestHelper::CheckBoxMetaMeshFeatures(const Scene &geometry,
-                                              bool has_draco_compression) {
+                                              const UseCase &use_case) {
   ASSERT_EQ(geometry.NumMeshes(), 1);
   CheckBoxMetaMeshFeatures(geometry.GetMesh(MeshIndex(0)),
-                           geometry.GetNonMaterialTextureLibrary(),
-                           has_draco_compression);
+                           geometry.GetNonMaterialTextureLibrary(), use_case);
 }
 
 void GltfTestHelper::CheckBoxMetaMeshFeatures(const Mesh &mesh,
                                               const TextureLibrary &texture_lib,
-                                              bool has_draco_compression) {
+                                              const UseCase &use_case) {
   // Check texture library.
   ASSERT_EQ(texture_lib.NumTextures(), 2);
 
   // Check basic mesh properties.
   ASSERT_EQ(mesh.NumMeshFeatures(), 5);
   ASSERT_EQ(mesh.num_faces(), 12);
-  ASSERT_EQ(mesh.num_attributes(), 7);
+  ASSERT_EQ(mesh.num_attributes(), use_case.has_structural_metadata ? 9 : 7);
   ASSERT_EQ(mesh.num_points(), 36);
-  ASSERT_EQ(mesh.NumNamedAttributes(GeometryAttribute::GENERIC), 3);
+  ASSERT_EQ(mesh.NumNamedAttributes(GeometryAttribute::GENERIC),
+            use_case.has_structural_metadata ? 5 : 3);
   ASSERT_EQ(mesh.NumNamedAttributes(GeometryAttribute::TEX_COORD), 2);
 
   // Get mesh element counts.
@@ -437,15 +549,15 @@ void GltfTestHelper::CheckBoxMetaMeshFeatures(const Mesh &mesh,
     ASSERT_EQ(features.GetFeatureCount(), num_faces);
     ASSERT_EQ(features.GetNullFeatureId(), 100);
     ASSERT_EQ(features.GetPropertyTableIndex(), 0);
-    ASSERT_EQ(features.GetAttributeIndex(), 0);
+    ASSERT_EQ(features.GetAttributeIndex(),
+              use_case.has_structural_metadata ? 5 : 4);
     ASSERT_TRUE(features.GetTextureChannels().empty());
     ASSERT_EQ(features.GetTextureMap().texture(), nullptr);
     ASSERT_EQ(features.GetTextureMap().tex_coord_index(), -1);
 
     // Check per-face Uint8 attribute named _FEATURE_ID_0.
-    const int att_id =
-        mesh.GetAttributeIdByMetadataEntry("attribute_name", "_FEATURE_ID_0");
-    auto att = mesh.GetAttributeByUniqueId(att_id);
+    const int att_id = features.GetAttributeIndex();
+    const auto att = mesh.attribute(att_id);
     ASSERT_NE(att, nullptr);
     ASSERT_EQ(att->attribute_type(), GeometryAttribute::GENERIC);
     ASSERT_EQ(att->data_type(), DataType::DT_UINT8);
@@ -455,7 +567,7 @@ void GltfTestHelper::CheckBoxMetaMeshFeatures(const Mesh &mesh,
 
     // Check that the values are all the numbers from 0 to 12.
     const std::vector<uint8_t> expected_values =
-        has_draco_compression
+        use_case.has_draco_compression
             ? std::vector<uint8_t>{7, 11, 10, 3, 2, 5, 4, 1, 6, 9, 8, 0}
             : std::vector<uint8_t>{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
     for (int i = 0; i < num_faces; i++) {
@@ -482,15 +594,15 @@ void GltfTestHelper::CheckBoxMetaMeshFeatures(const Mesh &mesh,
     ASSERT_EQ(features.GetFeatureCount(), num_vertices);
     ASSERT_EQ(features.GetNullFeatureId(), 101);
     ASSERT_EQ(features.GetPropertyTableIndex(), 1);
-    ASSERT_EQ(features.GetAttributeIndex(), 1);
+    ASSERT_EQ(features.GetAttributeIndex(),
+              use_case.has_structural_metadata ? 6 : 5);
     ASSERT_TRUE(features.GetTextureChannels().empty());
     ASSERT_EQ(features.GetTextureMap().texture(), nullptr);
     ASSERT_EQ(features.GetTextureMap().tex_coord_index(), -1);
 
     // Check per-vertex Uint16 attribute named _FEATURE_ID_1.
-    const int att_id =
-        mesh.GetAttributeIdByMetadataEntry("attribute_name", "_FEATURE_ID_1");
-    auto att = mesh.GetAttributeByUniqueId(att_id);
+    const int att_id = features.GetAttributeIndex();
+    const auto att = mesh.attribute(att_id);
     ASSERT_NE(att, nullptr);
     ASSERT_EQ(att->attribute_type(), GeometryAttribute::GENERIC);
     ASSERT_EQ(att->data_type(), DataType::DT_UINT16);
@@ -500,8 +612,9 @@ void GltfTestHelper::CheckBoxMetaMeshFeatures(const Mesh &mesh,
 
     // Check that the values are all the numbers from 0 to 7.
     const std::vector<uint16_t> expected_values =
-        has_draco_compression ? std::vector<uint16_t>{3, 6, 7, 4, 5, 0, 1, 2}
-                              : std::vector<uint16_t>{0, 1, 2, 3, 4, 5, 6, 7};
+        use_case.has_draco_compression
+            ? std::vector<uint16_t>{3, 6, 7, 4, 5, 0, 1, 2}
+            : std::vector<uint16_t>{0, 1, 2, 3, 4, 5, 6, 7};
     for (int i = 0; i < num_vertices; i++) {
       uint16_t val;
       att->GetValue(AttributeValueIndex(i), &val);
@@ -528,15 +641,15 @@ void GltfTestHelper::CheckBoxMetaMeshFeatures(const Mesh &mesh,
     ASSERT_EQ(features.GetFeatureCount(), num_corners);
     ASSERT_EQ(features.GetNullFeatureId(), -1);
     ASSERT_EQ(features.GetPropertyTableIndex(), -1);
-    ASSERT_EQ(features.GetAttributeIndex(), 2);
+    ASSERT_EQ(features.GetAttributeIndex(),
+              use_case.has_structural_metadata ? 7 : 6);
     ASSERT_TRUE(features.GetTextureChannels().empty());
     ASSERT_EQ(features.GetTextureMap().texture(), nullptr);
     ASSERT_EQ(features.GetTextureMap().tex_coord_index(), -1);
 
     // Check per-corner Float attribute named _FEATURE_ID_2.
-    const int att_id =
-        mesh.GetAttributeIdByMetadataEntry("attribute_name", "_FEATURE_ID_2");
-    auto att = mesh.GetAttributeByUniqueId(att_id);
+    const int att_id = features.GetAttributeIndex();
+    const auto att = mesh.attribute(att_id);
     ASSERT_NE(att, nullptr);
     ASSERT_EQ(att->attribute_type(), GeometryAttribute::GENERIC);
     ASSERT_EQ(att->data_type(), DataType::DT_FLOAT32);
@@ -547,7 +660,7 @@ void GltfTestHelper::CheckBoxMetaMeshFeatures(const Mesh &mesh,
 
     // Check that the values are from 0 to 35.
     const std::vector<float> expected_values =
-        has_draco_compression
+        use_case.has_draco_compression
             ? std::vector<float>{23, 21, 22, 33, 34, 35, 31, 32, 30, 9, 10, 11,
                                  7,  8,  6,  15, 16, 17, 14, 12, 13, 5, 3,  4,
                                  19, 20, 18, 27, 28, 29, 26, 24, 25, 1, 2,  0}
@@ -598,55 +711,104 @@ void GltfTestHelper::CheckBoxMetaMeshFeatures(const Mesh &mesh,
 }
 
 void GltfTestHelper::CheckBoxMetaStructuralMetadata(
-    const StructuralMetadata &structural_metadata) {
-  // Check property table schema.
+    const Mesh &mesh, const StructuralMetadata &structural_metadata,
+    const UseCase &use_case) {
+  // Check structural metadata schema.
   {
-    const PropertyTable::Schema &schema =
-        structural_metadata.GetPropertyTableSchema();
+    const StructuralMetadataSchema &schema = structural_metadata.GetSchema();
     ASSERT_FALSE(schema.Empty());
-    const PropertyTable::Schema::Object &json = schema.json;
+    const StructuralMetadataSchema::Object &json = schema.json;
     ASSERT_EQ(json.GetObjects().size(), 3);
     ASSERT_EQ(json.GetObjects()[0].GetName(), "classes");
-    ASSERT_EQ(json.GetObjects()[0].GetObjects().size(), 1);
-    ASSERT_EQ(json.GetObjects()[0].GetObjects()[0].GetName(), "planet");
-    ASSERT_EQ(json.GetObjects()[0].GetObjects()[0].GetObjects().size(), 1);
+    ASSERT_EQ(json.GetObjects()[0].GetObjects().size(), 2);
 
-    const auto &properties =
-        json.GetObjects()[0].GetObjects()[0].GetObjects()[0];
-    ASSERT_EQ(properties.GetName(), "properties");
-    ASSERT_EQ(properties.GetObjects().size(), 3);
+    // Check class "movement".
+    {
+      const auto item = json.GetObjects()[0].GetObjects()[0];
+      ASSERT_EQ(item.GetName(), "movement");
+      ASSERT_EQ(item.GetObjects().size(), 3);
 
-    const auto &color = properties.GetObjects()[0];
-    ASSERT_EQ(color.GetName(), "color");
-    ASSERT_EQ(color.GetObjects().size(), 4);
-    ASSERT_EQ(color.GetObjects()[0].GetName(), "componentType");
-    ASSERT_EQ(color.GetObjects()[1].GetName(), "description");
-    ASSERT_EQ(color.GetObjects()[2].GetName(), "required");
-    ASSERT_EQ(color.GetObjects()[3].GetName(), "type");
-    ASSERT_EQ(color.GetObjects()[0].GetString(), "UINT8");
-    ASSERT_EQ(color.GetObjects()[1].GetString(), "The RGB color.");
-    ASSERT_TRUE(color.GetObjects()[2].GetBoolean());
-    ASSERT_EQ(color.GetObjects()[3].GetString(), "VEC3");
+      const auto &description = item.GetObjects()[0];
+      ASSERT_EQ(description.GetName(), "description");
+      ASSERT_EQ(description.GetString(), "Vertex movement.");
 
-    const auto &name = properties.GetObjects()[1];
-    ASSERT_EQ(name.GetName(), "name");
-    ASSERT_EQ(name.GetObjects().size(), 3);
-    ASSERT_EQ(name.GetObjects()[0].GetName(), "description");
-    ASSERT_EQ(name.GetObjects()[1].GetName(), "required");
-    ASSERT_EQ(name.GetObjects()[2].GetName(), "type");
-    ASSERT_EQ(name.GetObjects()[0].GetString(), "The name.");
-    ASSERT_TRUE(name.GetObjects()[1].GetBoolean());
-    ASSERT_EQ(name.GetObjects()[2].GetString(), "STRING");
+      const auto &name = item.GetObjects()[1];
+      ASSERT_EQ(name.GetName(), "name");
+      ASSERT_EQ(name.GetString(), "The movement.");
 
-    const auto &sequence = properties.GetObjects()[2];
-    ASSERT_EQ(sequence.GetName(), "sequence");
-    ASSERT_EQ(sequence.GetObjects().size(), 3);
-    ASSERT_EQ(sequence.GetObjects()[0].GetName(), "description");
-    ASSERT_EQ(sequence.GetObjects()[1].GetName(), "required");
-    ASSERT_EQ(sequence.GetObjects()[2].GetName(), "type");
-    ASSERT_EQ(sequence.GetObjects()[0].GetString(), "The number sequence.");
-    ASSERT_FALSE(sequence.GetObjects()[1].GetBoolean());
-    ASSERT_EQ(sequence.GetObjects()[2].GetString(), "SCALAR");
+      const auto &properties = item.GetObjects()[2];
+      ASSERT_EQ(properties.GetName(), "properties");
+      ASSERT_EQ(properties.GetObjects().size(), 2);
+
+      const auto &direction = properties.GetObjects()[0];
+      ASSERT_EQ(direction.GetName(), "direction");
+      ASSERT_EQ(direction.GetObjects().size(), 4);
+      ASSERT_EQ(direction.GetObjects()[0].GetName(), "componentType");
+      ASSERT_EQ(direction.GetObjects()[1].GetName(), "description");
+      ASSERT_EQ(direction.GetObjects()[2].GetName(), "required");
+      ASSERT_EQ(direction.GetObjects()[3].GetName(), "type");
+      ASSERT_EQ(direction.GetObjects()[0].GetString(), "FLOAT32");
+      ASSERT_EQ(direction.GetObjects()[1].GetString(), "Movement direction.");
+      ASSERT_EQ(direction.GetObjects()[2].GetBoolean(), true);
+      ASSERT_EQ(direction.GetObjects()[3].GetString(), "VEC3");
+
+      const auto &mag = properties.GetObjects()[1];
+      ASSERT_EQ(mag.GetName(), "magnitude");
+      ASSERT_EQ(mag.GetObjects().size(), 4);
+      ASSERT_EQ(mag.GetObjects()[0].GetName(), "componentType");
+      ASSERT_EQ(mag.GetObjects()[1].GetName(), "description");
+      ASSERT_EQ(mag.GetObjects()[2].GetName(), "required");
+      ASSERT_EQ(mag.GetObjects()[3].GetName(), "type");
+      ASSERT_EQ(mag.GetObjects()[0].GetString(), "FLOAT32");
+      ASSERT_EQ(mag.GetObjects()[1].GetString(), "Movement magnitude.");
+      ASSERT_EQ(mag.GetObjects()[2].GetBoolean(), true);
+      ASSERT_EQ(mag.GetObjects()[3].GetString(), "SCALAR");
+    }
+
+    // Check class "planet".
+    {
+      const auto item = json.GetObjects()[0].GetObjects()[1];
+      ASSERT_EQ(item.GetName(), "planet");
+      ASSERT_EQ(item.GetObjects().size(), 1);
+
+      const auto &properties = item.GetObjects()[0];
+      ASSERT_EQ(properties.GetName(), "properties");
+      ASSERT_EQ(properties.GetObjects().size(), 3);
+
+      const auto &color = properties.GetObjects()[0];
+      ASSERT_EQ(color.GetName(), "color");
+      ASSERT_EQ(color.GetObjects().size(), 4);
+      ASSERT_EQ(color.GetObjects()[0].GetName(), "componentType");
+      ASSERT_EQ(color.GetObjects()[1].GetName(), "description");
+      ASSERT_EQ(color.GetObjects()[2].GetName(), "required");
+      ASSERT_EQ(color.GetObjects()[3].GetName(), "type");
+      ASSERT_EQ(color.GetObjects()[0].GetString(), "UINT8");
+      ASSERT_EQ(color.GetObjects()[1].GetString(), "The RGB color.");
+      ASSERT_TRUE(color.GetObjects()[2].GetBoolean());
+      ASSERT_EQ(color.GetObjects()[3].GetString(), "VEC3");
+
+      const auto &name = properties.GetObjects()[1];
+      ASSERT_EQ(name.GetName(), "name");
+      ASSERT_EQ(name.GetObjects().size(), 3);
+      ASSERT_EQ(name.GetObjects()[0].GetName(), "description");
+      ASSERT_EQ(name.GetObjects()[1].GetName(), "required");
+      ASSERT_EQ(name.GetObjects()[2].GetName(), "type");
+      ASSERT_EQ(name.GetObjects()[0].GetString(), "The name.");
+      ASSERT_TRUE(name.GetObjects()[1].GetBoolean());
+      ASSERT_EQ(name.GetObjects()[2].GetString(), "STRING");
+
+      const auto &sequence = properties.GetObjects()[2];
+      ASSERT_EQ(sequence.GetName(), "sequence");
+      ASSERT_EQ(sequence.GetObjects().size(), 4);
+      ASSERT_EQ(sequence.GetObjects()[0].GetName(), "componentType");
+      ASSERT_EQ(sequence.GetObjects()[1].GetName(), "description");
+      ASSERT_EQ(sequence.GetObjects()[2].GetName(), "required");
+      ASSERT_EQ(sequence.GetObjects()[3].GetName(), "type");
+      ASSERT_EQ(sequence.GetObjects()[0].GetString(), "FLOAT32");
+      ASSERT_EQ(sequence.GetObjects()[1].GetString(), "The number sequence.");
+      ASSERT_FALSE(sequence.GetObjects()[2].GetBoolean());
+      ASSERT_EQ(sequence.GetObjects()[3].GetString(), "SCALAR");
+    }
 
     ASSERT_EQ(json.GetObjects()[1].GetName(), "enums");
     const auto &classifications = json.GetObjects()[1].GetObjects()[0];
@@ -736,11 +898,11 @@ void GltfTestHelper::CheckBoxMetaStructuralMetadata(
     ASSERT_EQ(offsets[1], 0);
     ASSERT_EQ(offsets[2], 0);
     ASSERT_EQ(offsets[3], 0);
-    ASSERT_EQ(offsets[60], 32);  // UNLABELED 287.
+    ASSERT_EQ(offsets[60], 31);  // UNLABELED 287.
     ASSERT_EQ(offsets[61], 1);
     ASSERT_EQ(offsets[62], 0);
     ASSERT_EQ(offsets[63], 0);
-    ASSERT_EQ(offsets[64], 41);  // Beyond UNLABELED 296.
+    ASSERT_EQ(offsets[64], 40);  // Beyond UNLABELED 296.
     ASSERT_EQ(offsets[65], 1);
     ASSERT_EQ(offsets[66], 0);
     ASSERT_EQ(offsets[67], 0);
@@ -748,8 +910,8 @@ void GltfTestHelper::CheckBoxMetaStructuralMetadata(
     struct Name {
       static std::string Extract(const std::vector<uint8_t> &data,
                                  const std::vector<uint8_t> &offsets, int row) {
-        const int b = offsets[4 * (row + 0)] + 255 * offsets[4 * (row + 0) + 1];
-        const int e = offsets[4 * (row + 1)] + 255 * offsets[4 * (row + 1) + 1];
+        const int b = offsets[4 * (row + 0)] + 256 * offsets[4 * (row + 0) + 1];
+        const int e = offsets[4 * (row + 1)] + 256 * offsets[4 * (row + 1) + 1];
         return std::string(data.begin() + b, data.begin() + e);
       }
     };
@@ -757,6 +919,9 @@ void GltfTestHelper::CheckBoxMetaStructuralMetadata(
     // Check that the names can be extracted from the data.
     ASSERT_EQ(Name::Extract(data, offsets, 0), "named_class:Tatooine");
     ASSERT_EQ(Name::Extract(data, offsets, 6), "named_class:Corellia");
+    ASSERT_EQ(Name::Extract(data, offsets, 12), "named_class:Bespin");
+    ASSERT_EQ(Name::Extract(data, offsets, 13), "named_class:Yavin");
+    ASSERT_EQ(Name::Extract(data, offsets, 14), "named_class:Geonosis");
     ASSERT_EQ(Name::Extract(data, offsets, 15), "UNLABELED");
 
     ASSERT_TRUE(property.GetArrayOffsets().type.empty());
@@ -816,6 +981,101 @@ void GltfTestHelper::CheckBoxMetaStructuralMetadata(
     ASSERT_TRUE(property.GetStringOffsets().data.data.empty());
     ASSERT_EQ(property.GetStringOffsets().data.target, 0);
   }
+
+  // Check property attributes in structural metadata.
+  ASSERT_EQ(structural_metadata.NumPropertyAttributes(), 1);
+  {
+    const PropertyAttribute &attribute =
+        structural_metadata.GetPropertyAttribute(0);
+    ASSERT_EQ(attribute.GetName(), "The movement.");
+    ASSERT_EQ(attribute.GetClass(), "movement");
+    ASSERT_EQ(attribute.NumProperties(), 2);
+
+    const PropertyAttribute::Property &direction = attribute.GetProperty(0);
+    ASSERT_EQ(direction.GetName(), "direction");
+    ASSERT_EQ(direction.GetAttributeName(), "_DIRECTION");
+
+    const PropertyAttribute::Property &magnitude = attribute.GetProperty(1);
+    ASSERT_EQ(magnitude.GetName(), "magnitude");
+    ASSERT_EQ(magnitude.GetAttributeName(), "_MAGNITUDE");
+  }
+
+  // Check property attributes in the |mesh|.
+  ASSERT_EQ(mesh.NumPropertyAttributesIndices(), 1);
+  ASSERT_EQ(mesh.GetPropertyAttributesIndex(0), 0);
+  ASSERT_EQ(mesh.num_faces(), 12);
+  ASSERT_EQ(mesh.num_attributes(), 9);
+  ASSERT_EQ(mesh.num_points(), 36);
+  ASSERT_EQ(mesh.NumNamedAttributes(GeometryAttribute::GENERIC), 5);
+
+  // Get mesh element counts.
+  const int num_corners = 3 * mesh.num_faces();
+  const int num_vertices =
+      mesh.GetNamedAttribute(GeometryAttribute::POSITION)->size();
+
+  // Check property attribute named _DIRECTION.
+  {
+    const auto att =
+        mesh.GetNamedAttributeByName(GeometryAttribute::GENERIC, "_DIRECTION");
+    ASSERT_NE(att, nullptr);
+    ASSERT_EQ(att->attribute_type(), GeometryAttribute::GENERIC);
+    ASSERT_EQ(att->data_type(), DataType::DT_FLOAT32);
+    ASSERT_EQ(att->num_components(), 3);
+    ASSERT_EQ(att->size(), num_vertices);
+    ASSERT_EQ(att->indices_map_size(), num_corners);
+
+    // Check attribute values.
+    // clang-format off
+    const std::vector<float> expected_values =
+        use_case.has_draco_compression
+            ? std::vector<float>{3.1f, 3.2f, 3.3f,
+                                 6.1f, 6.2f, 6.3f,
+                                 7.1f, 7.2f, 7.3f,
+                                 4.1f, 4.2f, 4.3f,
+                                 5.1f, 5.2f, 5.3f,
+                                 0.1f, 0.2f, 0.3f,
+                                 1.1f, 1.2f, 1.3f,
+                                 2.1f, 2.2f, 2.3f}
+            : std::vector<float>{0.1f, 0.2f, 0.3f,
+                                 1.1f, 1.2f, 1.3f,
+                                 2.1f, 2.2f, 2.3f,
+                                 3.1f, 3.2f, 3.3f,
+                                 4.1f, 4.2f, 4.3f,
+                                 5.1f, 5.2f, 5.3f,
+                                 6.1f, 6.2f, 6.3f,
+                                 7.1f, 7.2f, 7.3f};
+    // clang-format on
+    for (int i = 0; i < num_vertices; i++) {
+      std::array<float, 3> val;
+      att->GetValue(AttributeValueIndex(i), &val);
+      ASSERT_EQ(val[0], expected_values[3 * i + 0]);
+      ASSERT_EQ(val[1], expected_values[3 * i + 1]);
+      ASSERT_EQ(val[2], expected_values[3 * i + 2]);
+    }
+  }
+
+  // Check property attribute named _MAGNITUDE.
+  {
+    const auto att =
+        mesh.GetNamedAttributeByName(GeometryAttribute::GENERIC, "_MAGNITUDE");
+    ASSERT_NE(att, nullptr);
+    ASSERT_EQ(att->attribute_type(), GeometryAttribute::GENERIC);
+    ASSERT_EQ(att->data_type(), DataType::DT_FLOAT32);
+    ASSERT_EQ(att->num_components(), 1);
+    ASSERT_EQ(att->size(), num_vertices);
+    ASSERT_EQ(att->indices_map_size(), num_corners);
+
+    // Check attribute values.
+    const std::vector<float> expected_values =
+        use_case.has_draco_compression
+            ? std::vector<float>{3.f, 6.f, 7.f, 4.f, 5.f, 0.f, 1.f, 2.f}
+            : std::vector<float>{0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f};
+    for (int i = 0; i < num_vertices; i++) {
+      float val;
+      att->GetValue(AttributeValueIndex(i), &val);
+      ASSERT_EQ(val, expected_values[i]);
+    }
+  }
 }
 
 #endif  // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/io/gltf_test_helper.h b/contrib/draco/src/draco/io/gltf_test_helper.h
index 91aec9b08..1d56418a7 100644
--- a/contrib/draco/src/draco/io/gltf_test_helper.h
+++ b/contrib/draco/src/draco/io/gltf_test_helper.h
@@ -25,9 +25,15 @@ namespace draco {
 // Helper class for testing Draco glTF encoder and decoder.
 class GltfTestHelper {
  public:
-  // Adds various mesh feature ID sets (via attributes and via textures) and
-  // structural metadata property table and property table schema to the box
-  // |scene| loaded from the test file testdata/Box/glTF/Box.gltf.
+  struct UseCase {
+    bool has_draco_compression = false;
+    bool has_mesh_features = false;
+    bool has_structural_metadata = false;
+  };
+
+  // Adds various mesh feature ID sets (via attributes and via textures),
+  // structural metadata schema, property table, and property attributes to the
+  // box |scene| loaded from the test file testdata/Box/glTF/Box.gltf.
   static void AddBoxMetaMeshFeatures(Scene *scene);
   static void AddBoxMetaStructuralMetadata(Scene *scene);
 
@@ -37,22 +43,31 @@ class GltfTestHelper {
   // 2. testdata/BoxMetaDraco/glTF/BoxMetaDraco.gltf
   template <typename GeometryT>
   static void CheckBoxMetaMeshFeatures(const GeometryT &geometry,
-                                       bool has_draco_compression);
+                                       const UseCase &use_case);
 
   // Checks the box |geometry| (draco::Mesh or draco::Scene) with structural
-  // metadata that includes property table and property table schema loaded from
-  // test file testdata/BoxMeta/glTF/BoxMeta.gltf.
+  // metadata that includes schema, property table, and property attributes
+  // loaded from test file testdata/BoxMeta/glTF/BoxMeta.gltf.
   template <typename GeometryT>
-  static void CheckBoxMetaStructuralMetadata(const GeometryT &geometry) {
-    CheckBoxMetaStructuralMetadata(geometry.GetStructuralMetadata());
+  static void CheckBoxMetaStructuralMetadata(const GeometryT &geometry,
+                                             const UseCase &use_case) {
+    if constexpr (std::is_same_v<GeometryT, Mesh>) {
+      CheckBoxMetaStructuralMetadata(geometry, geometry.GetStructuralMetadata(),
+                                     use_case);
+    } else {
+      CheckBoxMetaStructuralMetadata(geometry.GetMesh(MeshIndex(0)),
+                                     geometry.GetStructuralMetadata(),
+                                     use_case);
+    }
   }
 
  private:
   static void CheckBoxMetaMeshFeatures(const Mesh &mesh,
                                        const TextureLibrary &texture_lib,
-                                       bool has_draco_compression);
+                                       const UseCase &use_case);
   static void CheckBoxMetaStructuralMetadata(
-      const StructuralMetadata &structural_metadata);
+      const Mesh &mesh, const StructuralMetadata &structural_metadata,
+      const UseCase &use_case);
 };
 
 }  // namespace draco
diff --git a/contrib/draco/src/draco/io/gltf_utils.cc b/contrib/draco/src/draco/io/gltf_utils.cc
index bf5c048ef..95e89c90f 100644
--- a/contrib/draco/src/draco/io/gltf_utils.cc
+++ b/contrib/draco/src/draco/io/gltf_utils.cc
@@ -79,6 +79,12 @@ void JsonWriter::EndObject() {
   o_ << indent_ << "}";
 }
 
+void JsonWriter::BeginArray() {
+  FinishPreviousLine(BEGIN);
+  o_ << indent_ << "[";
+  indent_writer_.Increase();
+}
+
 void JsonWriter::BeginArray(const std::string &name) {
   FinishPreviousLine(BEGIN);
   o_ << indent_ << "\"" << name << "\":" << separator_ << "[";
diff --git a/contrib/draco/src/draco/io/gltf_utils.h b/contrib/draco/src/draco/io/gltf_utils.h
index 2cf12fdc7..befbacbbe 100644
--- a/contrib/draco/src/draco/io/gltf_utils.h
+++ b/contrib/draco/src/draco/io/gltf_utils.h
@@ -90,6 +90,7 @@ class JsonWriter {
   void EndObject();
 
   // Every call to BeginArray should have a matching call to EndArray.
+  void BeginArray();
   void BeginArray(const std::string &name);
   void EndArray();
 
diff --git a/contrib/draco/src/draco/io/gltf_utils_test.cc b/contrib/draco/src/draco/io/gltf_utils_test.cc
index 01a2d144c..a5a0c75be 100644
--- a/contrib/draco/src/draco/io/gltf_utils_test.cc
+++ b/contrib/draco/src/draco/io/gltf_utils_test.cc
@@ -216,6 +216,13 @@ TEST_F(GltfUtilsTest, TestArrays) {
   json_writer.EndArray();
   json_writer.EndArray();
   CompareGolden(&json_writer, "\"array1\": [\n  \"array2\": [\n  ]\n]");
+
+  json_writer.Reset();
+  json_writer.BeginArray("array1");
+  json_writer.BeginArray();
+  json_writer.EndArray();
+  json_writer.EndArray();
+  CompareGolden(&json_writer, "\"array1\": [\n  [\n  ]\n]");
 }
 
 TEST_F(GltfUtilsTest, TestGltfValues) {
@@ -359,6 +366,13 @@ TEST_F(GltfUtilsTest, TestArraysCompact) {
   json_writer.EndArray();
   json_writer.EndArray();
   CompareGolden(&json_writer, "\"array1\":[\"array2\":[]]");
+
+  json_writer.Reset();
+  json_writer.BeginArray("array1");
+  json_writer.BeginArray();
+  json_writer.EndArray();
+  json_writer.EndArray();
+  CompareGolden(&json_writer, "\"array1\":[[]]");
 }
 
 }  // namespace draco
diff --git a/contrib/draco/src/draco/io/image_compression_options.h b/contrib/draco/src/draco/io/image_compression_options.h
index 722bdbd64..d29f969a2 100644
--- a/contrib/draco/src/draco/io/image_compression_options.h
+++ b/contrib/draco/src/draco/io/image_compression_options.h
@@ -23,7 +23,13 @@
 namespace draco {
 
 // Enum defining image compression formats.
-enum class ImageFormat { NONE, PNG, JPEG, BASIS, WEBP };
+enum class ImageFormat {
+  NONE,
+  PNG,
+  JPEG,
+  BASIS,
+  WEBP,
+};
 
 }  // namespace draco
 
diff --git a/contrib/draco/src/draco/io/obj_decoder.cc b/contrib/draco/src/draco/io/obj_decoder.cc
index c233c2b56..15ef51c42 100644
--- a/contrib/draco/src/draco/io/obj_decoder.cc
+++ b/contrib/draco/src/draco/io/obj_decoder.cc
@@ -541,7 +541,7 @@ bool ObjDecoder::ParseMaterial(Status * /* status */) {
   parser::SkipWhitespace(&line_buffer);
   std::string mat_name;
   parser::ParseLine(&line_buffer, &mat_name);
-  if (mat_name.length() == 0) {
+  if (mat_name.empty()) {
     return false;
   }
   auto it = material_name_to_id_.find(mat_name);
@@ -572,7 +572,7 @@ bool ObjDecoder::ParseObject(Status *status) {
   if (!parser::ParseString(&line_buffer, &obj_name)) {
     return false;
   }
-  if (obj_name.length() == 0) {
+  if (obj_name.empty()) {
     return true;  // Ignore empty name entries.
   }
   auto it = obj_name_to_id_.find(obj_name);
diff --git a/contrib/draco/src/draco/io/obj_encoder.cc b/contrib/draco/src/draco/io/obj_encoder.cc
index 1ddfd92bd..70156fc48 100644
--- a/contrib/draco/src/draco/io/obj_encoder.cc
+++ b/contrib/draco/src/draco/io/obj_encoder.cc
@@ -407,7 +407,8 @@ bool ObjEncoder::EncodeFaceCorner(PointIndex vert_index) {
 }
 
 void ObjEncoder::EncodeFloat(float val) {
-  snprintf(num_buffer_, sizeof(num_buffer_), "%f", val);
+  // Use %F instead of %f to make the floating point non-locale aware.
+  snprintf(num_buffer_, sizeof(num_buffer_), "%F", val);
   buffer()->Encode(num_buffer_, strlen(num_buffer_));
 }
 
diff --git a/contrib/draco/src/draco/io/ply_decoder.cc b/contrib/draco/src/draco/io/ply_decoder.cc
index b78c05690..bd9375363 100644
--- a/contrib/draco/src/draco/io/ply_decoder.cc
+++ b/contrib/draco/src/draco/io/ply_decoder.cc
@@ -94,7 +94,7 @@ Status PlyDecoder::DecodeInternal() {
 Status PlyDecoder::DecodeFaceData(const PlyElement *face_element) {
   // We accept point clouds now.
   if (face_element == nullptr) {
-    return Status(Status::INVALID_PARAMETER, "face_element is null");
+    return OkStatus();
   }
   const PlyProperty *vertex_indices =
       face_element->GetPropertyByName("vertex_indices");
diff --git a/contrib/draco/src/draco/io/ply_decoder_test.cc b/contrib/draco/src/draco/io/ply_decoder_test.cc
index 1dd70d5cb..9a08252cd 100644
--- a/contrib/draco/src/draco/io/ply_decoder_test.cc
+++ b/contrib/draco/src/draco/io/ply_decoder_test.cc
@@ -36,14 +36,11 @@ class PlyDecoderTest : public ::testing::Test {
 
   void test_decoding(const std::string &file_name, int num_faces,
                      uint32_t num_points, std::unique_ptr<Mesh> *out_mesh) {
-    // Don't test mesh decoding when the input is point cloud.
-    if (num_faces > 0) {
-      std::unique_ptr<Mesh> mesh(DecodePly<Mesh>(file_name));
-      ASSERT_NE(mesh, nullptr) << "Failed to load test model " << file_name;
-      ASSERT_EQ(mesh->num_faces(), num_faces);
-      if (out_mesh) {
-        *out_mesh = std::move(mesh);
-      }
+    std::unique_ptr<Mesh> mesh(DecodePly<Mesh>(file_name));
+    ASSERT_NE(mesh, nullptr) << "Failed to load test model " << file_name;
+    ASSERT_EQ(mesh->num_faces(), num_faces);
+    if (out_mesh) {
+      *out_mesh = std::move(mesh);
     }
 
     const std::unique_ptr<PointCloud> pc(DecodePly<PointCloud>(file_name));
diff --git a/contrib/draco/src/draco/io/stl_encoder_test.cc b/contrib/draco/src/draco/io/stl_encoder_test.cc
index da6298d64..adca55415 100644
--- a/contrib/draco/src/draco/io/stl_encoder_test.cc
+++ b/contrib/draco/src/draco/io/stl_encoder_test.cc
@@ -32,8 +32,15 @@ class StlEncoderTest : public ::testing::Test {
     ASSERT_EQ(mesh0->num_faces(), mesh1->num_faces());
     ASSERT_EQ(mesh0->num_attributes(), mesh1->num_attributes());
     for (size_t att_id = 0; att_id < mesh0->num_attributes(); ++att_id) {
-      ASSERT_EQ(mesh0->attribute(att_id)->size(),
-                mesh1->attribute(att_id)->size());
+      ASSERT_EQ(mesh0->attribute(att_id)->attribute_type(),
+                mesh1->attribute(att_id)->attribute_type());
+      // Normals are recomputed during STL encoding and they may not
+      // correspond to the source ones.
+      if (mesh0->attribute(att_id)->attribute_type() !=
+          GeometryAttribute::NORMAL) {
+        ASSERT_EQ(mesh0->attribute(att_id)->size(),
+                  mesh1->attribute(att_id)->size());
+      }
     }
   }
 
diff --git a/contrib/draco/src/draco/io/texture_io.cc b/contrib/draco/src/draco/io/texture_io.cc
index cbe2915b0..c0a84eac5 100644
--- a/contrib/draco/src/draco/io/texture_io.cc
+++ b/contrib/draco/src/draco/io/texture_io.cc
@@ -16,7 +16,11 @@
 
 #ifdef DRACO_TRANSCODER_SUPPORTED
 
+#include <algorithm>
+#include <cstring>
+
 #include "draco/io/file_utils.h"
+#include "draco/texture/texture_utils.h"
 
 namespace draco {
 
@@ -25,12 +29,74 @@ namespace {
 StatusOr<std::unique_ptr<Texture>> CreateDracoTextureInternal(
     const std::vector<uint8_t> &image_data, SourceImage *out_source_image) {
   std::unique_ptr<Texture> draco_texture(new Texture());
+  const auto format =
+      ImageFormatFromBuffer(image_data.data(), image_data.size());
   out_source_image->MutableEncodedData() = image_data;
+  out_source_image->set_mime_type(TextureUtils::GetMimeType(format));
   return std::move(draco_texture);
 }
 
 }  // namespace
 
+ImageFormat ImageFormatFromBuffer(const uint8_t *buffer, size_t buffer_size) {
+  if (buffer_size > 4) {
+    // These bytes are the Start of Image (SOI) and End of Image (EOI) markers
+    // in a JPEG data stream.
+    const std::array<uint8_t, 2> kJpegSOIMarker = {0xFF, 0xD8};
+    const std::array<uint8_t, 2> kJpegEOIMarker = {0xFF, 0xD9};
+
+    if (!memcmp(buffer, kJpegSOIMarker.data(), kJpegSOIMarker.size())) {
+      // Look for the last occurence of the end marker (allow trailing bytes).
+      if (std::find_end(buffer, buffer + buffer_size, kJpegEOIMarker.begin(),
+                        kJpegEOIMarker.end()) != buffer + buffer_size) {
+        return ImageFormat::JPEG;
+      }
+    }
+  }
+
+  if (buffer_size > 2) {
+    // For Binomial Basis format input the stream always begins with
+    // the signature 'B' * 256 + 's', or 0x4273.
+    const std::array<uint8_t, 2> kBasisSignature = {0x42, 0x73};
+    if (!memcmp(buffer, kBasisSignature.data(), kBasisSignature.size())) {
+      return ImageFormat::BASIS;
+    }
+  }
+
+  if (buffer_size > 4) {
+    // For Binomial Basis/KTX2 format input the stream begins with 0xab 0x4b
+    // 0x54 0x58.
+    const std::array<uint8_t, 4> kKtx2Signature = {0xab, 0x4b, 0x54, 0x58};
+    if (!memcmp(buffer, kKtx2Signature.data(), kKtx2Signature.size())) {
+      return ImageFormat::BASIS;
+    }
+  }
+
+  if (buffer_size > 8) {
+    // The first eight bytes of a PNG stream always contain these values:
+    const std::array<uint8_t, 8> kPngSignature = {0x89, 0x50, 0x4e, 0x47,
+                                                  0x0d, 0x0a, 0x1a, 0x0a};
+    if (!memcmp(buffer, kPngSignature.data(), kPngSignature.size())) {
+      return ImageFormat::PNG;
+    }
+  }
+
+  if (buffer_size > 12) {
+    // The WebP signature bytes are: RIFF 0 0 0 0 WEBP. The 0's are where WebP
+    // size information is encoded in the stream, but the check here just looks
+    // for RIFF and WEBP.
+    const std::array<uint8_t, 4> kRIFF = {0x52, 0x49, 0x46, 0x46};
+    const std::array<uint8_t, 4> kWEBP = {0x57, 0x45, 0x42, 0x50};
+
+    if (!memcmp(buffer, kRIFF.data(), kRIFF.size()) &&
+        !memcmp(buffer + 8, kWEBP.data(), kWEBP.size())) {
+      return ImageFormat::WEBP;
+    }
+  }
+
+  return ImageFormat::NONE;
+}
+
 StatusOr<std::unique_ptr<Texture>> ReadTextureFromFile(
     const std::string &file_name) {
   std::vector<uint8_t> image_data;
@@ -42,23 +108,31 @@ StatusOr<std::unique_ptr<Texture>> ReadTextureFromFile(
   DRACO_ASSIGN_OR_RETURN(auto texture,
                          CreateDracoTextureInternal(image_data, &source_image));
   source_image.set_filename(file_name);
-  const std::string extension = LowercaseFileExtension(file_name);
-  const std::string mime_type =
-      "image/" + (extension == "jpg" ? "jpeg" : extension);
-  source_image.set_mime_type(mime_type);
+  if (source_image.mime_type().empty()) {
+    // Try to set mime type from extension if we were not able to detect it
+    // automatically.
+    const std::string extension = LowercaseFileExtension(file_name);
+    const std::string mime_type =
+        "image/" + (extension == "jpg" ? "jpeg" : extension);
+    source_image.set_mime_type(mime_type);
+  }
+  texture->set_source_image(source_image);
+  return texture;
+}
+
+StatusOr<std::unique_ptr<Texture>> ReadTextureFromBuffer(const uint8_t *buffer,
+                                                         size_t buffer_size) {
+  SourceImage source_image;
+  std::vector<uint8_t> image_data(buffer, buffer + buffer_size);
+  DRACO_ASSIGN_OR_RETURN(auto texture,
+                         CreateDracoTextureInternal(image_data, &source_image));
   texture->set_source_image(source_image);
   return texture;
 }
 
 StatusOr<std::unique_ptr<Texture>> ReadTextureFromBuffer(
     const uint8_t *buffer, size_t buffer_size, const std::string &mime_type) {
-  SourceImage source_image;
-  std::vector<uint8_t> image_data(buffer, buffer + buffer_size);
-  DRACO_ASSIGN_OR_RETURN(auto texture,
-                         CreateDracoTextureInternal(image_data, &source_image));
-  source_image.set_mime_type(mime_type);
-  texture->set_source_image(source_image);
-  return texture;
+  return ReadTextureFromBuffer(buffer, buffer_size);
 }
 
 Status WriteTextureToFile(const std::string &file_name,
diff --git a/contrib/draco/src/draco/io/texture_io.h b/contrib/draco/src/draco/io/texture_io.h
index 4dbea7554..643e4dee7 100644
--- a/contrib/draco/src/draco/io/texture_io.h
+++ b/contrib/draco/src/draco/io/texture_io.h
@@ -19,6 +19,8 @@
 
 #ifdef DRACO_TRANSCODER_SUPPORTED
 #include <memory>
+#include <string>
+#include <vector>
 
 #include "draco/core/draco_types.h"
 #include "draco/core/status_or.h"
@@ -32,10 +34,10 @@ StatusOr<std::unique_ptr<Texture>> ReadTextureFromFile(
     const std::string &file_name);
 
 // Same as ReadTextureFromFile() but the texture data is parsed from a |buffer|.
-// |mime_type| should be set to a type of the texture encoded in |buffer|.
-// Supported mime types are "image/jpeg", "image/png" and "image/webp".
-// TODO(ostava): We should be able to get the mime type directly from the
-// |buffer| but our image decoding library doesn't support this at this time.
+StatusOr<std::unique_ptr<Texture>> ReadTextureFromBuffer(const uint8_t *buffer,
+                                                         size_t buffer_size);
+// Deprecated: |mime_type| is currently ignored and it is deducted automatically
+// from the content of the |buffer|.
 StatusOr<std::unique_ptr<Texture>> ReadTextureFromBuffer(
     const uint8_t *buffer, size_t buffer_size, const std::string &mime_type);
 
@@ -50,6 +52,10 @@ Status WriteTextureToFile(const std::string &file_name, const Texture &texture);
 Status WriteTextureToBuffer(const Texture &texture,
                             std::vector<uint8_t> *buffer);
 
+// Returns the image format of an encoded texture stored in |buffer|.
+// ImageFormat::NONE is returned for unknown image formats.
+ImageFormat ImageFormatFromBuffer(const uint8_t *buffer, size_t buffer_size);
+
 }  // namespace draco
 
 #endif  // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/io/texture_io_test.cc b/contrib/draco/src/draco/io/texture_io_test.cc
index 13f36e44a..0f7246646 100644
--- a/contrib/draco/src/draco/io/texture_io_test.cc
+++ b/contrib/draco/src/draco/io/texture_io_test.cc
@@ -15,6 +15,7 @@
 #include "draco/io/texture_io.h"
 
 #ifdef DRACO_TRANSCODER_SUPPORTED
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <unordered_map>
@@ -50,6 +51,29 @@ TEST(TextureIoTest, TestLoadFromBuffer) {
   }
 }
 
+// Tests that we can set mime type correctly even when the source file had
+// an incorrect extension.
+TEST(TextureIoTest, TestWrongExtension) {
+  const std::string file_name = draco::GetTestFileFullPath("this_is_png.jpg");
+
+  DRACO_ASSIGN_OR_ASSERT(std::unique_ptr<draco::Texture> texture,
+                         draco::ReadTextureFromFile(file_name));
+  ASSERT_NE(texture, nullptr);
+
+  // Ensure the mime type was set to png even though the file extension was jpg.
+  ASSERT_EQ(texture->source_image().mime_type(), "image/png");
+}
+
+// Tests that we can load jpeg files that have some trailing bytes after the
+// jpeg end marker.
+TEST(TextureIoTest, TestTrailingJpegBytes) {
+  const std::string file_name = draco::GetTestFileFullPath("trailing_zero.jpg");
+
+  DRACO_ASSIGN_OR_ASSERT(std::unique_ptr<draco::Texture> texture,
+                         draco::ReadTextureFromFile(file_name));
+  ASSERT_NE(texture, nullptr);
+}
+
 }  // namespace
 
 #endif  // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/javascript/emscripten/draco_web_encoder.idl b/contrib/draco/src/draco/javascript/emscripten/draco_web_encoder.idl
index d3261b18e..58d6f6ac9 100644
--- a/contrib/draco/src/draco/javascript/emscripten/draco_web_encoder.idl
+++ b/contrib/draco/src/draco/javascript/emscripten/draco_web_encoder.idl
@@ -115,6 +115,8 @@ interface PointCloudBuilder {
   boolean AddMetadata(PointCloud pc, [Const] Metadata metadata);
   boolean SetMetadataForAttribute(PointCloud pc, long attribute_id,
                                   [Const] Metadata metadata);
+  boolean SetNormalizedFlagForAttribute(PointCloud pc, long attribute_id,
+                                        boolean normalized);
 };
 
 interface MeshBuilder : PointCloudBuilder {
@@ -159,6 +161,8 @@ interface MeshBuilder : PointCloudBuilder {
   boolean AddMetadata(PointCloud pc, [Const] Metadata metadata);
   boolean SetMetadataForAttribute(PointCloud pc, long attribute_id,
                                   [Const] Metadata metadata);
+  boolean SetNormalizedFlagForAttribute(PointCloud pc, long attribute_id,
+                                        boolean normalized);
 };
 
 interface Encoder {
diff --git a/contrib/draco/src/draco/javascript/emscripten/encoder_webidl_wrapper.cc b/contrib/draco/src/draco/javascript/emscripten/encoder_webidl_wrapper.cc
index 0a1ff7cdb..f8b77b92d 100644
--- a/contrib/draco/src/draco/javascript/emscripten/encoder_webidl_wrapper.cc
+++ b/contrib/draco/src/draco/javascript/emscripten/encoder_webidl_wrapper.cc
@@ -179,6 +179,19 @@ bool PointCloudBuilder::SetMetadataForAttribute(PointCloud *pc,
   return true;
 }
 
+bool PointCloudBuilder::SetNormalizedFlagForAttribute(draco::PointCloud *pc,
+                                                      long attribute_id,
+                                                      bool normalized) {
+  if (!pc) {
+    return false;
+  }
+  if (attribute_id < 0 || attribute_id >= pc->num_attributes()) {
+    return false;
+  }
+  pc->attribute(attribute_id)->set_normalized(normalized);
+  return true;
+}
+
 MeshBuilder::MeshBuilder() {}
 
 bool MeshBuilder::AddFacesToMesh(Mesh *mesh, long num_faces, const int *faces) {
diff --git a/contrib/draco/src/draco/javascript/emscripten/encoder_webidl_wrapper.h b/contrib/draco/src/draco/javascript/emscripten/encoder_webidl_wrapper.h
index b1cce7997..c09fa6c25 100644
--- a/contrib/draco/src/draco/javascript/emscripten/encoder_webidl_wrapper.h
+++ b/contrib/draco/src/draco/javascript/emscripten/encoder_webidl_wrapper.h
@@ -81,6 +81,8 @@ class PointCloudBuilder {
   bool SetMetadataForAttribute(draco::PointCloud *pc, long attribute_id,
                                const draco::Metadata *metadata);
   bool AddMetadata(draco::PointCloud *pc, const draco::Metadata *metadata);
+  bool SetNormalizedFlagForAttribute(draco::PointCloud *pc, long attribute_id,
+                                     bool normalized);
 
  private:
   template <typename DataTypeT>
diff --git a/contrib/draco/src/draco/mesh/mesh.cc b/contrib/draco/src/draco/mesh/mesh.cc
index b287ecb45..086c34d45 100644
--- a/contrib/draco/src/draco/mesh/mesh.cc
+++ b/contrib/draco/src/draco/mesh/mesh.cc
@@ -26,11 +26,7 @@ namespace draco {
 template <bool B, class T, class F>
 using conditional_t = typename std::conditional<B, T, F>::type;
 
-#ifdef DRACO_TRANSCODER_SUPPORTED
-Mesh::Mesh() : compression_enabled_(false) {}
-#else
 Mesh::Mesh() {}
-#endif
 
 #ifdef DRACO_TRANSCODER_SUPPORTED
 void Mesh::Copy(const Mesh &src) {
@@ -39,8 +35,6 @@ void Mesh::Copy(const Mesh &src) {
   faces_ = src.faces_;
   attribute_data_ = src.attribute_data_;
   material_library_.Copy(src.material_library_);
-  compression_enabled_ = src.compression_enabled_;
-  compression_options_ = src.compression_options_;
 
   // Copy mesh feature ID sets.
   mesh_features_.clear();
@@ -67,6 +61,8 @@ void Mesh::Copy(const Mesh &src) {
 
   // Copy structural metadata.
   structural_metadata_.Copy(src.structural_metadata_);
+  property_attributes_ = src.property_attributes_;
+  property_attributes_material_mask_ = src.property_attributes_material_mask_;
 }
 
 namespace {
@@ -338,6 +334,22 @@ void Mesh::RemoveUnusedMaterials(bool remove_unused_material_indices) {
     }
   }
 
+  // Check if any of the (unused) materials is used by property attributes
+  // indices. If so, user should remove unused property attributes indices
+  // first.
+  for (int i = 0; i < NumPropertyAttributesIndices(); ++i) {
+    for (int mask_index = 0;
+         mask_index < NumPropertyAttributesIndexMaterialMasks(i);
+         ++mask_index) {
+      const int mat_index =
+          GetPropertyAttributesIndexMaterialMask(i, mask_index);
+      if (mat_index < num_materials && !is_material_used[mat_index]) {
+        is_material_used[mat_index] = true;
+        num_used_materials++;
+      }
+    }
+  }
+
   if (num_used_materials == num_materials) {
     return;  // All materials are used, don't do anything.
   }
@@ -408,6 +420,30 @@ void Mesh::RemoveUnusedMaterials(bool remove_unused_material_indices) {
       }
     }
   }
+
+  // Update material indices on property attributes incices.
+  for (int i = 0; i < NumPropertyAttributesIndices(); ++i) {
+    for (int mask_index = 0;
+         mask_index < NumPropertyAttributesIndexMaterialMasks(i);
+         ++mask_index) {
+      const int old_mat_index =
+          GetPropertyAttributesIndexMaterialMask(i, mask_index);
+      if (old_mat_index < num_materials && is_material_used[old_mat_index]) {
+        property_attributes_material_mask_[i][mask_index] =
+            old_to_new_material_index_map[old_mat_index];
+      }
+    }
+  }
+}
+
+bool Mesh::IsAttributeUsedByMeshFeatures(int att_id) const {
+  for (MeshFeaturesIndex mfi(0); mfi < NumMeshFeatures(); ++mfi) {
+    const auto &mf = GetMeshFeatures(mfi);
+    if (mf.GetAttributeIndex() == att_id) {
+      return true;
+    }
+  }
+  return false;
 }
 
 void Mesh::UpdateMeshFeaturesTexturePointer(
@@ -448,6 +484,43 @@ void Mesh::CopyMeshFeaturesForMaterial(const Mesh &source_mesh,
   }
 }
 
+void Mesh::CopyPropertyAttributesIndicesForMaterial(const Mesh &source_mesh,
+                                                    Mesh *target_mesh,
+                                                    int material_index) {
+  for (int i = 0; i < source_mesh.NumPropertyAttributesIndices(); ++i) {
+    // Property attributes index is used if it doesn't have any material mask or
+    // if one of the material masks matches |material_index|.
+    bool is_used = source_mesh.NumPropertyAttributesIndexMaterialMasks(i) == 0;
+    for (int mask_index = 0;
+         !is_used &&
+         mask_index < source_mesh.NumPropertyAttributesIndexMaterialMasks(i);
+         ++mask_index) {
+      if (source_mesh.GetPropertyAttributesIndexMaterialMask(i, mask_index) ==
+          material_index) {
+        is_used = true;
+      }
+    }
+    if (is_used) {
+      // Copy over the property attributes index to the target mesh.
+      target_mesh->AddPropertyAttributesIndex(
+          source_mesh.GetPropertyAttributesIndex(i));
+    }
+  }
+}
+
+void Mesh::UpdateMeshFeaturesAfterDeletedAttribute(int att_id) {
+  for (MeshFeaturesIndex mfi(0); mfi < NumMeshFeatures(); ++mfi) {
+    auto &mf = GetMeshFeatures(mfi);
+    if (mf.GetAttributeIndex() == att_id) {
+      // Mesh features is no longer associated with a vertex attribute.
+      mf.SetAttributeIndex(-1);
+    } else if (mf.GetAttributeIndex() > att_id) {
+      // Attribute index decremented by one.
+      mf.SetAttributeIndex(mf.GetAttributeIndex() - 1);
+    }
+  }
+}
+
 int32_t Mesh::AddPerFaceAttribute(std::unique_ptr<PointAttribute> att) {
   IndexTypeVector<CornerIndex, AttributeValueIndex> corner_map(num_faces() * 3);
   for (CornerIndex ci(0); ci < num_faces() * 3; ++ci) {
diff --git a/contrib/draco/src/draco/mesh/mesh.h b/contrib/draco/src/draco/mesh/mesh.h
index 652c2c010..f49ffbdfc 100644
--- a/contrib/draco/src/draco/mesh/mesh.h
+++ b/contrib/draco/src/draco/mesh/mesh.h
@@ -24,7 +24,6 @@
 #include "draco/core/status.h"
 #include "draco/draco_features.h"
 #ifdef DRACO_TRANSCODER_SUPPORTED
-#include "draco/compression/draco_compression_options.h"
 #include "draco/material/material_library.h"
 #include "draco/mesh/mesh_features.h"
 #include "draco/mesh/mesh_indices.h"
@@ -94,6 +93,9 @@ class Mesh : public PointCloud {
     if (att_id >= 0 && att_id < static_cast<int>(attribute_data_.size())) {
       attribute_data_.erase(attribute_data_.begin() + att_id);
     }
+#ifdef DRACO_TRANSCODER_SUPPORTED
+    UpdateMeshFeaturesAfterDeletedAttribute(att_id);
+#endif
   }
 
 #ifdef DRACO_TRANSCODER_SUPPORTED
@@ -170,22 +172,6 @@ class Mesh : public PointCloud {
   void RemoveUnusedMaterials();
   void RemoveUnusedMaterials(bool remove_unused_material_indices);
 
-  // Enables or disables Draco geometry compression for this mesh.
-  void SetCompressionEnabled(bool enabled) { compression_enabled_ = enabled; }
-  bool IsCompressionEnabled() const { return compression_enabled_; }
-
-  // Sets |options| that configure Draco geometry compression. This does not
-  // enable or disable compression.
-  void SetCompressionOptions(const DracoCompressionOptions &options) {
-    compression_options_ = options;
-  }
-  const DracoCompressionOptions &GetCompressionOptions() const {
-    return compression_options_;
-  }
-  DracoCompressionOptions &GetCompressionOptions() {
-    return compression_options_;
-  }
-
   // Library that contains non-material textures.
   const TextureLibrary &GetNonMaterialTextureLibrary() const {
     return non_material_texture_library_;
@@ -208,12 +194,20 @@ class Mesh : public PointCloud {
   MeshFeatures &GetMeshFeatures(MeshFeaturesIndex index) {
     return *mesh_features_[index];
   }
+
+  // Removes mesh features from the mesh. Note that removing a mesh feature does
+  // not delete any associated data such as vertex attributes or feature
+  // textures.
   void RemoveMeshFeatures(MeshFeaturesIndex index) {
     mesh_features_.erase(mesh_features_.begin() + index.value());
     mesh_features_material_mask_.erase(mesh_features_material_mask_.begin() +
                                        index.value());
   }
 
+  // Returns true if an attribute with |att_id| is being used by any mesh
+  // features attached to the mesh.
+  bool IsAttributeUsedByMeshFeatures(int att_id) const;
+
   // Restricts given mesh features to faces mapped to a material with
   // |material_index|. Note that single mesh features can be restricted to
   // multiple materials.
@@ -249,6 +243,49 @@ class Mesh : public PointCloud {
     return structural_metadata_;
   }
   StructuralMetadata &GetStructuralMetadata() { return structural_metadata_; }
+
+  // Property attributes indices as defined by EXT_structural_metadata glTF
+  // extension.
+  int AddPropertyAttributesIndex(int property_attribute_index) {
+    property_attributes_.push_back(property_attribute_index);
+    property_attributes_material_mask_.push_back({});
+    return property_attributes_.size() - 1;
+  }
+  int NumPropertyAttributesIndices() const {
+    return property_attributes_.size();
+  }
+  const int &GetPropertyAttributesIndex(int index) const {
+    return property_attributes_[index];
+  }
+  int &GetPropertyAttributesIndex(int index) {
+    return property_attributes_[index];
+  }
+  void RemovePropertyAttributesIndex(int index) {
+    property_attributes_.erase(property_attributes_.begin() + index);
+    property_attributes_material_mask_.erase(
+        property_attributes_material_mask_.begin() + index);
+  }
+
+  // Restricts given property attributes indices to faces mapped to a material
+  // with |material_index|. Note that single property attribute can be
+  // restricted to multiple materials.
+  void AddPropertyAttributesIndexMaterialMask(int index, int material_index) {
+    property_attributes_material_mask_[index].push_back(material_index);
+  }
+
+  size_t NumPropertyAttributesIndexMaterialMasks(int index) const {
+    return property_attributes_material_mask_[index].size();
+  }
+  int GetPropertyAttributesIndexMaterialMask(int index, int mask_index) const {
+    return property_attributes_material_mask_[index][mask_index];
+  }
+
+  // Copies over property attributes indices from |source_mesh| and stores them
+  // in |target_mesh| as long as the property attributes indices material mask
+  // is valid for given |material_index|.
+  static void CopyPropertyAttributesIndicesForMaterial(const Mesh &source_mesh,
+                                                       Mesh *target_mesh,
+                                                       int material_index);
 #endif  // DRACO_TRANSCODER_SUPPORTED
 
  protected:
@@ -266,6 +303,11 @@ class Mesh : public PointCloud {
   IndexTypeVector<FaceIndex, Face> &faces() { return faces_; }
 
  private:
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  // Updates attribute indices associated to all mesh features after a mesh
+  // attribute is deleted.
+  void UpdateMeshFeaturesAfterDeletedAttribute(int att_id);
+#endif
   // Mesh specific per-attribute data.
   std::vector<AttributeData> attribute_data_;
 
@@ -280,11 +322,6 @@ class Mesh : public PointCloud {
   // Materials applied to to this mesh.
   MaterialLibrary material_library_;
 
-  // Compression options for this mesh.
-  // TODO(vytyaz): Store encoded bitstream that this mesh compresses into.
-  bool compression_enabled_;
-  DracoCompressionOptions compression_options_;
-
   // Sets of feature IDs as defined by EXT_mesh_features glTF extension.
   IndexTypeVector<MeshFeaturesIndex, std::unique_ptr<MeshFeatures>>
       mesh_features_;
@@ -296,6 +333,15 @@ class Mesh : public PointCloud {
   IndexTypeVector<MeshFeaturesIndex, std::vector<int>>
       mesh_features_material_mask_;
 
+  // Indices pointing to property attributes in draco::StructuralMetadata.
+  std::vector<int> property_attributes_;
+
+  // When the Mesh contains multiple materials, this mask can be used to limit
+  // specific index into |property_attributes_| to a vector of material indices.
+  // If for a given property attributes index, the material indices are empty,
+  // the corresponding property attributes are applied to the entire mesh.
+  std::vector<std::vector<int>> property_attributes_material_mask_;
+
   // Texture library for storing non-material textures used by this mesh, e.g.,
   // textures containing mesh feature IDs of EXT_mesh_features glTF extension.
   // If the mesh is part of the scene then the textures are stored in the scene.
diff --git a/contrib/draco/src/draco/mesh/mesh_cleanup.cc b/contrib/draco/src/draco/mesh/mesh_cleanup.cc
index a6dc1823e..99609457b 100644
--- a/contrib/draco/src/draco/mesh/mesh_cleanup.cc
+++ b/contrib/draco/src/draco/mesh/mesh_cleanup.cc
@@ -75,35 +75,28 @@ void MeshCleanup::RemoveDegeneratedFaces(Mesh *mesh) {
 }
 
 void MeshCleanup::RemoveDuplicateFaces(Mesh *mesh) {
-  const PointAttribute *const pos_att =
-      mesh->GetNamedAttribute(GeometryAttribute::POSITION);
-
-  typedef std::array<AttributeValueIndex::ValueType, 3> PosTriplet;
-  PosTriplet pos_indices;
-  std::unordered_set<PosTriplet, HashArray<PosTriplet>> is_face_used;
+  std::unordered_set<Mesh::Face, HashArray<Mesh::Face>> is_face_used;
 
   uint32_t num_duplicate_faces = 0;
   for (FaceIndex fi(0); fi < mesh->num_faces(); ++fi) {
-    const auto f = mesh->face(fi);
-    for (int c = 0; c < 3; ++c) {
-      pos_indices[c] = pos_att->mapped_index(f[c]).value();
-    }
-    // Shift the position indices until the smallest index is the first one.
-    while (pos_indices[0] > pos_indices[1] || pos_indices[0] > pos_indices[2]) {
+    auto face = mesh->face(fi);
+
+    // Shift the face indices until the smallest index is the first one.
+    while (face[0] > face[1] || face[0] > face[2]) {
       // Shift to the left.
-      std::swap(pos_indices[0], pos_indices[1]);
-      std::swap(pos_indices[1], pos_indices[2]);
+      std::swap(face[0], face[1]);
+      std::swap(face[1], face[2]);
     }
-    // Check if have encountered the same position triplet on a different face.
-    if (is_face_used.find(pos_indices) != is_face_used.end()) {
+    // Check if have encountered the same face before.
+    if (is_face_used.find(face) != is_face_used.end()) {
       // Duplicate face. Ignore it.
       num_duplicate_faces++;
     } else {
       // Insert new face to the set.
-      is_face_used.insert(pos_indices);
+      is_face_used.insert(face);
       if (num_duplicate_faces > 0) {
         // Copy the face to its new location.
-        mesh->SetFace(fi - num_duplicate_faces, f);
+        mesh->SetFace(fi - num_duplicate_faces, face);
       }
     }
   }
diff --git a/contrib/draco/src/draco/mesh/mesh_cleanup_test.cc b/contrib/draco/src/draco/mesh/mesh_cleanup_test.cc
index 76e5206ae..20e2b5ffe 100644
--- a/contrib/draco/src/draco/mesh/mesh_cleanup_test.cc
+++ b/contrib/draco/src/draco/mesh/mesh_cleanup_test.cc
@@ -141,38 +141,62 @@ TEST_F(MeshCleanupTest, TestAttributes) {
 }
 
 TEST_F(MeshCleanupTest, TestDuplicateFaces) {
+  // This test verifies that the mesh cleanup tool removes duplicate faces.
   TriangleSoupMeshBuilder mb;
   mb.Start(5);
   const int pos_att_id =
       mb.AddAttribute(GeometryAttribute::POSITION, 3, DT_FLOAT32);
+  const int norm_att_id =
+      mb.AddAttribute(GeometryAttribute::NORMAL, 3, DT_FLOAT32);
 
-  // Five faces where only two are unique.
+  // Five faces where only two are unique in spatial domain and three are unique
+  // when we take into account the normal attribute.
 
   // clang-format off
   mb.SetAttributeValuesForFace(pos_att_id, FaceIndex(0),
                                Vector3f(0.f, 0.f, 0.f).data(),
                                Vector3f(1.f, 0.f, 0.f).data(),
                                Vector3f(0.f, 1.f, 0.f).data());
+  mb.SetAttributeValuesForFace(norm_att_id, FaceIndex(0),
+                               Vector3f(0.f, 0.f, 1.f).data(),
+                               Vector3f(0.f, 0.f, 1.f).data(),
+                               Vector3f(0.f, 0.f, 1.f).data());
 
   mb.SetAttributeValuesForFace(pos_att_id, FaceIndex(1),
                                Vector3f(0.f, 0.f, 0.f).data(),
                                Vector3f(1.f, 0.f, 0.f).data(),
                                Vector3f(0.f, 1.f, 0.f).data());
+  mb.SetAttributeValuesForFace(norm_att_id, FaceIndex(1),
+                               Vector3f(0.f, 1.f, 0.f).data(),
+                               Vector3f(0.f, 1.f, 0.f).data(),
+                               Vector3f(0.f, 1.f, 0.f).data());
 
   mb.SetAttributeValuesForFace(pos_att_id, FaceIndex(2),
                                Vector3f(0.f, 0.f, 0.f).data(),
                                Vector3f(1.f, 0.f, 0.f).data(),
                                Vector3f(0.f, 1.f, 1.f).data());
+  mb.SetAttributeValuesForFace(norm_att_id, FaceIndex(2),
+                               Vector3f(0.f, 0.f, 1.f).data(),
+                               Vector3f(0.f, 0.f, 1.f).data(),
+                               Vector3f(0.f, 0.f, 1.f).data());
 
   mb.SetAttributeValuesForFace(pos_att_id, FaceIndex(3),
                                Vector3f(1.f, 0.f, 0.f).data(),
                                Vector3f(0.f, 1.f, 0.f).data(),
                               Vector3f(0.f, 0.f, 0.f).data());
+  mb.SetAttributeValuesForFace(norm_att_id, FaceIndex(3),
+                               Vector3f(0.f, 0.f, 1.f).data(),
+                               Vector3f(0.f, 0.f, 1.f).data(),
+                               Vector3f(0.f, 0.f, 1.f).data());
 
   mb.SetAttributeValuesForFace(pos_att_id, FaceIndex(4),
                                Vector3f(0.f, 0.f, 0.f).data(),
                                Vector3f(1.f, 0.f, 0.f).data(),
                                Vector3f(0.f, 1.f, 1.f).data());
+  mb.SetAttributeValuesForFace(norm_att_id, FaceIndex(4),
+                               Vector3f(0.f, 0.f, 1.f).data(),
+                               Vector3f(0.f, 0.f, 1.f).data(),
+                               Vector3f(0.f, 0.f, 1.f).data());
   // clang-format on
 
   std::unique_ptr<Mesh> mesh = mb.Finalize();
@@ -180,7 +204,7 @@ TEST_F(MeshCleanupTest, TestDuplicateFaces) {
   ASSERT_EQ(mesh->num_faces(), 5);
   const MeshCleanupOptions cleanup_options;
   DRACO_ASSERT_OK(MeshCleanup::Cleanup(mesh.get(), cleanup_options));
-  ASSERT_EQ(mesh->num_faces(), 2);
+  ASSERT_EQ(mesh->num_faces(), 3);
 }
 
 }  // namespace draco
diff --git a/contrib/draco/src/draco/mesh/mesh_features.h b/contrib/draco/src/draco/mesh/mesh_features.h
index af024013f..d22f5f105 100644
--- a/contrib/draco/src/draco/mesh/mesh_features.h
+++ b/contrib/draco/src/draco/mesh/mesh_features.h
@@ -53,8 +53,8 @@ class MeshFeatures {
   void SetNullFeatureId(int null_feature_id);
   int GetNullFeatureId() const;
 
-  // Index of the feature ID vertex attribute, e.g., 5 for an attribute named
-  // _FEATURE_ID_5, or -1 if the feature ID is not associated with vertices.
+  // Index of the feature ID vertex attribute in draco::Mesh or -1 if the
+  // feature ID is not associated with vertices.
   void SetAttributeIndex(int attribute_index);
   int GetAttributeIndex() const;
 
diff --git a/contrib/draco/src/draco/mesh/mesh_misc_functions.h b/contrib/draco/src/draco/mesh/mesh_misc_functions.h
index 0a3bcf497..02a4970ce 100644
--- a/contrib/draco/src/draco/mesh/mesh_misc_functions.h
+++ b/contrib/draco/src/draco/mesh/mesh_misc_functions.h
@@ -18,6 +18,10 @@
 #ifndef DRACO_MESH_MESH_MISC_FUNCTIONS_H_
 #define DRACO_MESH_MESH_MISC_FUNCTIONS_H_
 
+#include <array>
+#include <cmath>
+#include <memory>
+
 #include "draco/mesh/corner_table.h"
 #include "draco/mesh/mesh.h"
 
@@ -77,6 +81,10 @@ InterpolatedVectorT ComputeInterpolatedAttributeValueOnMeshFace(
   for (int c = 0; c < 3; ++c) {
     attribute.GetMappedValue(face[c], &(val[c][0]));
   }
+  if (val[1] == val[0] && val[2] == val[0]) {
+    // No need to interpolate anything if all values are the same.
+    return val[0];
+  }
   // Return an interpolated value.
   InterpolatedVectorT res;
   for (int d = 0; d < InterpolatedVectorT::dimension; ++d) {
diff --git a/contrib/draco/src/draco/mesh/mesh_splitter.cc b/contrib/draco/src/draco/mesh/mesh_splitter.cc
index ac3c4661c..ad987045f 100644
--- a/contrib/draco/src/draco/mesh/mesh_splitter.cc
+++ b/contrib/draco/src/draco/mesh/mesh_splitter.cc
@@ -18,10 +18,13 @@
 #include <memory>
 #include <unordered_map>
 #include <utility>
+#include <vector>
 
+#include "draco/attributes/geometry_attribute.h"
 #include "draco/mesh/mesh_utils.h"
 #include "draco/mesh/triangle_soup_mesh_builder.h"
 #include "draco/point_cloud/point_cloud_builder.h"
+#include "draco/texture/texture_map.h"
 
 namespace draco {
 
@@ -33,6 +36,7 @@ class MeshSplitterInternal {
   struct WorkData : public MeshSplitter::WorkData {
     // TriangleSoupMeshBuilder or PointCloudBuilder.
     std::vector<BuilderT> builders;
+    std::vector<int> *att_id_map;
   };
 
   // Computes number of elements (faces or points) for each sub-mesh.
@@ -46,8 +50,8 @@ class MeshSplitterInternal {
                             const PointAttribute *split_attribute,
                             WorkData *work_data) const;
   // Builds the meshes from the data accumulated in the builders.
-  StatusOr<MeshSplitter::MeshVector> BuildMeshes(const Mesh &mesh,
-                                                 WorkData *work_data) const;
+  StatusOr<MeshSplitter::MeshVector> BuildMeshes(
+      const Mesh &mesh, WorkData *work_data, bool deduplicate_vertices) const;
 };
 
 namespace {
@@ -65,7 +69,9 @@ void AddElementToBuilder(
 MeshSplitter::MeshSplitter()
     : preserve_materials_(false),
       remove_unused_material_indices_(true),
-      preserve_mesh_features_(false) {}
+      preserve_mesh_features_(false),
+      preserve_structural_metadata_(false),
+      deduplicate_vertices_(true) {}
 
 StatusOr<MeshSplitter::MeshVector> MeshSplitter::SplitMesh(
     const Mesh &mesh, uint32_t split_attribute_id) {
@@ -86,7 +92,7 @@ StatusOr<MeshSplitter::MeshVector> MeshSplitter::SplitMeshInternal(
       mesh.attribute(split_attribute_id);
 
   // Preserve the split attribute only if it is the material attribute and the
-  // |preserve_materials_| flag is set. Othwerwise the split attribute will get
+  // |preserve_materials_| flag is set. Otherwise, the split attribute will get
   // discarded.
   // TODO(ostava): We may revisit this later and add an option to always
   // preserve the split attribute.
@@ -107,7 +113,8 @@ StatusOr<MeshSplitter::MeshVector> MeshSplitter::SplitMeshInternal(
   // Create the sub-meshes.
   work_data.builders.resize(num_out_meshes);
   // Map between attribute ids of the input and output meshes.
-  work_data.att_id_map.resize(mesh.num_attributes(), -1);
+  att_id_map_.resize(mesh.num_attributes(), -1);
+  work_data.att_id_map = &att_id_map_;
   const int ignored_att_id =
       (!preserve_split_attribute ? split_attribute_id : -1);
   for (int mi = 0; mi < num_out_meshes; ++mi) {
@@ -126,8 +133,9 @@ StatusOr<MeshSplitter::MeshVector> MeshSplitter::SplitMeshInternal(
 
   splitter_internal.AddElementsToBuilder(mesh, split_attribute, &work_data);
 
-  DRACO_ASSIGN_OR_RETURN(MeshVector out_meshes,
-                         splitter_internal.BuildMeshes(mesh, &work_data));
+  DRACO_ASSIGN_OR_RETURN(
+      MeshVector out_meshes,
+      splitter_internal.BuildMeshes(mesh, &work_data, deduplicate_vertices_));
   return FinalizeMeshes(mesh, work_data, std::move(out_meshes));
 }
 
@@ -179,9 +187,11 @@ void MeshSplitterInternal<BuilderT>::InitializeBuilder(
       continue;
     }
     const GeometryAttribute *const src_att = mesh.attribute(ai);
-    work_data->att_id_map[ai] = work_data->builders[b_index].AddAttribute(
+    (*work_data->att_id_map)[ai] = work_data->builders[b_index].AddAttribute(
         src_att->attribute_type(), src_att->num_components(),
-        src_att->data_type());
+        src_att->data_type(), src_att->normalized());
+    work_data->builders[b_index].SetAttributeName(work_data->att_id_map->at(ai),
+                                                  src_att->name());
   }
 }
 
@@ -220,7 +230,7 @@ void AddElementToBuilder(
   const auto &face = mesh.face(source_i);
   for (int ai = 0; ai < mesh.num_attributes(); ++ai) {
     const PointAttribute *const src_att = mesh.attribute(ai);
-    const int target_att_id = work_data->att_id_map[ai];
+    const int target_att_id = work_data->att_id_map->at(ai);
     if (target_att_id == -1) {
       continue;
     }
@@ -237,7 +247,7 @@ void AddElementToBuilder(
     MeshSplitterInternal<PointCloudBuilder>::WorkData *work_data) {
   for (int ai = 0; ai < mesh.num_attributes(); ++ai) {
     const PointAttribute *const src_att = mesh.attribute(ai);
-    const int target_att_id = work_data->att_id_map[ai];
+    const int target_att_id = work_data->att_id_map->at(ai);
     if (target_att_id == -1) {
       continue;
     }
@@ -252,7 +262,7 @@ void AddElementToBuilder(
 template <>
 StatusOr<MeshSplitter::MeshVector>
 MeshSplitterInternal<TriangleSoupMeshBuilder>::BuildMeshes(
-    const Mesh &mesh, WorkData *work_data) const {
+    const Mesh &mesh, WorkData *work_data, bool deduplicate_vertices) const {
   const int num_out_meshes = work_data->builders.size();
   MeshSplitter::MeshVector out_meshes(num_out_meshes);
   for (int mi = 0; mi < num_out_meshes; ++mi) {
@@ -270,7 +280,7 @@ MeshSplitterInternal<TriangleSoupMeshBuilder>::BuildMeshes(
 template <>
 StatusOr<MeshSplitter::MeshVector>
 MeshSplitterInternal<PointCloudBuilder>::BuildMeshes(
-    const Mesh &mesh, WorkData *work_data) const {
+    const Mesh &mesh, WorkData *work_data, bool deduplicate_vertices) const {
   const int num_out_meshes = work_data->builders.size();
   MeshSplitter::MeshVector out_meshes(num_out_meshes);
   for (int mi = 0; mi < num_out_meshes; ++mi) {
@@ -279,7 +289,8 @@ MeshSplitterInternal<PointCloudBuilder>::BuildMeshes(
     }
     // For point clouds, we first build a point cloud and copy it over into
     // a draco::Mesh.
-    std::unique_ptr<PointCloud> pc = work_data->builders[mi].Finalize(true);
+    std::unique_ptr<PointCloud> pc =
+        work_data->builders[mi].Finalize(deduplicate_vertices);
     if (pc == nullptr) {
       continue;
     }
@@ -311,7 +322,66 @@ StatusOr<MeshSplitter::MeshVector> MeshSplitter::FinalizeMeshes(
     }
     out_meshes[mi]->SetName(mesh.GetName());
     if (preserve_materials_) {
-      out_meshes[mi]->GetMaterialLibrary().Copy(mesh.GetMaterialLibrary());
+      if (work_data.split_by_materials) {
+        // When splitting by material, only copy the material in use.
+        if (out_meshes[mi]->num_points() != 0 &&
+            mesh.GetMaterialLibrary().NumMaterials() != 0) {
+          uint64_t material_index = 0;
+          out_meshes[mi]
+              ->GetNamedAttribute(GeometryAttribute::MATERIAL)
+              ->GetMappedValue(PointIndex(0), &material_index);
+
+          // Populate empty materials and textures. Unused materials and
+          // textures will be cleared later.
+          out_meshes[mi]->GetMaterialLibrary().MutableMaterial(
+              mesh.GetMaterialLibrary().NumMaterials() - 1);
+          for (int i = 0;
+               i < mesh.GetMaterialLibrary().GetTextureLibrary().NumTextures();
+               ++i) {
+            out_meshes[mi]
+                ->GetMaterialLibrary()
+                .MutableTextureLibrary()
+                .PushTexture(std::make_unique<Texture>());
+          }
+
+          // Copy the material that we're actually going to use.
+          out_meshes[mi]
+              ->GetMaterialLibrary()
+              .MutableMaterial(material_index)
+              ->Copy(*mesh.GetMaterialLibrary().GetMaterial(material_index));
+          std::unordered_map<const Texture *, int> texture_to_index =
+              mesh.GetMaterialLibrary()
+                  .GetTextureLibrary()
+                  .ComputeTextureToIndexMap();
+          for (int tmi = 0; tmi < mesh.GetMaterialLibrary()
+                                      .GetMaterial(material_index)
+                                      ->NumTextureMaps();
+               ++tmi) {
+            const TextureMap *const source_texture_map =
+                mesh.GetMaterialLibrary()
+                    .GetMaterial(material_index)
+                    ->GetTextureMapByIndex(tmi);
+
+            // Get the texture map index
+            const int texture_index =
+                texture_to_index[source_texture_map->texture()];
+
+            // Use the index to assign texture to the corresponding texture map
+            // on the split mesh.
+            TextureMap *new_texture_map = out_meshes[mi]
+                                              ->GetMaterialLibrary()
+                                              .MutableMaterial(material_index)
+                                              ->GetTextureMapByIndex(tmi);
+            new_texture_map->SetTexture(out_meshes[mi]
+                                            ->GetMaterialLibrary()
+                                            .MutableTextureLibrary()
+                                            .GetTexture(texture_index));
+            new_texture_map->texture()->Copy(*source_texture_map->texture());
+          }
+        }
+      } else {
+        out_meshes[mi]->GetMaterialLibrary().Copy(mesh.GetMaterialLibrary());
+      }
     }
 
     // Copy metadata of the original mesh to the output meshes.
@@ -323,7 +393,7 @@ StatusOr<MeshSplitter::MeshVector> MeshSplitter::FinalizeMeshes(
 
     // Copy over attribute unique ids.
     for (int att_id = 0; att_id < mesh.num_attributes(); ++att_id) {
-      const int mapped_att_id = work_data.att_id_map[att_id];
+      const int mapped_att_id = att_id_map_[att_id];
       if (mapped_att_id == -1) {
         continue;
       }
@@ -363,6 +433,14 @@ StatusOr<MeshSplitter::MeshVector> MeshSplitter::FinalizeMeshes(
         // Create a copy of source mesh features.
         std::unique_ptr<MeshFeatures> mf(new MeshFeatures());
         mf->Copy(mesh.GetMeshFeatures(mfi));
+
+        // Update mesh features attribute index if used.
+        if (mf->GetAttributeIndex() != -1) {
+          const int new_mf_attribute_index =
+              att_id_map_[mf->GetAttributeIndex()];
+          mf->SetAttributeIndex(new_mf_attribute_index);
+        }
+
         const MeshFeaturesIndex new_mfi =
             out_meshes[mi]->AddMeshFeatures(std::move(mf));
         if (work_data.split_by_materials && !preserve_materials_) {
@@ -404,6 +482,62 @@ StatusOr<MeshSplitter::MeshVector> MeshSplitter::FinalizeMeshes(
           MeshUtils::RemoveUnusedMeshFeatures(out_meshes[mi].get()));
     }
 
+    if (preserve_structural_metadata_) {
+      // Copy proeprty attributes indices from the source |mesh| to the
+      // |out_meshes[mi]|.
+      for (int i = 0; i < mesh.NumPropertyAttributesIndices(); ++i) {
+        if (work_data.split_by_materials) {
+          // Copy over only those property attribute indices that were masked to
+          // the material corresponding to |mi|.
+          bool is_used = false;
+          if (mesh.NumPropertyAttributesIndexMaterialMasks(i) == 0) {
+            is_used = true;
+          } else {
+            for (int mask_index = 0;
+                 mask_index < mesh.NumPropertyAttributesIndexMaterialMasks(i);
+                 ++mask_index) {
+              if (mesh.GetPropertyAttributesIndexMaterialMask(i, mask_index) ==
+                  mi) {
+                is_used = true;
+                break;
+              }
+            }
+          }
+          if (!is_used) {
+            // Ignore this property attributes index.
+            continue;
+          }
+        }
+        // Create a copy of source property attributes index.
+        const int new_i = out_meshes[mi]->AddPropertyAttributesIndex(
+            mesh.GetPropertyAttributesIndex(i));
+        if (work_data.split_by_materials && !preserve_materials_) {
+          // If the input |mesh| was split by materials and we didn't preserve
+          // the materials, all property attributes indices must be masked to
+          // material 0.
+          out_meshes[mi]->AddPropertyAttributesIndexMaterialMask(new_i, 0);
+        } else {
+          // Otherwise property attributes index uses same masking as the source
+          // mesh because the material attribute is still present in the split
+          // meshes. Note that this masking can be later changed in
+          // RemoveUnusedMaterials() call below.
+          for (int mask_index = 0;
+               mask_index < mesh.NumPropertyAttributesIndexMaterialMasks(i);
+               ++mask_index) {
+            out_meshes[mi]->AddPropertyAttributesIndexMaterialMask(
+                new_i,
+                mesh.GetPropertyAttributesIndexMaterialMask(i, mask_index));
+          }
+        }
+      }
+
+      // This will remove any property attributes indices that may not be be
+      // actually used by this |out_meshes[mi]| (e.g. because corresponding
+      // material indices were not present in this split mesh).
+      DRACO_RETURN_IF_ERROR(MeshUtils::RemoveUnusedPropertyAttributesIndices(
+          out_meshes[mi].get()));
+    }
+
     // Remove unused materials after we remove mesh features because some of
     // the mesh features may have referenced old material indices.
     if (preserve_materials_) {
@@ -424,7 +558,8 @@ StatusOr<MeshSplitter::MeshVector> MeshSplitter::SplitMeshToComponents(
   typename MeshSplitterInternal<TriangleSoupMeshBuilder>::WorkData work_data;
   work_data.builders.resize(num_out_meshes);
   work_data.num_sub_mesh_elements.resize(num_out_meshes, 0);
-  work_data.att_id_map.resize(mesh.num_attributes(), -1);
+  att_id_map_.resize(mesh.num_attributes(), -1);
+  work_data.att_id_map = &att_id_map_;
   for (int mi = 0; mi < num_out_meshes; ++mi) {
     const int num_faces = connected_components.NumConnectedComponentFaces(mi);
     work_data.num_sub_mesh_elements[mi] = num_faces;
@@ -442,10 +577,15 @@ StatusOr<MeshSplitter::MeshVector> MeshSplitter::SplitMeshToComponents(
       AddElementToBuilder(mi, fi, target_fi, mesh, &work_data);
     }
   }
-  DRACO_ASSIGN_OR_RETURN(auto out_meshes,
-                         splitter_internal.BuildMeshes(mesh, &work_data));
+  DRACO_ASSIGN_OR_RETURN(
+      auto out_meshes,
+      splitter_internal.BuildMeshes(mesh, &work_data, deduplicate_vertices_));
   return FinalizeMeshes(mesh, work_data, std::move(out_meshes));
 }
 
+int MeshSplitter::GetSplitMeshAttributeIndex(int source_mesh_att_index) const {
+  return att_id_map_[source_mesh_att_index];
+}
+
 }  // namespace draco
 #endif  // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/mesh/mesh_splitter.h b/contrib/draco/src/draco/mesh/mesh_splitter.h
index bf5cd9794..d69d8b844 100644
--- a/contrib/draco/src/draco/mesh/mesh_splitter.h
+++ b/contrib/draco/src/draco/mesh/mesh_splitter.h
@@ -63,6 +63,25 @@ class MeshSplitter {
   // Default = false.
   void SetPreserveMeshFeatures(bool flag) { preserve_mesh_features_ = flag; }
 
+  // Sets a flag that tells the splitter to preserve structural metadata on the
+  // input mesh during mesh splitting. When set, the structural metadata like
+  // property attributes indices used on sub-meshes are going to be copied over.
+  // Any redundant structural metadata on sub-meshes are going to be deleted.
+  // Default = false.
+  void SetPreserveStructuralMetadata(bool flag) {
+    preserve_structural_metadata_ = flag;
+  }
+
+  // By default, the splitter will attempt to deduplicate vertices after
+  // splitting the mesh. This means lower memory usage and smaller output glTFs
+  // after encoding. However, for very large meshes, this may become an
+  // expensive operation. If that becomes an issue, you might want to consider
+  // disabling deduplication with |SetDeduplicateVertices(false)|.
+  //
+  // Note that at this moment, disabling deduplication works ONLY for point
+  // clouds.
+  void SetDeduplicateVertices(bool flag) { deduplicate_vertices_ = flag; }
+
   // Splits the input |mesh| according to attribute values stored in the
   // specified attribute. If the |mesh| contains faces, the attribute values
   // need to be defined per-face, that is, all points attached to a single face
@@ -79,10 +98,13 @@ class MeshSplitter {
   StatusOr<MeshVector> SplitMeshToComponents(
       const Mesh &mesh, const MeshConnectedComponents &connected_components);
 
+  // Returns attribute index on each split mesh that corresponds to the
+  // |source_mesh_att_index| of the source Mesh.
+  // Must be called after SplitMesh() or SplitMeshToComponents().
+  int GetSplitMeshAttributeIndex(int source_mesh_att_index) const;
+
  private:
   struct WorkData {
-    // Map between attribute ids of the input and output meshes.
-    std::vector<int> att_id_map;
     std::vector<int> num_sub_mesh_elements;
     bool split_by_materials = false;
   };
@@ -98,6 +120,11 @@ class MeshSplitter {
   bool preserve_materials_;
   bool remove_unused_material_indices_;
   bool preserve_mesh_features_;
+  bool preserve_structural_metadata_;
+  bool deduplicate_vertices_;
+
+  // Map between attribute ids of the input and output meshes.
+  std::vector<int> att_id_map_;
 
   template <typename BuilderT>
   friend class MeshSplitterInternal;
diff --git a/contrib/draco/src/draco/mesh/mesh_splitter_test.cc b/contrib/draco/src/draco/mesh/mesh_splitter_test.cc
index 7432c4736..724577283 100644
--- a/contrib/draco/src/draco/mesh/mesh_splitter_test.cc
+++ b/contrib/draco/src/draco/mesh/mesh_splitter_test.cc
@@ -15,14 +15,21 @@
 #include "draco/mesh/mesh_splitter.h"
 
 #ifdef DRACO_TRANSCODER_SUPPORTED
+#include <cstdint>
 #include <memory>
+#include <unordered_set>
 #include <utility>
+#include <vector>
 
+#include "draco/attributes/geometry_attribute.h"
 #include "draco/core/draco_test_base.h"
 #include "draco/core/draco_test_utils.h"
+#include "draco/core/draco_types.h"
 #include "draco/core/vector_d.h"
 #include "draco/io/mesh_io.h"
+#include "draco/material/material.h"
 #include "draco/mesh/mesh_misc_functions.h"
+#include "draco/point_cloud/point_cloud_builder.h"
 
 namespace {}  // namespace
 #endif        // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/mesh/mesh_test.cc b/contrib/draco/src/draco/mesh/mesh_test.cc
index 7cc046a7e..4b380745f 100644
--- a/contrib/draco/src/draco/mesh/mesh_test.cc
+++ b/contrib/draco/src/draco/mesh/mesh_test.cc
@@ -16,6 +16,7 @@
 
 #include <memory>
 #include <utility>
+#include <vector>
 
 #include "draco/core/draco_test_base.h"
 #include "draco/core/draco_test_utils.h"
@@ -539,6 +540,57 @@ TEST(MeshTest, MeshCopyWithMeshFeatures) {
             library_copy.GetTexture(1));
 }
 
+// Tests that mesh features are updated properly after a mesh attribute is
+// deleted.
+TEST(MeshTest, TestMeshFeaturesAttributeDeletion) {
+  const std::unique_ptr<draco::Mesh> mesh =
+      draco::ReadMeshFromTestFile("cube_att.obj");
+  ASSERT_NE(mesh, nullptr);
+
+  // Add feature ID set referring to an attribute.
+  const draco::MeshFeaturesIndex index_0 = mesh->AddMeshFeatures(
+      std::unique_ptr<draco::MeshFeatures>(new draco::MeshFeatures()));
+  mesh->GetMeshFeatures(index_0).SetLabel("planet");
+  mesh->GetMeshFeatures(index_0).SetFeatureCount(2);
+  mesh->GetMeshFeatures(index_0).SetAttributeIndex(1);
+
+  // Delete mesh attribute 0. This should update attribute index associated with
+  // mesh features |index_0| by one (to 0).
+  ASSERT_EQ(mesh->GetMeshFeatures(index_0).GetAttributeIndex(), 1);
+  mesh->DeleteAttribute(0);
+  ASSERT_EQ(mesh->GetMeshFeatures(index_0).GetAttributeIndex(), 0);
+
+  // Delete the new mesh attribute 0 and the mesh features |index_0| should not
+  // be associated with any attribute anymore.
+  mesh->DeleteAttribute(0);
+  ASSERT_EQ(mesh->GetMeshFeatures(index_0).GetAttributeIndex(), -1);
+}
+
+// Tests that we can identify which attributes are used by mesh features.
+TEST(MeshTest, TestAttributeUsedByMeshFeatures) {
+  const std::unique_ptr<draco::Mesh> mesh =
+      draco::ReadMeshFromTestFile("cube_att.obj");
+  ASSERT_NE(mesh, nullptr);
+
+  // Add feature ID set referring to an attribute.
+  const draco::MeshFeaturesIndex index_0 = mesh->AddMeshFeatures(
+      std::unique_ptr<draco::MeshFeatures>(new draco::MeshFeatures()));
+  mesh->GetMeshFeatures(index_0).SetLabel("planet");
+  mesh->GetMeshFeatures(index_0).SetFeatureCount(2);
+  mesh->GetMeshFeatures(index_0).SetAttributeIndex(1);
+
+  // Ensure we can tell that attribute 1 is used by mesh features.
+  ASSERT_TRUE(mesh->IsAttributeUsedByMeshFeatures(1));
+
+  // Attribute 0 should not be used by mesh features.
+  ASSERT_FALSE(mesh->IsAttributeUsedByMeshFeatures(0));
+
+  // If the mesh features is deleted, attribute 1 should not be used by mesh
+  // features any more.
+  mesh->DeleteAttribute(1);
+  ASSERT_FALSE(mesh->IsAttributeUsedByMeshFeatures(1));
+}
+
 // Tests copying of a mesh with structural metadata.
 TEST(MeshTest, TestCopyWithStructuralMetadata) {
   const std::unique_ptr<draco::Mesh> mesh =
@@ -546,22 +598,32 @@ TEST(MeshTest, TestCopyWithStructuralMetadata) {
   ASSERT_NE(mesh, nullptr);
 
   // Add structural metadata to the mesh.
-  draco::PropertyTable::Schema schema;
+  draco::StructuralMetadataSchema schema;
   schema.json.SetString("Data");
-  mesh->GetStructuralMetadata().SetPropertyTableSchema(schema);
+  mesh->GetStructuralMetadata().SetSchema(schema);
+  mesh->AddPropertyAttributesIndex(0);
+  mesh->AddPropertyAttributesIndex(1);
 
   // Copy the mesh.
   draco::Mesh copy;
   copy.Copy(*mesh);
 
   // Check that the structural metadata has been copied.
-  ASSERT_EQ(
-      copy.GetStructuralMetadata().GetPropertyTableSchema().json.GetString(),
-      "Data");
+  ASSERT_EQ(copy.GetStructuralMetadata().GetSchema().json.GetString(), "Data");
+  ASSERT_EQ(copy.NumPropertyAttributesIndices(), 2);
+  ASSERT_EQ(copy.GetPropertyAttributesIndex(0), 0);
+  ASSERT_EQ(copy.GetPropertyAttributesIndex(1), 1);
+
+  // Check that property attributes index can be removed.
+  copy.RemovePropertyAttributesIndex(0);
+  ASSERT_EQ(copy.NumPropertyAttributesIndices(), 1);
+  ASSERT_EQ(copy.GetPropertyAttributesIndex(0), 1);
 }
 
-// Tests removing of unused materials for a mesh with mesh features.
-TEST(MeshTest, RemoveUnusedMaterialsWithMeshFeatures) {
+// Tests removing of unused materials for a mesh with mesh features and property
+// attributes indices.
+TEST(MeshTest,
+     RemoveUnusedMaterialsWithMeshFeaturesAndPropertyAttributesIndices) {
   const std::unique_ptr<draco::Mesh> mesh =
       draco::ReadMeshFromTestFile("BoxesMeta/glTF/BoxesMeta.gltf");
   ASSERT_NE(mesh, nullptr);
@@ -580,6 +642,12 @@ TEST(MeshTest, RemoveUnusedMaterialsWithMeshFeatures) {
   ASSERT_EQ(mesh->GetMeshFeaturesMaterialMask(draco::MeshFeaturesIndex(4), 0),
             1);
 
+  // Input has two property attributes, one associated with each of the two
+  // materials.
+  ASSERT_EQ(mesh->NumPropertyAttributesIndices(), 2);
+  ASSERT_EQ(mesh->GetPropertyAttributesIndexMaterialMask(0, 0), 0);
+  ASSERT_EQ(mesh->GetPropertyAttributesIndexMaterialMask(1, 0), 1);
+
   // Remove material 0.
   draco::PointAttribute *mat_att = mesh->attribute(
       mesh->GetNamedAttributeId(draco::GeometryAttribute::MATERIAL));
@@ -588,17 +656,21 @@ TEST(MeshTest, RemoveUnusedMaterialsWithMeshFeatures) {
   mat_att->SetAttributeValue(draco::AttributeValueIndex(0), &new_mat_index);
 
   // This should not do anything because we still have the material 0 referenced
-  // by mesh features 0 and 1.
+  // by mesh features 0 and 1, as well as by property attributes at index 0.
   mesh->RemoveUnusedMaterials();
 
   ASSERT_EQ(mesh->GetMaterialLibrary().NumMaterials(), 2);
   ASSERT_EQ(mesh->NumMeshFeatures(), 5);
+  ASSERT_EQ(mesh->NumPropertyAttributesIndices(), 2);
 
-  // Now remove unused mesh features (should be 0 and 1).
+  // Now remove unused mesh features (should be 0 and 1) and property attributes
+  // indices (should be 0).
   DRACO_ASSERT_OK(draco::MeshUtils::RemoveUnusedMeshFeatures(mesh.get()));
+  DRACO_ASSERT_OK(
+      draco::MeshUtils::RemoveUnusedPropertyAttributesIndices(mesh.get()));
 
-  ASSERT_EQ(mesh->NumMeshFeatures(), 3);
   // All remaining mesh features should be still mapped to material 1.
+  ASSERT_EQ(mesh->NumMeshFeatures(), 3);
   ASSERT_EQ(mesh->GetMeshFeaturesMaterialMask(draco::MeshFeaturesIndex(0), 0),
             1);
   ASSERT_EQ(mesh->GetMeshFeaturesMaterialMask(draco::MeshFeaturesIndex(1), 0),
@@ -606,18 +678,50 @@ TEST(MeshTest, RemoveUnusedMaterialsWithMeshFeatures) {
   ASSERT_EQ(mesh->GetMeshFeaturesMaterialMask(draco::MeshFeaturesIndex(2), 0),
             1);
 
+  // Remaining property attributes index should be still mapped to material 1.
+  ASSERT_EQ(mesh->NumPropertyAttributesIndices(), 1);
+  ASSERT_EQ(mesh->GetPropertyAttributesIndexMaterialMask(0, 0), 1);
+
   // Now remove the unused materials (0).
   mesh->RemoveUnusedMaterials();
 
-  // Only one material should be remaining and all the mesh features should now
-  // be mapped to material 0.
+  // Only one material should be remaining.
   ASSERT_EQ(mesh->GetMaterialLibrary().NumMaterials(), 1);
+
+  // All the mesh features should now be mapped to material 0.
   ASSERT_EQ(mesh->GetMeshFeaturesMaterialMask(draco::MeshFeaturesIndex(0), 0),
             0);
   ASSERT_EQ(mesh->GetMeshFeaturesMaterialMask(draco::MeshFeaturesIndex(1), 0),
             0);
   ASSERT_EQ(mesh->GetMeshFeaturesMaterialMask(draco::MeshFeaturesIndex(2), 0),
             0);
+
+  // Property attributes index should now be mapped to material 0.
+  ASSERT_EQ(mesh->GetPropertyAttributesIndexMaterialMask(0, 0), 0);
+}
+
+// Tests that when we remove mesh features from a mesh, the associated vertex
+// attributes and textures are not removed.
+TEST(MeshTest, TestDeleteMeshFeatures) {
+  // The loaded mesh has several vertex attributes and textures used by the
+  // mesh features.
+  const std::unique_ptr<draco::Mesh> mesh =
+      draco::ReadMeshFromTestFile("BoxesMeta/glTF/BoxesMeta.gltf");
+  ASSERT_NE(mesh, nullptr);
+  ASSERT_GT(mesh->NumMeshFeatures(), 0);
+
+  draco::Mesh mesh_copy;
+  mesh_copy.Copy(*mesh);
+
+  // Delete all mesh features from the copy and ensure all vertex attributes
+  // and textures stay the same.
+  while (mesh_copy.NumMeshFeatures() > 0) {
+    mesh_copy.RemoveMeshFeatures(draco::MeshFeaturesIndex(0));
+  }
+  ASSERT_EQ(mesh_copy.NumMeshFeatures(), 0);
+  ASSERT_EQ(mesh_copy.num_attributes(), mesh->num_attributes());
+  ASSERT_EQ(mesh_copy.GetNonMaterialTextureLibrary().NumTextures(),
+            mesh->GetNonMaterialTextureLibrary().NumTextures());
 }
 #endif  // DRACO_TRANSCODER_SUPPORTED
 
diff --git a/contrib/draco/src/draco/mesh/mesh_utils.cc b/contrib/draco/src/draco/mesh/mesh_utils.cc
index 0fbe366c1..42917d1d3 100644
--- a/contrib/draco/src/draco/mesh/mesh_utils.cc
+++ b/contrib/draco/src/draco/mesh/mesh_utils.cc
@@ -167,15 +167,10 @@ void MeshUtils::MergeMetadata(const Mesh &src_mesh, Mesh *dst_mesh) {
   }
 }
 
-Status MeshUtils::RemoveUnusedMeshFeatures(Mesh *mesh) {
-  // Unused mesh features are features that are not used by any face / vertex
-  // of the |mesh|. Currently, each mesh feature can be "masked" for specific
-  // materials, in which case we need to check whether the mask materials
-  // are present in the |mesh|. If not, we can remove the mesh features from the
-  // mesh.
+// Returns indices of all used materials on the |mesh|.
+std::unordered_set<int> FindUsedMaterials(const Mesh &mesh) {
   const PointAttribute *const mat_att =
-      mesh->GetNamedAttribute(GeometryAttribute::MATERIAL);
-  // Find which materials are used.
+      mesh.GetNamedAttribute(GeometryAttribute::MATERIAL);
   std::unordered_set<int> used_materials;
   if (mat_att == nullptr) {
     // Only material with index 0 is assumed to be used.
@@ -187,7 +182,16 @@ Status MeshUtils::RemoveUnusedMeshFeatures(Mesh *mesh) {
       used_materials.insert(mat_index);
     }
   }
+  return used_materials;
+}
 
+Status MeshUtils::RemoveUnusedMeshFeatures(Mesh *mesh) {
+  // Unused mesh features are features that are not used by any face / vertex
+  // of the |mesh|. Currently, each mesh feature can be "masked" for specific
+  // materials, in which case we need to check whether the mask materials
+  // are present in the |mesh|. If not, we can remove the mesh features from the
+  // mesh.
+  const std::unordered_set<int> used_materials = FindUsedMaterials(*mesh);
   std::vector<MeshFeaturesIndex> unused_mesh_features;
   for (MeshFeaturesIndex mfi(0); mfi < mesh->NumMeshFeatures(); ++mfi) {
     bool is_used = false;
@@ -247,6 +251,44 @@ Status MeshUtils::RemoveUnusedMeshFeatures(Mesh *mesh) {
   return OkStatus();
 }
 
+Status MeshUtils::RemoveUnusedPropertyAttributesIndices(Mesh *mesh) {
+  // Unused property attributes indices are indices that are not used by any
+  // face / vertex of the |mesh|. Currently, each property attributes index can
+  // be "masked" for specific materials, in which case we need to check whether
+  // the mask materials are present in the |mesh|. If not, we can remove the
+  // property attributes from the mesh.
+  const std::unordered_set<int> used_materials = FindUsedMaterials(*mesh);
+  std::vector<int> unused_property_attributes_indices;
+  for (int i = 0; i < mesh->NumPropertyAttributesIndices(); ++i) {
+    bool is_used = false;
+    if (mesh->NumPropertyAttributesIndexMaterialMasks(i) == 0) {
+      is_used = true;
+    } else {
+      for (int mask_i = 0;
+           mask_i < mesh->NumPropertyAttributesIndexMaterialMasks(i);
+           ++mask_i) {
+        const int material_index =
+            mesh->GetPropertyAttributesIndexMaterialMask(i, mask_i);
+        if (used_materials.count(material_index)) {
+          is_used = true;
+          break;
+        }
+      }
+    }
+    if (!is_used) {
+      unused_property_attributes_indices.push_back(i);
+    }
+  }
+
+  // Remove the unused property attributes indices (from back).
+  for (auto it = unused_property_attributes_indices.rbegin();
+       it != unused_property_attributes_indices.rend(); ++it) {
+    const int i = *it;
+    mesh->RemovePropertyAttributesIndex(i);
+  }
+  return OkStatus();
+}
+
 bool MeshUtils::FlipTextureUvValues(bool flip_u, bool flip_v,
                                     PointAttribute *att) {
   if (att->attribute_type() != GeometryAttribute::TEX_COORD) {
diff --git a/contrib/draco/src/draco/mesh/mesh_utils.h b/contrib/draco/src/draco/mesh/mesh_utils.h
index e17dfd8ed..91833b76e 100644
--- a/contrib/draco/src/draco/mesh/mesh_utils.h
+++ b/contrib/draco/src/draco/mesh/mesh_utils.h
@@ -42,6 +42,9 @@ class MeshUtils {
   // error is returned.
   static Status RemoveUnusedMeshFeatures(Mesh *mesh);
 
+  // Removes unused property attributes indices from |mesh|.
+  static Status RemoveUnusedPropertyAttributesIndices(Mesh *mesh);
+
   // Flips the UV values of |att|.
   static bool FlipTextureUvValues(bool flip_u, bool flip_v,
                                   PointAttribute *att);
diff --git a/contrib/draco/src/draco/mesh/mesh_utils_test.cc b/contrib/draco/src/draco/mesh/mesh_utils_test.cc
index 022669cb0..b14108acf 100644
--- a/contrib/draco/src/draco/mesh/mesh_utils_test.cc
+++ b/contrib/draco/src/draco/mesh/mesh_utils_test.cc
@@ -386,6 +386,47 @@ TEST(MeshUtilsTest, RemoveUnusedMeshFeatures) {
   }
 }
 
+TEST(MeshUtilsTest, RemoveUnusedPropertyAttributesIndices) {
+  // Test verifies that MeshUtils::RemoveUnusedPropertyAttributesIndices works
+  // as intended.
+  std::unique_ptr<draco::Mesh> mesh =
+      draco::ReadMeshFromTestFile("BoxesMeta/glTF/BoxesMeta.gltf");
+  ASSERT_NE(mesh, nullptr);
+
+  // The input mesh should have two property attributes indices.
+  ASSERT_EQ(mesh->NumPropertyAttributesIndices(), 2);
+  ASSERT_EQ(mesh->GetPropertyAttributesIndex(0), 0);
+  ASSERT_EQ(mesh->GetPropertyAttributesIndex(1), 1);
+  ASSERT_EQ(mesh->NumPropertyAttributesIndexMaterialMasks(0), 1);
+  ASSERT_EQ(mesh->NumPropertyAttributesIndexMaterialMasks(1), 1);
+  ASSERT_EQ(mesh->GetPropertyAttributesIndexMaterialMask(0, 0), 0);
+  ASSERT_EQ(mesh->GetPropertyAttributesIndexMaterialMask(1, 0), 1);
+
+  // Both indices should be used so calling the method below shouldn't do
+  // anything.
+  draco::MeshUtils::RemoveUnusedPropertyAttributesIndices(mesh.get());
+  ASSERT_EQ(mesh->NumPropertyAttributesIndices(), 2);
+
+  // Now remove material 1 that is mapped to second property attributes index.
+  draco::PointAttribute *mat_att = mesh->attribute(
+      mesh->GetNamedAttributeId(draco::GeometryAttribute::MATERIAL));
+
+  // This basically remaps all faces from material 1 to material 0.
+  uint32_t mat_index = 0;
+  mat_att->SetAttributeValue(draco::AttributeValueIndex(1), &mat_index);
+
+  // Try to remove the property attributes indices again.
+  draco::MeshUtils::RemoveUnusedPropertyAttributesIndices(mesh.get());
+
+  // One of the property attributes indices should have been removed.
+  ASSERT_EQ(mesh->NumPropertyAttributesIndices(), 1);
+
+  // Ensure the remaining property attributes index is mapped to the correct
+  // material.
+  ASSERT_EQ(mesh->NumPropertyAttributesIndexMaterialMasks(0), 1);
+  ASSERT_EQ(mesh->GetPropertyAttributesIndexMaterialMask(0, 0), 0);
+}
+
 }  // namespace
 
 #endif  // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/mesh/triangle_soup_mesh_builder.cc b/contrib/draco/src/draco/mesh/triangle_soup_mesh_builder.cc
index 2af94a052..71553f9b2 100644
--- a/contrib/draco/src/draco/mesh/triangle_soup_mesh_builder.cc
+++ b/contrib/draco/src/draco/mesh/triangle_soup_mesh_builder.cc
@@ -14,6 +14,8 @@
 //
 #include "draco/mesh/triangle_soup_mesh_builder.h"
 
+#include <string>
+
 namespace draco {
 
 void TriangleSoupMeshBuilder::Start(int num_faces) {
@@ -96,4 +98,16 @@ std::unique_ptr<Mesh> TriangleSoupMeshBuilder::Finalize() {
   return std::move(mesh_);
 }
 
+void TriangleSoupMeshBuilder::SetAttributeUniqueId(int att_id,
+                                                   uint32_t unique_id) {
+  mesh_->attribute(att_id)->set_unique_id(unique_id);
+}
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+void TriangleSoupMeshBuilder::SetAttributeName(int att_id,
+                                               const std::string &name) {
+  mesh_->attribute(att_id)->set_name(name);
+}
+#endif  // DRACO_TRANSCODER_SUPPORTED
+
 }  // namespace draco
diff --git a/contrib/draco/src/draco/mesh/triangle_soup_mesh_builder.h b/contrib/draco/src/draco/mesh/triangle_soup_mesh_builder.h
index 503fe84c5..e91cafc6d 100644
--- a/contrib/draco/src/draco/mesh/triangle_soup_mesh_builder.h
+++ b/contrib/draco/src/draco/mesh/triangle_soup_mesh_builder.h
@@ -80,6 +80,14 @@ class TriangleSoupMeshBuilder {
     mesh_->AddMetadata(std::move(metadata));
   }
 
+  // Sets the unique ID for an attribute created with AddAttribute().
+  void SetAttributeUniqueId(int att_id, uint32_t unique_id);
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  // Sets attribute name.
+  void SetAttributeName(int att_id, const std::string &name);
+#endif  // DRACO_TRANSCODER_SUPPORTED
+
   // Add metadata for an attribute.
   void AddAttributeMetadata(int32_t att_id,
                             std::unique_ptr<AttributeMetadata> metadata) {
diff --git a/contrib/draco/src/draco/mesh/triangle_soup_mesh_builder_test.cc b/contrib/draco/src/draco/mesh/triangle_soup_mesh_builder_test.cc
index b23641760..e273c0876 100644
--- a/contrib/draco/src/draco/mesh/triangle_soup_mesh_builder_test.cc
+++ b/contrib/draco/src/draco/mesh/triangle_soup_mesh_builder_test.cc
@@ -96,11 +96,15 @@ TEST_F(TriangleSoupMeshBuilderTest, CubeTest) {
                                Vector3f(0.f, 0.f, 1.f).data(),
                                Vector3f(0.f, 1.f, 0.f).data());
   // clang-format on
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  mb.SetAttributeName(pos_att_id, "Bob");
+#endif
 
   std::unique_ptr<Mesh> mesh = mb.Finalize();
   ASSERT_NE(mesh, nullptr) << "Failed to build the cube mesh.";
 #ifdef DRACO_TRANSCODER_SUPPORTED
   EXPECT_EQ(mesh->GetName(), "Cube");
+  EXPECT_EQ(mesh->attribute(pos_att_id)->name(), "Bob");
 #endif
   EXPECT_EQ(mesh->num_points(), 8) << "Unexpected number of vertices.";
   EXPECT_EQ(mesh->num_faces(), 12) << "Unexpected number of faces.";
@@ -207,6 +211,22 @@ TEST_F(TriangleSoupMeshBuilderTest, TestPerFaceAttribs) {
       << "Unexpected attribute element type.";
 }
 
+TEST_F(TriangleSoupMeshBuilderTest, PropagatesAttributeUniqueIds) {
+  // This test verifies that TriangleSoupMeshBuilder correctly applies
+  // unique IDs to attributes.
+  TriangleSoupMeshBuilder mb;
+  mb.Start(1);
+  const int pos_att_id =
+      mb.AddAttribute(GeometryAttribute::POSITION, 3, DT_FLOAT32);
+  mb.SetAttributeValuesForFace(
+      pos_att_id, FaceIndex(0), Vector3f(0.f, 0.f, 0.f).data(),
+      Vector3f(1.f, 0.f, 0.f).data(), Vector3f(0.f, 1.f, 0.f).data());
+  mb.SetAttributeUniqueId(pos_att_id, 1234);
+  std::unique_ptr<Mesh> mesh = mb.Finalize();
+  ASSERT_NE(mesh, nullptr);
+  ASSERT_EQ(mesh->GetAttributeByUniqueId(1234), mesh->attribute(pos_att_id));
+}
+
 #ifdef DRACO_TRANSCODER_SUPPORTED
 TEST_F(TriangleSoupMeshBuilderTest, NormalizedColor) {
   // This tests, verifies that the mesh builder constructs a valid model with
diff --git a/contrib/draco/src/draco/metadata/property_attribute.cc b/contrib/draco/src/draco/metadata/property_attribute.cc
new file mode 100644
index 000000000..4ca2997ff
--- /dev/null
+++ b/contrib/draco/src/draco/metadata/property_attribute.cc
@@ -0,0 +1,106 @@
+// Copyright 2023 The Draco 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 "draco/metadata/property_attribute.h"
+
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+
+namespace draco {
+
+bool PropertyAttribute::Property::operator==(const Property &other) const {
+  return name_ == other.name_ && attribute_name_ == other.attribute_name_;
+}
+
+void PropertyAttribute::Property::Copy(const Property &src) {
+  name_ = src.name_;
+  attribute_name_ = src.attribute_name_;
+}
+
+void PropertyAttribute::Property::SetName(const std::string &name) {
+  name_ = name;
+}
+
+const std::string &PropertyAttribute::Property::GetName() const {
+  return name_;
+}
+
+void PropertyAttribute::Property::SetAttributeName(const std::string &name) {
+  attribute_name_ = name;
+}
+
+const std::string &PropertyAttribute::Property::GetAttributeName() const {
+  return attribute_name_;
+}
+
+bool PropertyAttribute::operator==(const PropertyAttribute &other) const {
+  if (name_ != other.name_ || class_ != other.class_ ||
+      properties_.size() != other.properties_.size()) {
+    return false;
+  }
+  for (int i = 0; i < properties_.size(); ++i) {
+    if (*properties_[i] != *other.properties_[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+void PropertyAttribute::Copy(const PropertyAttribute &src) {
+  name_ = src.name_;
+  class_ = src.class_;
+  properties_.clear();
+  properties_.reserve(src.properties_.size());
+  for (int i = 0; i < src.properties_.size(); ++i) {
+    std::unique_ptr<Property> property(new Property());
+    property->Copy(src.GetProperty(i));
+    properties_.push_back(std::move(property));
+  }
+}
+
+void PropertyAttribute::SetName(const std::string &value) { name_ = value; }
+
+const std::string &PropertyAttribute::GetName() const { return name_; }
+
+void PropertyAttribute::SetClass(const std::string &value) { class_ = value; }
+
+const std::string &PropertyAttribute::GetClass() const { return class_; }
+
+int PropertyAttribute::AddProperty(std::unique_ptr<Property> property) {
+  properties_.push_back(std::move(property));
+  return properties_.size() - 1;
+}
+
+int PropertyAttribute::NumProperties() const { return properties_.size(); }
+
+const PropertyAttribute::Property &PropertyAttribute::GetProperty(
+    int index) const {
+  return *properties_[index];
+}
+
+PropertyAttribute::Property &PropertyAttribute::GetProperty(int index) {
+  return *properties_[index];
+}
+
+void PropertyAttribute::RemoveProperty(int index) {
+  properties_.erase(properties_.begin() + index);
+}
+
+}  // namespace draco
+
+#endif  // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/metadata/property_attribute.h b/contrib/draco/src/draco/metadata/property_attribute.h
new file mode 100644
index 000000000..9dfe03a19
--- /dev/null
+++ b/contrib/draco/src/draco/metadata/property_attribute.h
@@ -0,0 +1,107 @@
+// Copyright 2023 The Draco 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 DRACO_METADATA_PROPERTY_ATTRIBUTE_H_
+#define DRACO_METADATA_PROPERTY_ATTRIBUTE_H_
+
+#include "draco/draco_features.h"
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "draco/core/status_or.h"
+
+namespace draco {
+
+// Describes a property attribute as defined in the EXT_structural_metadata glTF
+// extension.
+class PropertyAttribute {
+ public:
+  // Describes where property is stored (as an attribute).
+  class Property {
+   public:
+    // Creates an empty property.
+    Property() = default;
+
+    // Methods for comparing two properties.
+    bool operator==(const Property &other) const;
+    bool operator!=(const Property &other) const { return !(*this == other); }
+
+    // Copies all data from |src| property.
+    void Copy(const Property &src);
+
+    // Name of this property.
+    void SetName(const std::string &name);
+    const std::string &GetName() const;
+
+    // Name of glTF attribute containing property values, like "_DIRECTION".
+    void SetAttributeName(const std::string &name);
+    const std::string &GetAttributeName() const;
+
+   private:
+    // Name of this property as in structural metadata schema class property.
+    std::string name_;
+
+    // Name of glTF attribute containing property values, like "_DIRECTION".
+    std::string attribute_name_;
+
+    // TODO(vytyaz): Support property value modifiers min, max, offset, scale.
+  };
+
+  // Creates an empty property attribute.
+  PropertyAttribute() = default;
+
+  // Methods for comparing two property attributes.
+  bool operator==(const PropertyAttribute &other) const;
+  bool operator!=(const PropertyAttribute &other) const {
+    return !(*this == other);
+  }
+
+  // Copies all data from |src| property attribute.
+  void Copy(const PropertyAttribute &src);
+
+  // Name of this property attribute.
+  void SetName(const std::string &value);
+  const std::string &GetName() const;
+
+  // Class of this property attribute.
+  void SetClass(const std::string &value);
+  const std::string &GetClass() const;
+
+  // Properties.
+  int AddProperty(std::unique_ptr<Property> property);
+  int NumProperties() const;
+  const Property &GetProperty(int index) const;
+  Property &GetProperty(int index);
+  void RemoveProperty(int index);
+
+ private:
+  // The name of the property attribute, e.g., for display purposes.
+  std::string name_;
+
+  // The class in structural metadata schema that property values conform to.
+  std::string class_;
+
+  // Properties corresponding to schema class properties, describing where the
+  // property values are stored (as attributes).
+  std::vector<std::unique_ptr<Property>> properties_;
+};
+
+}  // namespace draco
+
+#endif  // DRACO_TRANSCODER_SUPPORTED
+#endif  // DRACO_METADATA_PROPERTY_ATTRIBUTE_H_
diff --git a/contrib/draco/src/draco/metadata/property_attribute_test.cc b/contrib/draco/src/draco/metadata/property_attribute_test.cc
new file mode 100644
index 000000000..9a7abc27c
--- /dev/null
+++ b/contrib/draco/src/draco/metadata/property_attribute_test.cc
@@ -0,0 +1,247 @@
+// Copyright 2023 The Draco 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 "draco/metadata/property_attribute.h"
+
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "draco/core/draco_test_utils.h"
+
+namespace {
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+
+TEST(PropertyAttributeTest, TestPropertyDefaults) {
+  // Test construction of an empty property attribute property.
+  draco::PropertyAttribute::Property property;
+  ASSERT_TRUE(property.GetName().empty());
+  ASSERT_TRUE(property.GetAttributeName().empty());
+}
+
+TEST(PropertyAttributeTest, TestPropertyAttributeDefaults) {
+  // Test construction of an empty property attribute.
+  draco::PropertyAttribute attribute;
+  ASSERT_TRUE(attribute.GetName().empty());
+  ASSERT_TRUE(attribute.GetClass().empty());
+  ASSERT_EQ(attribute.NumProperties(), 0);
+}
+
+TEST(PropertyAttributeTest, TestPropertySettersAndGetters) {
+  // Test setter and getter methods of the property attribute property.
+  draco::PropertyAttribute::Property property;
+  property.SetName("The magnitude.");
+  property.SetAttributeName("_MAGNITUDE");
+
+  // Check that property members can be accessed via getters.
+  ASSERT_EQ(property.GetName(), "The magnitude.");
+  ASSERT_EQ(property.GetAttributeName(), "_MAGNITUDE");
+}
+
+TEST(PropertyAttributeTest, TestPropertyAttributeSettersAndGetters) {
+  // Test setter and getter methods of the property attribute.
+  draco::PropertyAttribute attribute;
+  attribute.SetName("The movement.");
+  attribute.SetClass("movement");
+  {
+    std::unique_ptr<draco::PropertyAttribute::Property> property(
+        new draco::PropertyAttribute::Property());
+    property->SetName("The magnitude.");
+    property->SetAttributeName("_MAGNITUDE");
+    ASSERT_EQ(attribute.AddProperty(std::move(property)), 0);
+  }
+  {
+    std::unique_ptr<draco::PropertyAttribute::Property> property(
+        new draco::PropertyAttribute::Property());
+    property->SetName("The direction.");
+    property->SetAttributeName("_DIRECTION");
+    ASSERT_EQ(attribute.AddProperty(std::move(property)), 1);
+  }
+
+  // Check that property attribute members can be accessed via getters.
+  ASSERT_EQ(attribute.GetName(), "The movement.");
+  ASSERT_EQ(attribute.GetClass(), "movement");
+  ASSERT_EQ(attribute.NumProperties(), 2);
+  ASSERT_EQ(attribute.GetProperty(0).GetName(), "The magnitude.");
+  ASSERT_EQ(attribute.GetProperty(0).GetAttributeName(), "_MAGNITUDE");
+  ASSERT_EQ(attribute.GetProperty(1).GetName(), "The direction.");
+  ASSERT_EQ(attribute.GetProperty(1).GetAttributeName(), "_DIRECTION");
+
+  // Check that properties can be removed.
+  attribute.RemoveProperty(0);
+  ASSERT_EQ(attribute.NumProperties(), 1);
+  ASSERT_EQ(attribute.GetProperty(0).GetName(), "The direction.");
+  ASSERT_EQ(attribute.GetProperty(0).GetAttributeName(), "_DIRECTION");
+  attribute.RemoveProperty(0);
+  ASSERT_EQ(attribute.NumProperties(), 0);
+}
+
+TEST(PropertyAttributeTest, TestPropertyCopy) {
+  // Test that property attribute property can be copied.
+  draco::PropertyAttribute::Property property;
+  property.SetName("The direction.");
+  property.SetAttributeName("_DIRECTION");
+
+  // Make a copy.
+  draco::PropertyAttribute::Property copy;
+  copy.Copy(property);
+
+  // Check the copy.
+  ASSERT_EQ(copy.GetName(), "The direction.");
+  ASSERT_EQ(copy.GetAttributeName(), "_DIRECTION");
+}
+
+TEST(PropertyAttributeTest, TestPropertyAttributeCopy) {
+  // Test that property attribute can be copied.
+  draco::PropertyAttribute attribute;
+  attribute.SetName("The movement.");
+  attribute.SetClass("movement");
+  {
+    std::unique_ptr<draco::PropertyAttribute::Property> property(
+        new draco::PropertyAttribute::Property());
+    property->SetName("The magnitude.");
+    property->SetAttributeName("_MAGNITUDE");
+    ASSERT_EQ(attribute.AddProperty(std::move(property)), 0);
+  }
+  {
+    std::unique_ptr<draco::PropertyAttribute::Property> property(
+        new draco::PropertyAttribute::Property());
+    property->SetName("The direction.");
+    property->SetAttributeName("_DIRECTION");
+    ASSERT_EQ(attribute.AddProperty(std::move(property)), 1);
+  }
+
+  // Make a copy.
+  draco::PropertyAttribute copy;
+  copy.Copy(attribute);
+
+  // Check the copy.
+  ASSERT_EQ(attribute.GetName(), "The movement.");
+  ASSERT_EQ(attribute.GetClass(), "movement");
+  ASSERT_EQ(attribute.NumProperties(), 2);
+  ASSERT_EQ(attribute.GetProperty(0).GetName(), "The magnitude.");
+  ASSERT_EQ(attribute.GetProperty(0).GetAttributeName(), "_MAGNITUDE");
+  ASSERT_EQ(attribute.GetProperty(1).GetName(), "The direction.");
+  ASSERT_EQ(attribute.GetProperty(1).GetAttributeName(), "_DIRECTION");
+}
+
+TEST(PropertyAttributeTest, TestPropertyCompare) {
+  // Test comparison of two properties.
+  typedef draco::PropertyAttribute::Property Property;
+  {
+    // Compare the same property object.
+    Property a;
+    ASSERT_TRUE(a == a);
+    ASSERT_FALSE(a != a);
+  }
+  {
+    // Compare two default property objects.
+    Property a;
+    Property b;
+    ASSERT_TRUE(a == b);
+    ASSERT_FALSE(a != b);
+  }
+  {
+    // Compare two property objects with different names.
+    Property a;
+    Property b;
+    a.SetName("The magnitude.");
+    b.SetName("The direction.");
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+  {
+    // Compare two property objects with different attribute names.
+    Property a;
+    Property b;
+    a.SetAttributeName("_MAGNITUDE");
+    b.SetAttributeName("_DIRECTION");
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+}
+
+TEST(PropertyAttributeTest, TestPropertyAttributeCompare) {
+  // Test comparison of two property attributes.
+  typedef draco::PropertyAttribute PropertyAttribute;
+  typedef draco::PropertyAttribute::Property Property;
+  {
+    // Compare the same property attribute object.
+    PropertyAttribute a;
+    ASSERT_TRUE(a == a);
+    ASSERT_FALSE(a != a);
+  }
+  {
+    // Compare two default property attributes.
+    PropertyAttribute a;
+    PropertyAttribute b;
+    ASSERT_TRUE(a == b);
+    ASSERT_FALSE(a != b);
+  }
+  {
+    // Compare two property attributes with different names.
+    PropertyAttribute a;
+    PropertyAttribute b;
+    a.SetName("The movement.");
+    b.SetName("The reflection.");
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+  {
+    // Compare two property attributes with different classes.
+    PropertyAttribute a;
+    PropertyAttribute b;
+    a.SetClass("movement");
+    b.SetClass("reflection");
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+  {
+    // Compare two property attributes with identical properties.
+    PropertyAttribute a;
+    PropertyAttribute b;
+    a.AddProperty(std::unique_ptr<Property>(new Property));
+    b.AddProperty(std::unique_ptr<Property>(new Property));
+    ASSERT_TRUE(a == b);
+    ASSERT_FALSE(a != b);
+  }
+  {
+    // Compare two property attributes with different number of properties.
+    PropertyAttribute a;
+    PropertyAttribute b;
+    a.AddProperty(std::unique_ptr<Property>(new Property));
+    b.AddProperty(std::unique_ptr<Property>(new Property));
+    b.AddProperty(std::unique_ptr<Property>(new Property));
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+  {
+    // Compare two property attributes with different properties.
+    PropertyAttribute a;
+    PropertyAttribute b;
+    std::unique_ptr<Property> p1(new Property);
+    std::unique_ptr<Property> p2(new Property);
+    p1->SetName("The magnitude.");
+    p2->SetName("The direction.");
+    a.AddProperty(std::move(p1));
+    b.AddProperty(std::move(p2));
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+}
+
+#endif  // DRACO_TRANSCODER_SUPPORTED
+
+}  // namespace
diff --git a/contrib/draco/src/draco/metadata/property_table.cc b/contrib/draco/src/draco/metadata/property_table.cc
index c6a5fd984..dae45ea11 100644
--- a/contrib/draco/src/draco/metadata/property_table.cc
+++ b/contrib/draco/src/draco/metadata/property_table.cc
@@ -23,111 +23,56 @@
 
 namespace draco {
 
-bool PropertyTable::Schema::Object::operator==(const Object& other) const {
-  if (type_ != other.type_ || name_ != other.name_) {
-    return false;
-  }
-  switch (type_) {
-    case OBJECT:
-      if (objects_.size() != other.objects_.size()) {
-        return false;
-      }
-      for (int i = 0; i < objects_.size(); ++i) {
-        if (objects_[i] != other.objects_[i]) {
-          return false;
-        }
-      }
-      break;
-    case ARRAY:
-      if (array_.size() != other.array_.size()) {
-        return false;
-      }
-      for (int i = 0; i < array_.size(); ++i) {
-        if (array_[i] != other.array_[i]) {
-          return false;
-        }
-      }
-      break;
-    case STRING:
-      return string_ == other.string_;
-    case INTEGER:
-      return integer_ == other.integer_;
-    case BOOLEAN:
-      return boolean_ == other.boolean_;
-  }
-  return true;
-}
-
-void PropertyTable::Schema::Object::Copy(const Object& src) {
-  name_ = src.name_;
-  type_ = src.type_;
-  objects_.reserve(src.objects_.size());
-  for (const Object& obj : src.objects_) {
-    objects_.emplace_back();
-    objects_.back().Copy(obj);
-  }
-  array_.reserve(src.array_.size());
-  for (const Object& obj : src.array_) {
-    array_.emplace_back();
-    array_.back().Copy(obj);
-  }
-  string_ = src.string_;
-  integer_ = src.integer_;
-  boolean_ = src.boolean_;
-}
-
-PropertyTable::Property::Property() {}
-
-bool PropertyTable::Property::Data::operator==(const Data& other) const {
+bool PropertyTable::Property::Data::operator==(const Data &other) const {
   return data == other.data && target == other.target;
 }
 
-bool PropertyTable::Property::Offsets::operator==(const Offsets& other) const {
+bool PropertyTable::Property::Offsets::operator==(const Offsets &other) const {
   return data == other.data && type == other.type;
 }
 
-bool PropertyTable::Property::operator==(const Property& other) const {
+bool PropertyTable::Property::operator==(const Property &other) const {
   return name_ == other.name_ && data_ == other.data_ &&
          array_offsets_ == other.array_offsets_ &&
          string_offsets_ == other.string_offsets_;
 }
 
-void PropertyTable::Property::Copy(const Property& src) {
+void PropertyTable::Property::Copy(const Property &src) {
   name_ = src.name_;
   data_ = src.data_;
   array_offsets_ = src.array_offsets_;
   string_offsets_ = src.string_offsets_;
 }
 
-void PropertyTable::Property::SetName(const std::string& name) { name_ = name; }
-const std::string& PropertyTable::Property::GetName() const { return name_; }
+void PropertyTable::Property::SetName(const std::string &name) { name_ = name; }
+const std::string &PropertyTable::Property::GetName() const { return name_; }
 
-PropertyTable::Property::Data& PropertyTable::Property::GetData() {
+PropertyTable::Property::Data &PropertyTable::Property::GetData() {
   return data_;
 }
-const PropertyTable::Property::Data& PropertyTable::Property::GetData() const {
+const PropertyTable::Property::Data &PropertyTable::Property::GetData() const {
   return data_;
 }
 
-const PropertyTable::Property::Offsets&
+const PropertyTable::Property::Offsets &
 PropertyTable::Property::GetArrayOffsets() const {
   return array_offsets_;
 }
-PropertyTable::Property::Offsets& PropertyTable::Property::GetArrayOffsets() {
+PropertyTable::Property::Offsets &PropertyTable::Property::GetArrayOffsets() {
   return array_offsets_;
 }
 
-const PropertyTable::Property::Offsets&
+const PropertyTable::Property::Offsets &
 PropertyTable::Property::GetStringOffsets() const {
   return string_offsets_;
 }
-PropertyTable::Property::Offsets& PropertyTable::Property::GetStringOffsets() {
+PropertyTable::Property::Offsets &PropertyTable::Property::GetStringOffsets() {
   return string_offsets_;
 }
 
 PropertyTable::PropertyTable() : count_(0) {}
 
-bool PropertyTable::operator==(const PropertyTable& other) const {
+bool PropertyTable::operator==(const PropertyTable &other) const {
   if (name_ != other.name_ || class_ != other.class_ ||
       count_ != other.count_ ||
       properties_.size() != other.properties_.size()) {
@@ -141,7 +86,7 @@ bool PropertyTable::operator==(const PropertyTable& other) const {
   return true;
 }
 
-void PropertyTable::Copy(const PropertyTable& src) {
+void PropertyTable::Copy(const PropertyTable &src) {
   name_ = src.name_;
   class_ = src.class_;
   count_ = src.count_;
@@ -154,11 +99,11 @@ void PropertyTable::Copy(const PropertyTable& src) {
   }
 }
 
-void PropertyTable::SetName(const std::string& value) { name_ = value; }
-const std::string& PropertyTable::GetName() const { return name_; }
+void PropertyTable::SetName(const std::string &value) { name_ = value; }
+const std::string &PropertyTable::GetName() const { return name_; }
 
-void PropertyTable::SetClass(const std::string& value) { class_ = value; }
-const std::string& PropertyTable::GetClass() const { return class_; }
+void PropertyTable::SetClass(const std::string &value) { class_ = value; }
+const std::string &PropertyTable::GetClass() const { return class_; }
 
 void PropertyTable::SetCount(int count) { count_ = count; }
 int PropertyTable::GetCount() const { return count_; }
@@ -168,10 +113,10 @@ int PropertyTable::AddProperty(std::unique_ptr<Property> property) {
   return properties_.size() - 1;
 }
 int PropertyTable::NumProperties() const { return properties_.size(); }
-const PropertyTable::Property& PropertyTable::GetProperty(int index) const {
+const PropertyTable::Property &PropertyTable::GetProperty(int index) const {
   return *properties_[index];
 }
-PropertyTable::Property& PropertyTable::GetProperty(int index) {
+PropertyTable::Property &PropertyTable::GetProperty(int index) {
   return *properties_[index];
 }
 void PropertyTable::RemoveProperty(int index) {
diff --git a/contrib/draco/src/draco/metadata/property_table.h b/contrib/draco/src/draco/metadata/property_table.h
index 41efb0163..db2943ee6 100644
--- a/contrib/draco/src/draco/metadata/property_table.h
+++ b/contrib/draco/src/draco/metadata/property_table.h
@@ -19,116 +19,29 @@
 
 #ifdef DRACO_TRANSCODER_SUPPORTED
 
+#include <cstdint>
+#include <cstring>
+#include <limits>
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "draco/core/status_or.h"
+
 namespace draco {
 
-// Describes a property table as defined in the EXT_structural_metadata glTF
-// extension, including property table schema and table properties (columns).
+// Describes a property table (properties are table columns) as defined in the
+// EXT_structural_metadata glTF extension.
 class PropertyTable {
  public:
-  // Describes property table schema in the form of a JSON object.
-  struct Schema {
-    // JSON object of the schema.
-    // TODO(vytyaz): Consider using a third_party/json library. Currently there
-    // is a conflict between Filament's assert_invariant() macro and JSON
-    // library's assert_invariant() method that causes compile errors in Draco
-    // visualization library.
-    class Object {
-     public:
-      enum Type { OBJECT, ARRAY, STRING, INTEGER, BOOLEAN };
-
-      // Constructors.
-      Object() : Object("") {}
-      explicit Object(const std::string& name)
-          : name_(name), type_(OBJECT), integer_(0), boolean_(false) {}
-      Object(const std::string& name, const std::string& value) : Object(name) {
-        SetString(value);
-      }
-      Object(const std::string& name, const char* value) : Object(name) {
-        SetString(value);
-      }
-      Object(const std::string& name, int value) : Object(name) {
-        SetInteger(value);
-      }
-      Object(const std::string& name, bool value) : Object(name) {
-        SetBoolean(value);
-      }
-
-      // Methods for comparing two objects.
-      bool operator==(const Object& other) const;
-      bool operator!=(const Object& other) const { return !(*this == other); }
-
-      // Method for copying the object.
-      void Copy(const Object& src);
-
-      // Methods for getting object name and type.
-      const std::string& GetName() const { return name_; }
-      Type GetType() const { return type_; }
-
-      // Methods for getting object value.
-      const std::vector<Object>& GetObjects() const { return objects_; }
-      const std::vector<Object>& GetArray() const { return array_; }
-      const std::string& GetString() const { return string_; }
-      int GetInteger() const { return integer_; }
-      bool GetBoolean() const { return boolean_; }
-
-      // Methods for setting object value.
-      std::vector<Object>& SetObjects() {
-        type_ = OBJECT;
-        return objects_;
-      }
-      std::vector<Object>& SetArray() {
-        type_ = ARRAY;
-        return array_;
-      }
-      void SetString(const std::string& value) {
-        type_ = STRING;
-        string_ = value;
-      }
-      void SetInteger(int value) {
-        type_ = INTEGER;
-        integer_ = value;
-      }
-      void SetBoolean(bool value) {
-        type_ = BOOLEAN;
-        boolean_ = value;
-      }
-
-     private:
-      std::string name_;
-      Type type_;
-      std::vector<Object> objects_;
-      std::vector<Object> array_;
-      std::string string_;
-      int integer_;
-      bool boolean_;
-    };
-
-    // Valid schema top-level JSON object name is "schema".
-    Schema() : json("schema") {}
-
-    // Methods for comparing two schemas.
-    bool operator==(const Schema& other) const { return json == other.json; }
-    bool operator!=(const Schema& other) const { return !(*this == other); }
-
-    // Valid schema top-level JSON object is required to have child objects.
-    bool Empty() const { return json.GetObjects().empty(); }
-
-    // Top-level JSON object of the schema.
-    Object json;
-  };
-
   // Describes a property (column) of a property table.
   class Property {
    public:
     // Describes glTF buffer view data.
     struct Data {
       // Methods for comparing two data objects.
-      bool operator==(const Data& other) const;
-      bool operator!=(const Data& other) const { return !(*this == other); }
+      bool operator==(const Data &other) const;
+      bool operator!=(const Data &other) const { return !(*this == other); }
 
       // Buffer view data.
       std::vector<uint8_t> data;
@@ -143,36 +56,102 @@ class PropertyTable {
     // arrays.
     struct Offsets {
       // Methods for comparing two offsets.
-      bool operator==(const Offsets& other) const;
-      bool operator!=(const Offsets& other) const { return !(*this == other); }
+      bool operator==(const Offsets &other) const;
+      bool operator!=(const Offsets &other) const { return !(*this == other); }
 
       // Data containing the offset entries.
       Data data;
 
       // Data type of the offset entries.
       std::string type;
+
+      // Builds a new Offsets object given the offsets in |ints|. The resultant
+      // offsets will choose the smallest possible result.type that can contain
+      // all of the input |ints|.
+      static Offsets MakeFromInts(const std::vector<uint64_t> &ints) {
+        uint64_t max_value = 0;
+        for (uint64_t i = 0; i < ints.size(); ++i) {
+          if (ints[i] > max_value) {
+            max_value = ints[i];
+          }
+        }
+
+        Offsets result;
+        int bytes_per_int = 0;
+        if (max_value <= std::numeric_limits<uint8_t>::max()) {
+          result.type = "UINT8";
+          bytes_per_int = 1;
+        } else if (max_value <= std::numeric_limits<uint16_t>::max()) {
+          result.type = "UINT16";
+          bytes_per_int = 2;
+        } else if (max_value <= std::numeric_limits<uint32_t>::max()) {
+          result.type = "UINT32";
+          bytes_per_int = 4;
+        } else {
+          result.type = "UINT64";
+          bytes_per_int = 8;
+        }
+
+        result.data.data.resize(ints.size() * bytes_per_int);
+        for (uint64_t i = 0; i < ints.size(); ++i) {
+          // This assumes execution on a little endian platform.
+          memcpy(&result.data.data[i * bytes_per_int], &ints[i], bytes_per_int);
+        }
+
+        return result;
+      }
+
+      // Decodes the binary data in Offsets::data into offset integers as
+      // defined by the EXT_structural_metadata extension. Returns an error if
+      // Offsets::type is not one of the types allowed by the spec.
+      StatusOr<std::vector<uint64_t>> ParseToInts() const {
+        if (data.data.empty()) {
+          return std::vector<uint64_t>();
+        }
+
+        int bytes_per_int = 0;
+        if (type == "UINT8") {
+          bytes_per_int = 1;
+        } else if (type == "UINT16") {
+          bytes_per_int = 2;
+        } else if (type == "UINT32") {
+          bytes_per_int = 4;
+        } else if (type == "UINT64") {
+          bytes_per_int = 8;
+        } else {
+          return Status(Status::DRACO_ERROR, "Offsets data type invalid");
+        }
+
+        const int count = data.data.size() / bytes_per_int;
+        std::vector<uint64_t> result(count);
+        for (int i = 0; i < count; ++i) {
+          // This assumes execution on a little endian platform.
+          memcpy(&result[i], &data.data[i * bytes_per_int], bytes_per_int);
+        }
+        return result;
+      }
     };
 
     // Creates an empty property.
-    Property();
+    Property() = default;
 
     // Methods for comparing two properties.
-    bool operator==(const Property& other) const;
-    bool operator!=(const Property& other) const { return !(*this == other); }
+    bool operator==(const Property &other) const;
+    bool operator!=(const Property &other) const { return !(*this == other); }
 
     // Copies all data from |src| property.
-    void Copy(const Property& src);
+    void Copy(const Property &src);
 
     // Name of this property.
-    void SetName(const std::string& name);
-    const std::string& GetName() const;
+    void SetName(const std::string &name);
+    const std::string &GetName() const;
 
     // Property data stores one table column worth of data. For example, when
     // the data of type UINT8 is [11, 22] then the property values are 11 and 22
     // for the first and second table rows. See EXT_structural_metadata glTF
     // extension documentation for more details.
-    Data& GetData();
-    const Data& GetData() const;
+    Data &GetData();
+    const Data &GetData() const;
 
     // Array offsets are used when property data contains a variable-length
     // number arrays. For example, when the data is [0, 1, 2, 3, 4] and the
@@ -180,16 +159,16 @@ class PropertyTable {
     // arrays are [0, 1] and [2, 3, 4] for the first and second table rows,
     // respectively. See EXT_structural_metadata glTF extension documentation
     // for more details.
-    const Offsets& GetArrayOffsets() const;
-    Offsets& GetArrayOffsets();
+    const Offsets &GetArrayOffsets() const;
+    Offsets &GetArrayOffsets();
 
     // String offsets are used when property data contains strings. For example,
     // when the data is "SeaLand" and the array offsets are [0, 3, 7] for a
     // two-row table, then the property strings are "Sea"  and "Land" for the
     // first and second table rows, respectively. See EXT_structural_metadata
     // glTF extension documentation for more details.
-    const Offsets& GetStringOffsets() const;
-    Offsets& GetStringOffsets();
+    const Offsets &GetStringOffsets() const;
+    Offsets &GetStringOffsets();
 
    private:
     std::string name_;
@@ -203,21 +182,21 @@ class PropertyTable {
   PropertyTable();
 
   // Methods for comparing two property tables.
-  bool operator==(const PropertyTable& other) const;
-  bool operator!=(const PropertyTable& other) const {
+  bool operator==(const PropertyTable &other) const;
+  bool operator!=(const PropertyTable &other) const {
     return !(*this == other);
   }
 
   // Copies all data from |src| property table.
-  void Copy(const PropertyTable& src);
+  void Copy(const PropertyTable &src);
 
   // Name of this property table.
-  void SetName(const std::string& value);
-  const std::string& GetName() const;
+  void SetName(const std::string &value);
+  const std::string &GetName() const;
 
   // Class of this property table.
-  void SetClass(const std::string& value);
-  const std::string& GetClass() const;
+  void SetClass(const std::string &value);
+  const std::string &GetClass() const;
 
   // Number of rows in this property table.
   void SetCount(int count);
@@ -226,8 +205,8 @@ class PropertyTable {
   // Table properties (columns).
   int AddProperty(std::unique_ptr<Property> property);
   int NumProperties() const;
-  const Property& GetProperty(int index) const;
-  Property& GetProperty(int index);
+  const Property &GetProperty(int index) const;
+  Property &GetProperty(int index);
   void RemoveProperty(int index);
 
  private:
diff --git a/contrib/draco/src/draco/metadata/property_table_test.cc b/contrib/draco/src/draco/metadata/property_table_test.cc
index 4d5ee2d2c..42433483f 100644
--- a/contrib/draco/src/draco/metadata/property_table_test.cc
+++ b/contrib/draco/src/draco/metadata/property_table_test.cc
@@ -14,11 +14,12 @@
 //
 #include "draco/metadata/property_table.h"
 
+#include <cstdint>
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
-#include "draco/core/draco_test_base.h"
 #include "draco/core/draco_test_utils.h"
 
 namespace {
@@ -60,266 +61,6 @@ TEST(PropertyTableTest, TestPropertyTableDefaults) {
   ASSERT_EQ(table.NumProperties(), 0);
 }
 
-TEST(PropertyTableTest, TestSchemaDefaults) {
-  // Test construction of an empty property table schema.
-  draco::PropertyTable::Schema schema;
-  ASSERT_TRUE(schema.Empty());
-  ASSERT_EQ(schema.json.GetName(), "schema");
-  ASSERT_EQ(schema.json.GetType(),
-            draco::PropertyTable::Schema::Object::OBJECT);
-  ASSERT_TRUE(schema.json.GetObjects().empty());
-  ASSERT_TRUE(schema.json.GetArray().empty());
-  ASSERT_TRUE(schema.json.GetString().empty());
-  ASSERT_EQ(schema.json.GetInteger(), 0);
-  ASSERT_FALSE(schema.json.GetBoolean());
-}
-
-TEST(PropertyTableTest, TestSchemaObjectDefaultConstructor) {
-  // Test construction of an empty property table schema object.
-  draco::PropertyTable::Schema::Object object;
-  ASSERT_TRUE(object.GetName().empty());
-  ASSERT_EQ(object.GetType(), draco::PropertyTable::Schema::Object::OBJECT);
-  ASSERT_TRUE(object.GetObjects().empty());
-  ASSERT_TRUE(object.GetArray().empty());
-  ASSERT_TRUE(object.GetString().empty());
-  ASSERT_EQ(object.GetInteger(), 0);
-  ASSERT_FALSE(object.GetBoolean());
-}
-
-TEST(PropertyTableTest, TestSchemaObjectNamedConstructor) {
-  // Test construction of a named property table schema object.
-  draco::PropertyTable::Schema::Object object("Flexible Demeanour");
-  ASSERT_EQ(object.GetName(), "Flexible Demeanour");
-  ASSERT_EQ(object.GetType(), draco::PropertyTable::Schema::Object::OBJECT);
-  ASSERT_TRUE(object.GetObjects().empty());
-}
-
-TEST(PropertyTableTest, TestSchemaObjectStringConstructor) {
-  // Test construction of property table schema object storing a string.
-  draco::PropertyTable::Schema::Object object("Flexible Demeanour", "GCU");
-  ASSERT_EQ(object.GetName(), "Flexible Demeanour");
-  ASSERT_EQ(object.GetType(), draco::PropertyTable::Schema::Object::STRING);
-  ASSERT_EQ(object.GetString(), "GCU");
-}
-
-TEST(PropertyTableTest, TestSchemaObjectIntegerConstructor) {
-  // Test construction of property table schema object storing an integer.
-  draco::PropertyTable::Schema::Object object("Flexible Demeanour", 12);
-  ASSERT_EQ(object.GetName(), "Flexible Demeanour");
-  ASSERT_EQ(object.GetType(), draco::PropertyTable::Schema::Object::INTEGER);
-  ASSERT_EQ(object.GetInteger(), 12);
-}
-
-TEST(PropertyTableTest, TestSchemaObjectBooleanConstructor) {
-  // Test construction of property table schema object storing a boolean.
-  draco::PropertyTable::Schema::Object object("Flexible Demeanour", true);
-  ASSERT_EQ(object.GetName(), "Flexible Demeanour");
-  ASSERT_EQ(object.GetType(), draco::PropertyTable::Schema::Object::BOOLEAN);
-  ASSERT_TRUE(object.GetBoolean());
-}
-
-TEST(PropertyTableTest, TestSchemaObjectSettersAndGetters) {
-  // Test value setters and getters of property table schema object.
-  typedef draco::PropertyTable::Schema::Object Object;
-  Object object;
-  ASSERT_EQ(object.GetType(), Object::OBJECT);
-
-  object.SetArray().push_back(Object("entry", 12));
-  ASSERT_EQ(object.GetType(), Object::ARRAY);
-  ASSERT_EQ(object.GetArray().size(), 1);
-  ASSERT_EQ(object.GetArray()[0].GetName(), "entry");
-  ASSERT_EQ(object.GetArray()[0].GetInteger(), 12);
-
-  object.SetObjects().push_back(Object("object", 9));
-  ASSERT_EQ(object.GetType(), Object::OBJECT);
-  ASSERT_EQ(object.GetObjects().size(), 1);
-  ASSERT_EQ(object.GetObjects()[0].GetName(), "object");
-  ASSERT_EQ(object.GetObjects()[0].GetInteger(), 9);
-
-  object.SetString("matter");
-  ASSERT_EQ(object.GetType(), Object::STRING);
-  ASSERT_EQ(object.GetString(), "matter");
-
-  object.SetInteger(5);
-  ASSERT_EQ(object.GetType(), Object::INTEGER);
-  ASSERT_EQ(object.GetInteger(), 5);
-
-  object.SetBoolean(true);
-  ASSERT_EQ(object.GetType(), Object::BOOLEAN);
-  ASSERT_EQ(object.GetBoolean(), true);
-}
-
-TEST(PropertyTableTest, TestSchemaCompare) {
-  typedef draco::PropertyTable::Schema Schema;
-  // Test comparison of two schema objects.
-  {
-    // Compare the same empty schema object.
-    Schema a;
-    ASSERT_TRUE(a == a);
-    ASSERT_FALSE(a != a);
-  }
-  {
-    // Compare two empty schema objects.
-    Schema a;
-    Schema b;
-    ASSERT_TRUE(a == b);
-    ASSERT_FALSE(a != b);
-  }
-  {
-    // Compare two schema objects with different JSON objects.
-    Schema a;
-    Schema b;
-    a.json.SetBoolean(true);
-    b.json.SetBoolean(false);
-    ASSERT_FALSE(a == b);
-    ASSERT_TRUE(a != b);
-  }
-}
-
-TEST(PropertyTableTest, TestSchemaObjectCompare) {
-  // Test comparison of two schema JSON objects.
-  typedef draco::PropertyTable::Schema::Object Object;
-  {
-    // Compare the same object.
-    Object a;
-    ASSERT_TRUE(a == a);
-    ASSERT_FALSE(a != a);
-  }
-  {
-    // Compare two default objects.
-    Object a;
-    Object b;
-    ASSERT_TRUE(a == b);
-    ASSERT_FALSE(a != b);
-  }
-  {
-    // Compare two objects with different names.
-    Object a("one");
-    Object b("two");
-    ASSERT_FALSE(a == b);
-    ASSERT_TRUE(a != b);
-  }
-  {
-    // Compare two objects with different types.
-    Object a;
-    Object b;
-    a.SetInteger(1);
-    b.SetString("one");
-    ASSERT_FALSE(a == b);
-    ASSERT_TRUE(a != b);
-  }
-  {
-    // Compare two identical string-type objects.
-    Object a;
-    Object b;
-    a.SetString("one");
-    b.SetString("one");
-    ASSERT_TRUE(a == b);
-    ASSERT_FALSE(a != b);
-  }
-  {
-    // Compare two different string-type objects.
-    Object a;
-    Object b;
-    a.SetString("one");
-    b.SetString("two");
-    ASSERT_FALSE(a == b);
-    ASSERT_TRUE(a != b);
-  }
-  {
-    // Compare two identical integer-type objects.
-    Object a;
-    Object b;
-    a.SetInteger(1);
-    b.SetInteger(1);
-    ASSERT_TRUE(a == b);
-    ASSERT_FALSE(a != b);
-  }
-  {
-    // Compare two different integer-type objects.
-    Object a;
-    Object b;
-    a.SetInteger(1);
-    b.SetInteger(2);
-    ASSERT_FALSE(a == b);
-    ASSERT_TRUE(a != b);
-  }
-  {
-    // Compare two identical boolean-type objects.
-    Object a;
-    Object b;
-    a.SetBoolean(true);
-    b.SetBoolean(true);
-    ASSERT_TRUE(a == b);
-    ASSERT_FALSE(a != b);
-  }
-  {
-    // Compare two different boolean-type objects.
-    Object a;
-    Object b;
-    a.SetBoolean(true);
-    b.SetBoolean(false);
-    ASSERT_FALSE(a == b);
-    ASSERT_TRUE(a != b);
-  }
-  {
-    // Compare two identical object-type objects.
-    Object a;
-    Object b;
-    a.SetObjects().emplace_back("one");
-    b.SetObjects().emplace_back("one");
-    ASSERT_TRUE(a == b);
-    ASSERT_FALSE(a != b);
-  }
-  {
-    // Compare two different object-type objects.
-    Object a;
-    Object b;
-    a.SetObjects().emplace_back("one");
-    b.SetObjects().emplace_back("two");
-    ASSERT_FALSE(a == b);
-    ASSERT_TRUE(a != b);
-  }
-  {
-    // Compare two object-type objects with different counts.
-    Object a;
-    Object b;
-    a.SetObjects().emplace_back("one");
-    b.SetObjects().emplace_back("one");
-    b.SetObjects().emplace_back("two");
-    ASSERT_FALSE(a == b);
-    ASSERT_TRUE(a != b);
-  }
-  {
-    // Compare two identical array-type objects.
-    Object a;
-    Object b;
-    a.SetArray().emplace_back("", 1);
-    b.SetArray().emplace_back("", 1);
-    ASSERT_TRUE(a == b);
-    ASSERT_FALSE(a != b);
-  }
-  {
-    // Compare two different array-type objects.
-    Object a;
-    Object b;
-    a.SetArray().emplace_back("", 1);
-    b.SetArray().emplace_back("", 2);
-    ASSERT_FALSE(a == b);
-    ASSERT_TRUE(a != b);
-  }
-  {
-    // Compare two array-type objects with different counts.
-    Object a;
-    Object b;
-    a.SetArray().emplace_back("", 1);
-    b.SetArray().emplace_back("", 1);
-    b.SetArray().emplace_back("", 2);
-    ASSERT_FALSE(a == b);
-    ASSERT_TRUE(a != b);
-  }
-}
-
 TEST(PropertyTableTest, TestPropertySettersAndGetters) {
   // Test setter and getter methods of the property table property.
   draco::PropertyTable::Property property;
@@ -619,6 +360,78 @@ TEST(PropertyTableTest, TestPropertyTableCompare) {
   }
 }
 
+TEST(PropertyTableTest, EnodesAndDecodesOffsetBuffers) {
+  {
+    // Encoding an offset buffer from small integers that should fit in an 8 bit
+    // integer.
+    std::vector<uint64_t> sample_offsets = {0x5u, 0x21u, 0x7u, 0x32u, 0xffu};
+    auto encoded_offsets =
+        draco::PropertyTable::Property::Offsets::MakeFromInts(sample_offsets);
+    ASSERT_EQ(encoded_offsets.data.data,
+              std::vector<uint8_t>({0x5u, 0x21u, 0x7u, 0x32u, 0xffu}));
+    ASSERT_EQ(encoded_offsets.type, "UINT8");
+
+    DRACO_ASSIGN_OR_ASSERT(std::vector<uint64_t> decoded_offsets,
+                           encoded_offsets.ParseToInts());
+    ASSERT_EQ(decoded_offsets, sample_offsets);
+  }
+  {
+    // Encoding an offset buffer from medium sized integers that should fit in a
+    // 16 bit integer.
+    std::vector<uint64_t> sample_offsets = {0x5u, 0x21u, 0xffffu};
+    auto encoded_offsets =
+        draco::PropertyTable::Property::Offsets::MakeFromInts(sample_offsets);
+    ASSERT_EQ(encoded_offsets.data.data,
+              std::vector<uint8_t>({0x5u, 0u, 0x21u, 0u, 0xffu, 0xffu}));
+    ASSERT_EQ(encoded_offsets.type, "UINT16");
+
+    DRACO_ASSIGN_OR_ASSERT(std::vector<uint64_t> decoded_offsets,
+                           encoded_offsets.ParseToInts());
+    ASSERT_EQ(decoded_offsets, sample_offsets);
+  }
+  {
+    // Encoding an offset buffer from medium sized integers that should fit in a
+    // 32 bit integer.
+    std::vector<uint64_t> sample_offsets = {0x5u, 0x21u, 0xffffffffu};
+    auto encoded_offsets =
+        draco::PropertyTable::Property::Offsets::MakeFromInts(sample_offsets);
+    ASSERT_EQ(encoded_offsets.data.data,
+              std::vector<uint8_t>({0x5u, 0u, 0u, 0u, 0x21u, 0u, 0u, 0u, 0xffu,
+                                    0xffu, 0xffu, 0xffu}));
+    ASSERT_EQ(encoded_offsets.type, "UINT32");
+
+    DRACO_ASSIGN_OR_ASSERT(std::vector<uint64_t> decoded_offsets,
+                           encoded_offsets.ParseToInts());
+    ASSERT_EQ(decoded_offsets, sample_offsets);
+  }
+  {
+    // Encoding an offset buffer from large integers that won't fit in a 32 bit
+    // integer.
+    std::vector<uint64_t> sample_offsets = {0x5u, 0x21u, 0x100000000u};
+    auto encoded_offsets =
+        draco::PropertyTable::Property::Offsets::MakeFromInts(sample_offsets);
+    ASSERT_EQ(encoded_offsets.data.data,
+              std::vector<uint8_t>({0x5u,  0u, 0u, 0u, 0u, 0u, 0u, 0u,
+                                    0x21u, 0u, 0u, 0u, 0u, 0u, 0u, 0u,
+                                    0u,    0u, 0u, 0u, 1u, 0u, 0u, 0u}));
+    ASSERT_EQ(encoded_offsets.type, "UINT64");
+
+    DRACO_ASSIGN_OR_ASSERT(std::vector<uint64_t> decoded_offsets,
+                           encoded_offsets.ParseToInts());
+    ASSERT_EQ(decoded_offsets, sample_offsets);
+  }
+  {
+    // Decoding a malformed buffer should return an error.
+    draco::PropertyTable::Property::Offsets broken_offsets;
+    broken_offsets.data.data = std::vector<uint8_t>({0, 0, 0, 0});
+    broken_offsets.type = "BROKEN_TYPE";
+
+    draco::StatusOr<std::vector<uint64_t>> decoded_offsets =
+        broken_offsets.ParseToInts();
+    ASSERT_FALSE(decoded_offsets.ok());
+  }
+}
+
 #endif  // DRACO_TRANSCODER_SUPPORTED
 
 }  // namespace
diff --git a/contrib/draco/src/draco/metadata/structural_metadata.cc b/contrib/draco/src/draco/metadata/structural_metadata.cc
index 48fff2b25..a60b5c9e3 100644
--- a/contrib/draco/src/draco/metadata/structural_metadata.cc
+++ b/contrib/draco/src/draco/metadata/structural_metadata.cc
@@ -21,30 +21,54 @@
 
 namespace draco {
 
-StructuralMetadata::StructuralMetadata() {}
+// Returns true if vectors |a| and |b| have the same size and their entries
+// (unique pointers) point to objects that compare equally.
+template <typename T>
+bool VectorsAreEqual(const std::vector<std::unique_ptr<T>> &a,
+                     const std::vector<std::unique_ptr<T>> &b) {
+  if (a.size() != b.size()) {
+    return false;
+  }
+  for (int i = 0; i < a.size(); ++i) {
+    if (*a[i] != *b[i]) {
+      return false;
+    }
+  }
+  return true;
+}
 
 bool StructuralMetadata::operator==(const StructuralMetadata &other) const {
-  return property_table_schema_ == other.property_table_schema_ &&
-         property_tables_ == other.property_tables_;
+  return schema_ == other.schema_ &&
+         VectorsAreEqual(property_tables_, other.property_tables_) &&
+         VectorsAreEqual(property_attributes_, other.property_attributes_);
 }
 
 void StructuralMetadata::Copy(const StructuralMetadata &src) {
-  property_table_schema_.json.Copy(src.property_table_schema_.json);
+  // Copy schema.
+  schema_.json.Copy(src.schema_.json);
+
+  // Copy property tables.
   property_tables_.resize(src.property_tables_.size());
   for (int i = 0; i < property_tables_.size(); ++i) {
     property_tables_[i] = std::unique_ptr<PropertyTable>(new PropertyTable());
     property_tables_[i]->Copy(*src.property_tables_[i]);
   }
+
+  // Copy property attributes.
+  property_attributes_.resize(src.property_attributes_.size());
+  for (int i = 0; i < property_attributes_.size(); ++i) {
+    property_attributes_[i] =
+        std::unique_ptr<PropertyAttribute>(new PropertyAttribute());
+    property_attributes_[i]->Copy(*src.property_attributes_[i]);
+  }
 }
 
-void StructuralMetadata::SetPropertyTableSchema(
-    const PropertyTable::Schema &schema) {
-  property_table_schema_ = schema;
+void StructuralMetadata::SetSchema(const StructuralMetadataSchema &schema) {
+  schema_ = schema;
 }
 
-const PropertyTable::Schema &StructuralMetadata::GetPropertyTableSchema()
-    const {
-  return property_table_schema_;
+const StructuralMetadataSchema &StructuralMetadata::GetSchema() const {
+  return schema_;
 }
 
 int StructuralMetadata::AddPropertyTable(
@@ -69,6 +93,29 @@ void StructuralMetadata::RemovePropertyTable(int index) {
   property_tables_.erase(property_tables_.begin() + index);
 }
 
+int StructuralMetadata::AddPropertyAttribute(
+    std::unique_ptr<PropertyAttribute> property_attribute) {
+  property_attributes_.push_back(std::move(property_attribute));
+  return property_attributes_.size() - 1;
+}
+
+int StructuralMetadata::NumPropertyAttributes() const {
+  return property_attributes_.size();
+}
+
+const PropertyAttribute &StructuralMetadata::GetPropertyAttribute(
+    int index) const {
+  return *property_attributes_[index];
+}
+
+PropertyAttribute &StructuralMetadata::GetPropertyAttribute(int index) {
+  return *property_attributes_[index];
+}
+
+void StructuralMetadata::RemovePropertyAttribute(int index) {
+  property_attributes_.erase(property_attributes_.begin() + index);
+}
+
 }  // namespace draco
 
 #endif  // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/metadata/structural_metadata.h b/contrib/draco/src/draco/metadata/structural_metadata.h
index 24756c70c..0404370ca 100644
--- a/contrib/draco/src/draco/metadata/structural_metadata.h
+++ b/contrib/draco/src/draco/metadata/structural_metadata.h
@@ -20,17 +20,18 @@
 #ifdef DRACO_TRANSCODER_SUPPORTED
 
 #include <memory>
-#include <string>
 #include <vector>
 
+#include "draco/metadata/property_attribute.h"
 #include "draco/metadata/property_table.h"
+#include "draco/metadata/structural_metadata_schema.h"
 
 namespace draco {
 
 // Holds data associated with EXT_structural_metadata glTF extension.
 class StructuralMetadata {
  public:
-  StructuralMetadata();
+  StructuralMetadata() = default;
 
   // Methods for comparing two structural metadata objects.
   bool operator==(const StructuralMetadata &other) const;
@@ -41,9 +42,9 @@ class StructuralMetadata {
   // Copies |src| structural metadata into this object.
   void Copy(const StructuralMetadata &src);
 
-  // Property table schema.
-  void SetPropertyTableSchema(const PropertyTable::Schema &schema);
-  const PropertyTable::Schema &GetPropertyTableSchema() const;
+  // Schema of the structural metadata.
+  void SetSchema(const StructuralMetadataSchema &schema);
+  const StructuralMetadataSchema &GetSchema() const;
 
   // Property tables.
   int AddPropertyTable(std::unique_ptr<PropertyTable> property_table);
@@ -52,10 +53,23 @@ class StructuralMetadata {
   PropertyTable &GetPropertyTable(int index);
   void RemovePropertyTable(int index);
 
+  // Property attributes.
+  int AddPropertyAttribute(
+      std::unique_ptr<PropertyAttribute> property_attribute);
+  int NumPropertyAttributes() const;
+  const PropertyAttribute &GetPropertyAttribute(int index) const;
+  PropertyAttribute &GetPropertyAttribute(int index);
+  void RemovePropertyAttribute(int index);
+
  private:
-  // Property table schema and property tables.
-  PropertyTable::Schema property_table_schema_;
+  // Schema of the structural metadata.
+  StructuralMetadataSchema schema_;
+
+  // Property tables.
   std::vector<std::unique_ptr<PropertyTable>> property_tables_;
+
+  // Property attributes.
+  std::vector<std::unique_ptr<PropertyAttribute>> property_attributes_;
 };
 
 }  // namespace draco
diff --git a/contrib/draco/src/draco/metadata/structural_metadata_schema.cc b/contrib/draco/src/draco/metadata/structural_metadata_schema.cc
new file mode 100644
index 000000000..c63014e4b
--- /dev/null
+++ b/contrib/draco/src/draco/metadata/structural_metadata_schema.cc
@@ -0,0 +1,158 @@
+// Copyright 2023 The Draco 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 "draco/metadata/structural_metadata_schema.h"
+
+#include <string>
+#include <vector>
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+
+namespace draco {
+
+StructuralMetadataSchema::Object::Object() : Object("") {}
+
+StructuralMetadataSchema::Object::Object(const std::string &name)
+    : name_(name), type_(OBJECT), integer_(0), boolean_(false) {}
+
+StructuralMetadataSchema::Object::Object(const std::string &name,
+                                         const std::string &value)
+    : Object(name) {
+  SetString(value);
+}
+
+StructuralMetadataSchema::Object::Object(const std::string &name,
+                                         const char *value)
+    : Object(name) {
+  SetString(value);
+}
+
+StructuralMetadataSchema::Object::Object(const std::string &name, int value)
+    : Object(name) {
+  SetInteger(value);
+}
+
+StructuralMetadataSchema::Object::Object(const std::string &name, bool value)
+    : Object(name) {
+  SetBoolean(value);
+}
+
+bool StructuralMetadataSchema::Object::operator==(const Object &other) const {
+  if (type_ != other.type_ || name_ != other.name_) {
+    return false;
+  }
+  switch (type_) {
+    case OBJECT:
+      if (objects_.size() != other.objects_.size()) {
+        return false;
+      }
+      for (int i = 0; i < objects_.size(); ++i) {
+        if (objects_[i] != other.objects_[i]) {
+          return false;
+        }
+      }
+      break;
+    case ARRAY:
+      if (array_.size() != other.array_.size()) {
+        return false;
+      }
+      for (int i = 0; i < array_.size(); ++i) {
+        if (array_[i] != other.array_[i]) {
+          return false;
+        }
+      }
+      break;
+    case STRING:
+      return string_ == other.string_;
+    case INTEGER:
+      return integer_ == other.integer_;
+    case BOOLEAN:
+      return boolean_ == other.boolean_;
+  }
+  return true;
+}
+
+bool StructuralMetadataSchema::Object::operator!=(const Object &other) const {
+  return !(*this == other);
+}
+
+void StructuralMetadataSchema::Object::Copy(const Object &src) {
+  name_ = src.name_;
+  type_ = src.type_;
+  objects_.reserve(src.objects_.size());
+  for (const Object &obj : src.objects_) {
+    objects_.emplace_back();
+    objects_.back().Copy(obj);
+  }
+  array_.reserve(src.array_.size());
+  for (const Object &obj : src.array_) {
+    array_.emplace_back();
+    array_.back().Copy(obj);
+  }
+  string_ = src.string_;
+  integer_ = src.integer_;
+  boolean_ = src.boolean_;
+}
+
+const StructuralMetadataSchema::Object *
+StructuralMetadataSchema::Object::GetObjectByName(
+    const std::string &name) const {
+  for (const Object &obj : objects_) {
+    if (obj.GetName() == name) {
+      return &obj;
+    }
+  }
+  return nullptr;
+}
+
+std::vector<StructuralMetadataSchema::Object> &
+StructuralMetadataSchema::Object::SetObjects() {
+  type_ = OBJECT;
+  return objects_;
+}
+
+std::vector<StructuralMetadataSchema::Object> &
+StructuralMetadataSchema::Object::SetArray() {
+  type_ = ARRAY;
+  return array_;
+}
+
+void StructuralMetadataSchema::Object::SetString(const std::string &value) {
+  type_ = STRING;
+  string_ = value;
+}
+
+void StructuralMetadataSchema::Object::SetInteger(int value) {
+  type_ = INTEGER;
+  integer_ = value;
+}
+
+void StructuralMetadataSchema::Object::SetBoolean(bool value) {
+  type_ = BOOLEAN;
+  boolean_ = value;
+}
+
+bool StructuralMetadataSchema::operator==(
+    const StructuralMetadataSchema &other) const {
+  return json == other.json;
+}
+
+bool StructuralMetadataSchema::operator!=(
+    const StructuralMetadataSchema &other) const {
+  return !(*this == other);
+}
+
+}  // namespace draco
+
+#endif  // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/metadata/structural_metadata_schema.h b/contrib/draco/src/draco/metadata/structural_metadata_schema.h
new file mode 100644
index 000000000..dbca08ccb
--- /dev/null
+++ b/contrib/draco/src/draco/metadata/structural_metadata_schema.h
@@ -0,0 +1,118 @@
+// Copyright 2023 The Draco 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 DRACO_METADATA_SCHEMA_H_
+#define DRACO_METADATA_SCHEMA_H_
+
+#include "draco/draco_features.h"
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+
+#include <cstdint>
+#include <cstring>
+#include <limits>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "draco/core/status_or.h"
+
+namespace draco {
+
+// Defines schema that describes the structure of the metadata as defined in the
+// EXT_structural_metadata glTF extension, in the form of a JSON object.
+struct StructuralMetadataSchema {
+  // JSON object of the schema.
+  // TODO(vytyaz): Consider using a third_party/json library. Currently there
+  // is a conflict between Filament's assert_invariant() macro and JSON
+  // library's assert_invariant() method that causes compile errors in Draco
+  // visualization library.
+  class Object {
+   public:
+    enum Type { OBJECT, ARRAY, STRING, INTEGER, BOOLEAN };
+
+    // Constructors.
+    Object();
+    explicit Object(const std::string &name);
+    Object(const std::string &name, const std::string &value);
+    Object(const std::string &name, const char *value);
+    Object(const std::string &name, int value);
+    Object(const std::string &name, bool value);
+
+    // Methods for comparing two objects.
+    bool operator==(const Object &other) const;
+    bool operator!=(const Object &other) const;
+
+    // Method for copying the object.
+    void Copy(const Object &src);
+
+    // Methods for getting object name and type.
+    const std::string &GetName() const { return name_; }
+    Type GetType() const { return type_; }
+
+    // Methods for getting object value.
+    const std::vector<Object> &GetObjects() const { return objects_; }
+    const std::vector<Object> &GetArray() const { return array_; }
+    const std::string &GetString() const { return string_; }
+    int GetInteger() const { return integer_; }
+    bool GetBoolean() const { return boolean_; }
+
+    // Looks for a child object matching the given |name|. If no object is
+    // found, returns nullptr.
+    //
+    // Note that this is not recursive. I.e., for the following object:
+    //
+    // { "level1": { "level2": "value" } }
+    //
+    // GetObjectByName("level1") will return '{ "level2": "value" }', but
+    // GetObjectByName("level2") will return nullptr. Instead, the user should
+    // use GetObjectByName("level1")->GetObjectByName("level2") to get the
+    // nested child. Note that this follows the typical JSON semantics.
+    const Object *GetObjectByName(const std::string &name) const;
+
+    // Methods for setting object value.
+    std::vector<Object> &SetObjects();
+    std::vector<Object> &SetArray();
+    void SetString(const std::string &value);
+    void SetInteger(int value);
+    void SetBoolean(bool value);
+
+   private:
+    std::string name_;
+    Type type_;
+    std::vector<Object> objects_;
+    std::vector<Object> array_;
+    std::string string_;
+    int integer_;
+    bool boolean_;
+  };
+
+  // Valid schema top-level JSON object name is "schema".
+  StructuralMetadataSchema() : json("schema") {}
+
+  // Methods for comparing two schemas.
+  bool operator==(const StructuralMetadataSchema &other) const;
+  bool operator!=(const StructuralMetadataSchema &other) const;
+
+  // Valid schema top-level JSON object is required to have child objects.
+  bool Empty() const { return json.GetObjects().empty(); }
+
+  // Top-level JSON object of the schema.
+  Object json;
+};
+
+}  // namespace draco
+
+#endif  // DRACO_TRANSCODER_SUPPORTED
+#endif  // DRACO_METADATA_SCHEMA_H_
diff --git a/contrib/draco/src/draco/metadata/structural_metadata_schema_test.cc b/contrib/draco/src/draco/metadata/structural_metadata_schema_test.cc
new file mode 100644
index 000000000..79d520d7d
--- /dev/null
+++ b/contrib/draco/src/draco/metadata/structural_metadata_schema_test.cc
@@ -0,0 +1,323 @@
+// Copyright 2023 The Draco 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 "draco/metadata/structural_metadata_schema.h"
+
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "draco/core/draco_test_utils.h"
+
+namespace {
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+
+TEST(StructuralMetadataSchemaTest, TestSchemaDefaults) {
+  // Test construction of an empty schema.
+  draco::StructuralMetadataSchema schema;
+  ASSERT_TRUE(schema.Empty());
+  ASSERT_EQ(schema.json.GetName(), "schema");
+  ASSERT_EQ(schema.json.GetType(),
+            draco::StructuralMetadataSchema::Object::OBJECT);
+  ASSERT_TRUE(schema.json.GetObjects().empty());
+  ASSERT_TRUE(schema.json.GetArray().empty());
+  ASSERT_TRUE(schema.json.GetString().empty());
+  ASSERT_EQ(schema.json.GetInteger(), 0);
+  ASSERT_FALSE(schema.json.GetBoolean());
+}
+
+TEST(StructuralMetadataSchemaTest, TestSchemaObjectDefaultConstructor) {
+  // Test construction of an empty schema object.
+  draco::StructuralMetadataSchema::Object object;
+  ASSERT_TRUE(object.GetName().empty());
+  ASSERT_EQ(object.GetType(), draco::StructuralMetadataSchema::Object::OBJECT);
+  ASSERT_TRUE(object.GetObjects().empty());
+  ASSERT_TRUE(object.GetArray().empty());
+  ASSERT_TRUE(object.GetString().empty());
+  ASSERT_EQ(object.GetInteger(), 0);
+  ASSERT_FALSE(object.GetBoolean());
+}
+
+TEST(StructuralMetadataSchemaTest, TestSchemaObjectNamedConstructor) {
+  // Test construction of a named schema object.
+  draco::StructuralMetadataSchema::Object object("Flexible Demeanour");
+  ASSERT_EQ(object.GetName(), "Flexible Demeanour");
+  ASSERT_EQ(object.GetType(), draco::StructuralMetadataSchema::Object::OBJECT);
+  ASSERT_TRUE(object.GetObjects().empty());
+}
+
+TEST(StructuralMetadataSchemaTest, TestSchemaObjectStringConstructor) {
+  // Test construction of schema object storing a string.
+  draco::StructuralMetadataSchema::Object object("Flexible Demeanour", "GCU");
+  ASSERT_EQ(object.GetName(), "Flexible Demeanour");
+  ASSERT_EQ(object.GetType(), draco::StructuralMetadataSchema::Object::STRING);
+  ASSERT_EQ(object.GetString(), "GCU");
+}
+
+TEST(StructuralMetadataSchemaTest, TestSchemaObjectIntegerConstructor) {
+  // Test construction of schema object storing an integer.
+  draco::StructuralMetadataSchema::Object object("Flexible Demeanour", 12);
+  ASSERT_EQ(object.GetName(), "Flexible Demeanour");
+  ASSERT_EQ(object.GetType(), draco::StructuralMetadataSchema::Object::INTEGER);
+  ASSERT_EQ(object.GetInteger(), 12);
+}
+
+TEST(StructuralMetadataSchemaTest, TestSchemaObjectBooleanConstructor) {
+  // Test construction of schema object storing a boolean.
+  draco::StructuralMetadataSchema::Object object("Flexible Demeanour", true);
+  ASSERT_EQ(object.GetName(), "Flexible Demeanour");
+  ASSERT_EQ(object.GetType(), draco::StructuralMetadataSchema::Object::BOOLEAN);
+  ASSERT_TRUE(object.GetBoolean());
+}
+
+TEST(StructuralMetadataSchemaTest, TestSchemaObjectSettersAndGetters) {
+  // Test value setters and getters of schema object.
+  typedef draco::StructuralMetadataSchema::Object Object;
+  Object object;
+  ASSERT_EQ(object.GetType(), Object::OBJECT);
+
+  object.SetArray().push_back(Object("entry", 12));
+  ASSERT_EQ(object.GetType(), Object::ARRAY);
+  ASSERT_EQ(object.GetArray().size(), 1);
+  ASSERT_EQ(object.GetArray()[0].GetName(), "entry");
+  ASSERT_EQ(object.GetArray()[0].GetInteger(), 12);
+
+  object.SetObjects().push_back(Object("object", 9));
+  ASSERT_EQ(object.GetType(), Object::OBJECT);
+  ASSERT_EQ(object.GetObjects().size(), 1);
+  ASSERT_EQ(object.GetObjects()[0].GetName(), "object");
+  ASSERT_EQ(object.GetObjects()[0].GetInteger(), 9);
+
+  object.SetString("matter");
+  ASSERT_EQ(object.GetType(), Object::STRING);
+  ASSERT_EQ(object.GetString(), "matter");
+
+  object.SetInteger(5);
+  ASSERT_EQ(object.GetType(), Object::INTEGER);
+  ASSERT_EQ(object.GetInteger(), 5);
+
+  object.SetBoolean(true);
+  ASSERT_EQ(object.GetType(), Object::BOOLEAN);
+  ASSERT_EQ(object.GetBoolean(), true);
+}
+
+TEST(StructuralMetadataSchemaTest, TestSchemaObjectLookupByName) {
+  // Test the GetObjectByName() getter.
+  typedef draco::StructuralMetadataSchema::Object Object;
+  Object object;
+  ASSERT_EQ(object.GetType(), Object::OBJECT);
+
+  auto &objects = object.SetObjects();
+
+  objects.push_back(Object("object1", 1));
+  objects.push_back(Object("object2", "two"));
+
+  Object object3("object3");
+  object3.SetObjects().push_back(Object("child_object", "child"));
+  objects.push_back(object3);
+
+  ASSERT_EQ(object.GetObjectByName("child_object"), nullptr);
+
+  ASSERT_NE(object.GetObjectByName("object1"), nullptr);
+  ASSERT_EQ(object.GetObjectByName("object1")->GetInteger(), 1);
+
+  ASSERT_NE(object.GetObjectByName("object2"), nullptr);
+  ASSERT_EQ(object.GetObjectByName("object2")->GetString(), "two");
+
+  ASSERT_NE(object.GetObjectByName("object3"), nullptr);
+  ASSERT_NE(object.GetObjectByName("object3")->GetObjectByName("child_object"),
+            nullptr);
+  ASSERT_EQ(object.GetObjectByName("object3")
+                ->GetObjectByName("child_object")
+                ->GetString(),
+            "child");
+}
+
+TEST(StructuralMetadataSchemaTest, TestSchemaCompare) {
+  typedef draco::StructuralMetadataSchema Schema;
+  // Test comparison of two schema objects.
+  {
+    // Compare the same empty schema object.
+    Schema a;
+    ASSERT_TRUE(a == a);
+    ASSERT_FALSE(a != a);
+  }
+  {
+    // Compare two empty schema objects.
+    Schema a;
+    Schema b;
+    ASSERT_TRUE(a == b);
+    ASSERT_FALSE(a != b);
+  }
+  {
+    // Compare two schema objects with different JSON objects.
+    Schema a;
+    Schema b;
+    a.json.SetBoolean(true);
+    b.json.SetBoolean(false);
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+}
+
+TEST(StructuralMetadataSchemaTest, TestSchemaObjectCompare) {
+  // Test comparison of two schema JSON objects.
+  typedef draco::StructuralMetadataSchema::Object Object;
+  {
+    // Compare the same object.
+    Object a;
+    ASSERT_TRUE(a == a);
+    ASSERT_FALSE(a != a);
+  }
+  {
+    // Compare two default objects.
+    Object a;
+    Object b;
+    ASSERT_TRUE(a == b);
+    ASSERT_FALSE(a != b);
+  }
+  {
+    // Compare two objects with different names.
+    Object a("one");
+    Object b("two");
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+  {
+    // Compare two objects with different types.
+    Object a;
+    Object b;
+    a.SetInteger(1);
+    b.SetString("one");
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+  {
+    // Compare two identical string-type objects.
+    Object a;
+    Object b;
+    a.SetString("one");
+    b.SetString("one");
+    ASSERT_TRUE(a == b);
+    ASSERT_FALSE(a != b);
+  }
+  {
+    // Compare two different string-type objects.
+    Object a;
+    Object b;
+    a.SetString("one");
+    b.SetString("two");
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+  {
+    // Compare two identical integer-type objects.
+    Object a;
+    Object b;
+    a.SetInteger(1);
+    b.SetInteger(1);
+    ASSERT_TRUE(a == b);
+    ASSERT_FALSE(a != b);
+  }
+  {
+    // Compare two different integer-type objects.
+    Object a;
+    Object b;
+    a.SetInteger(1);
+    b.SetInteger(2);
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+  {
+    // Compare two identical boolean-type objects.
+    Object a;
+    Object b;
+    a.SetBoolean(true);
+    b.SetBoolean(true);
+    ASSERT_TRUE(a == b);
+    ASSERT_FALSE(a != b);
+  }
+  {
+    // Compare two different boolean-type objects.
+    Object a;
+    Object b;
+    a.SetBoolean(true);
+    b.SetBoolean(false);
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+  {
+    // Compare two identical object-type objects.
+    Object a;
+    Object b;
+    a.SetObjects().emplace_back("one");
+    b.SetObjects().emplace_back("one");
+    ASSERT_TRUE(a == b);
+    ASSERT_FALSE(a != b);
+  }
+  {
+    // Compare two different object-type objects.
+    Object a;
+    Object b;
+    a.SetObjects().emplace_back("one");
+    b.SetObjects().emplace_back("two");
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+  {
+    // Compare two object-type objects with different counts.
+    Object a;
+    Object b;
+    a.SetObjects().emplace_back("one");
+    b.SetObjects().emplace_back("one");
+    b.SetObjects().emplace_back("two");
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+  {
+    // Compare two identical array-type objects.
+    Object a;
+    Object b;
+    a.SetArray().emplace_back("", 1);
+    b.SetArray().emplace_back("", 1);
+    ASSERT_TRUE(a == b);
+    ASSERT_FALSE(a != b);
+  }
+  {
+    // Compare two different array-type objects.
+    Object a;
+    Object b;
+    a.SetArray().emplace_back("", 1);
+    b.SetArray().emplace_back("", 2);
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+  {
+    // Compare two array-type objects with different counts.
+    Object a;
+    Object b;
+    a.SetArray().emplace_back("", 1);
+    b.SetArray().emplace_back("", 1);
+    b.SetArray().emplace_back("", 2);
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
+}
+
+#endif  // DRACO_TRANSCODER_SUPPORTED
+
+}  // namespace
diff --git a/contrib/draco/src/draco/metadata/structural_metadata_test.cc b/contrib/draco/src/draco/metadata/structural_metadata_test.cc
index d0429a568..8db1c007d 100644
--- a/contrib/draco/src/draco/metadata/structural_metadata_test.cc
+++ b/contrib/draco/src/draco/metadata/structural_metadata_test.cc
@@ -16,7 +16,6 @@
 
 #include <memory>
 #include <utility>
-#include <vector>
 
 #include "draco/core/draco_test_base.h"
 #include "draco/core/draco_test_utils.h"
@@ -30,9 +29,9 @@ TEST(StructuralMetadataTest, TestCopy) {
   draco::StructuralMetadata structural_metadata;
 
   // Add property table schema to structural metadata.
-  draco::PropertyTable::Schema schema;
+  draco::StructuralMetadataSchema schema;
   schema.json.SetString("Culture");
-  structural_metadata.SetPropertyTableSchema(schema);
+  structural_metadata.SetSchema(schema);
 
   // Add property table to structural metadata.
   std::unique_ptr<draco::PropertyTable> table(new draco::PropertyTable());
@@ -58,7 +57,7 @@ TEST(StructuralMetadataTest, TestCopy) {
   copy.Copy(structural_metadata);
 
   // Check that the structural metadata property table schema has been copied.
-  ASSERT_EQ(copy.GetPropertyTableSchema().json.GetString(), "Culture");
+  ASSERT_EQ(copy.GetSchema().json.GetString(), "Culture");
 
   // Check that the structural metadata property table has been copied.
   ASSERT_EQ(copy.NumPropertyTables(), 1);
@@ -114,6 +113,7 @@ TEST(StructuralMetadataTest, TestPropertyTables) {
 TEST(StructuralMetadataTest, TestCompare) {
   // Test comparison of two structural metadata objects.
   typedef draco::PropertyTable PropertyTable;
+  typedef draco::PropertyAttribute PropertyAttribute;
   {
     // Compare the same structural metadata object.
     draco::StructuralMetadata a;
@@ -131,17 +131,17 @@ TEST(StructuralMetadataTest, TestCompare) {
     // Compare two structural metadata objects with different schemas.
     draco::StructuralMetadata a;
     draco::StructuralMetadata b;
-    PropertyTable::Schema s1;
-    PropertyTable::Schema s2;
+    draco::StructuralMetadataSchema s1;
+    draco::StructuralMetadataSchema s2;
     s1.json.SetString("one");
     s2.json.SetString("two");
-    a.SetPropertyTableSchema(s1);
-    b.SetPropertyTableSchema(s2);
+    a.SetSchema(s1);
+    b.SetSchema(s2);
     ASSERT_FALSE(a == b);
     ASSERT_TRUE(a != b);
   }
   {
-    // Compare two objects with different number of proeprty tables.
+    // Compare two objects with different number of property tables.
     draco::StructuralMetadata a;
     draco::StructuralMetadata b;
     a.AddPropertyTable(std::unique_ptr<PropertyTable>(new PropertyTable()));
@@ -151,7 +151,20 @@ TEST(StructuralMetadataTest, TestCompare) {
     ASSERT_TRUE(a != b);
   }
   {
-    // Compare two objects with different proeprty tables.
+    // Compare two objects with identical property tables.
+    draco::StructuralMetadata a;
+    draco::StructuralMetadata b;
+    auto p1 = std::unique_ptr<PropertyTable>(new PropertyTable());
+    auto p2 = std::unique_ptr<PropertyTable>(new PropertyTable());
+    p1->SetName("one");
+    p2->SetName("one");
+    a.AddPropertyTable(std::move(p1));
+    b.AddPropertyTable(std::move(p2));
+    ASSERT_TRUE(a == b);
+    ASSERT_FALSE(a != b);
+  }
+  {
+    // Compare two objects with different property tables.
     draco::StructuralMetadata a;
     draco::StructuralMetadata b;
     auto p1 = std::unique_ptr<PropertyTable>(new PropertyTable());
@@ -163,6 +176,32 @@ TEST(StructuralMetadataTest, TestCompare) {
     ASSERT_FALSE(a == b);
     ASSERT_TRUE(a != b);
   }
+  {
+    // Compare two objects with identical property attributes.
+    draco::StructuralMetadata a;
+    draco::StructuralMetadata b;
+    auto p1 = std::unique_ptr<PropertyAttribute>(new PropertyAttribute());
+    auto p2 = std::unique_ptr<PropertyAttribute>(new PropertyAttribute());
+    p1->SetName("one");
+    p2->SetName("one");
+    a.AddPropertyAttribute(std::move(p1));
+    b.AddPropertyAttribute(std::move(p2));
+    ASSERT_TRUE(a == b);
+    ASSERT_FALSE(a != b);
+  }
+  {
+    // Compare two objects with identical property attributes.
+    draco::StructuralMetadata a;
+    draco::StructuralMetadata b;
+    auto p1 = std::unique_ptr<PropertyAttribute>(new PropertyAttribute());
+    auto p2 = std::unique_ptr<PropertyAttribute>(new PropertyAttribute());
+    p1->SetName("one");
+    p2->SetName("two");
+    a.AddPropertyAttribute(std::move(p1));
+    b.AddPropertyAttribute(std::move(p2));
+    ASSERT_FALSE(a == b);
+    ASSERT_TRUE(a != b);
+  }
 }
 
 #endif  // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/point_cloud/point_cloud.cc b/contrib/draco/src/draco/point_cloud/point_cloud.cc
index 039c4f201..6e5b732fd 100644
--- a/contrib/draco/src/draco/point_cloud/point_cloud.cc
+++ b/contrib/draco/src/draco/point_cloud/point_cloud.cc
@@ -37,6 +37,8 @@ void PointCloud::Copy(const PointCloud &src) {
     attributes_[i] = std::unique_ptr<PointAttribute>(new PointAttribute());
     attributes_[i]->CopyFrom(*src.attributes_[i]);
   }
+  compression_enabled_ = src.compression_enabled_;
+  compression_options_ = src.compression_options_;
   CopyMetadata(src);
 }
 
@@ -106,6 +108,20 @@ const PointAttribute *PointCloud::GetAttributeByUniqueId(
   return attributes_[att_id].get();
 }
 
+#ifdef DRACO_TRANSCODER_SUPPORTED
+const PointAttribute *PointCloud::GetNamedAttributeByName(
+    GeometryAttribute::Type type, const std::string &name) const {
+  const auto &index = named_attribute_index_;
+  for (size_t i = 0; i < index[type].size(); ++i) {
+    const PointAttribute *const att = attributes_[index[type][i]].get();
+    if (att->name() == name) {
+      return att;
+    }
+  }
+  return nullptr;
+}
+#endif  // DRACO_TRANSCODER_SUPPORTED
+
 int32_t PointCloud::GetAttributeIdByUniqueId(uint32_t unique_id) const {
   for (size_t att_id = 0; att_id < attributes_.size(); ++att_id) {
     if (attributes_[att_id]->unique_id() == unique_id) {
diff --git a/contrib/draco/src/draco/point_cloud/point_cloud.h b/contrib/draco/src/draco/point_cloud/point_cloud.h
index 17d0bc392..2bbfc32c1 100644
--- a/contrib/draco/src/draco/point_cloud/point_cloud.h
+++ b/contrib/draco/src/draco/point_cloud/point_cloud.h
@@ -21,6 +21,10 @@
 #include "draco/draco_features.h"
 #include "draco/metadata/geometry_metadata.h"
 
+#ifdef DRACO_TRANSCODER_SUPPORTED
+#include "draco/compression/draco_compression_options.h"
+#endif
+
 namespace draco {
 
 // PointCloud is a collection of n-dimensional points that are described by a
@@ -62,6 +66,12 @@ class PointCloud {
   const PointAttribute *GetAttributeByUniqueId(uint32_t id) const;
   int32_t GetAttributeIdByUniqueId(uint32_t unique_id) const;
 
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  // Returns the named attribute with a given name.
+  const PointAttribute *GetNamedAttributeByName(GeometryAttribute::Type type,
+                                                const std::string &name) const;
+#endif  // DRACO_TRANSCODER_SUPPORTED
+
   int32_t num_attributes() const {
     return static_cast<int32_t>(attributes_.size());
   }
@@ -189,6 +199,24 @@ class PointCloud {
   // cloud.
   void set_num_points(PointIndex::ValueType num) { num_points_ = num; }
 
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  // Enables or disables Draco geometry compression for this mesh.
+  void SetCompressionEnabled(bool enabled) { compression_enabled_ = enabled; }
+  bool IsCompressionEnabled() const { return compression_enabled_; }
+
+  // Sets |options| that configure Draco geometry compression. This does not
+  // enable or disable compression.
+  void SetCompressionOptions(const DracoCompressionOptions &options) {
+    compression_options_ = options;
+  }
+  const DracoCompressionOptions &GetCompressionOptions() const {
+    return compression_options_;
+  }
+  DracoCompressionOptions &GetCompressionOptions() {
+    return compression_options_;
+  }
+#endif  // DRACO_TRANSCODER_SUPPORTED
+
  protected:
 #ifdef DRACO_TRANSCODER_SUPPORTED
   // Copies metadata from the |src| point cloud.
@@ -217,6 +245,13 @@ class PointCloud {
   // in corresponding PointAttribute instances in the |attributes_| array.
   PointIndex::ValueType num_points_;
 
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  // Compression options for this geometry.
+  // TODO(vytyaz): Store encoded bitstream that this geometry compresses into.
+  bool compression_enabled_ = false;
+  DracoCompressionOptions compression_options_;
+#endif  // DRACO_TRANSCODER_SUPPORTED
+
   friend struct PointCloudHasher;
 };
 
diff --git a/contrib/draco/src/draco/point_cloud/point_cloud_builder.cc b/contrib/draco/src/draco/point_cloud/point_cloud_builder.cc
index 90ec37962..51031e5e9 100644
--- a/contrib/draco/src/draco/point_cloud/point_cloud_builder.cc
+++ b/contrib/draco/src/draco/point_cloud/point_cloud_builder.cc
@@ -14,6 +14,7 @@
 //
 #include "draco/point_cloud/point_cloud_builder.h"
 
+#include <string>
 #include <utility>
 
 namespace draco {
@@ -27,8 +28,14 @@ void PointCloudBuilder::Start(PointIndex::ValueType num_points) {
 
 int PointCloudBuilder::AddAttribute(GeometryAttribute::Type attribute_type,
                                     int8_t num_components, DataType data_type) {
+  return AddAttribute(attribute_type, num_components, data_type, false);
+}
+
+int PointCloudBuilder::AddAttribute(GeometryAttribute::Type attribute_type,
+                                    int8_t num_components, DataType data_type,
+                                    bool normalized) {
   GeometryAttribute ga;
-  ga.Init(attribute_type, nullptr, num_components, data_type, false,
+  ga.Init(attribute_type, nullptr, num_components, data_type, normalized,
           DataTypeLength(data_type) * num_components, 0);
   return point_cloud_->AddAttribute(ga, true, point_cloud_->num_points());
 }
@@ -75,4 +82,14 @@ std::unique_ptr<PointCloud> PointCloudBuilder::Finalize(
   return std::move(point_cloud_);
 }
 
+void PointCloudBuilder::SetAttributeUniqueId(int att_id, uint32_t unique_id) {
+  point_cloud_->attribute(att_id)->set_unique_id(unique_id);
+}
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+void PointCloudBuilder::SetAttributeName(int att_id, const std::string &name) {
+  point_cloud_->attribute(att_id)->set_name(name);
+}
+#endif  // DRACO_TRANSCODER_SUPPORTED
+
 }  // namespace draco
diff --git a/contrib/draco/src/draco/point_cloud/point_cloud_builder.h b/contrib/draco/src/draco/point_cloud/point_cloud_builder.h
index 512b0f71f..e6c57f865 100644
--- a/contrib/draco/src/draco/point_cloud/point_cloud_builder.h
+++ b/contrib/draco/src/draco/point_cloud/point_cloud_builder.h
@@ -50,6 +50,8 @@ class PointCloudBuilder {
 
   int AddAttribute(GeometryAttribute::Type attribute_type,
                    int8_t num_components, DataType data_type);
+  int AddAttribute(GeometryAttribute::Type attribute_type,
+                   int8_t num_components, DataType data_type, bool normalized);
 
   // Sets attribute value for a specific point.
   // |attribute_value| must contain data in the format specified by the
@@ -65,6 +67,14 @@ class PointCloudBuilder {
   void SetAttributeValuesForAllPoints(int att_id, const void *attribute_values,
                                       int stride);
 
+  // Sets the unique ID for an attribute created with AddAttribute().
+  void SetAttributeUniqueId(int att_id, uint32_t unique_id);
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  // Sets attribute name.
+  void SetAttributeName(int att_id, const std::string &name);
+#endif  // DRACO_TRANSCODER_SUPPORTED
+
   // Finalizes the PointCloud or returns nullptr on error.
   // If |deduplicate_points| is set to true, the following happens:
   //   1. Attribute values with duplicate entries are deduplicated.
diff --git a/contrib/draco/src/draco/point_cloud/point_cloud_builder_test.cc b/contrib/draco/src/draco/point_cloud/point_cloud_builder_test.cc
index 3222a4c8d..3d1edf3fc 100644
--- a/contrib/draco/src/draco/point_cloud/point_cloud_builder_test.cc
+++ b/contrib/draco/src/draco/point_cloud/point_cloud_builder_test.cc
@@ -60,9 +60,15 @@ TEST_F(PointCloudBuilderTest, IndividualTest_NoDedup) {
     builder.SetAttributeValueForPoint(intensity_att_id, i,
                                       intensity_data_.data() + i.value());
   }
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  builder.SetAttributeName(pos_att_id, "Bob");
+#endif
   std::unique_ptr<PointCloud> res = builder.Finalize(false);
   ASSERT_TRUE(res != nullptr);
   ASSERT_EQ(res->num_points(), 10);
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  EXPECT_EQ(res->attribute(pos_att_id)->name(), "Bob");
+#endif
 }
 
 TEST_F(PointCloudBuilderTest, IndividualTest_Dedup) {
@@ -168,4 +174,25 @@ TEST_F(PointCloudBuilderTest, MultiUse) {
   }
 }
 
+TEST_F(PointCloudBuilderTest, PropagatesAttributeUniqueIds) {
+  // This test verifies that PointCloudBuilder correctly applies unique IDs to
+  // attributes.
+  PointCloudBuilder builder;
+  builder.Start(10);
+  const int pos_att_id =
+      builder.AddAttribute(GeometryAttribute::POSITION, 3, DT_FLOAT32);
+  const int intensity_att_id =
+      builder.AddAttribute(GeometryAttribute::GENERIC, 1, DT_INT16);
+  for (PointIndex i(0); i < 10; ++i) {
+    builder.SetAttributeValueForPoint(pos_att_id, i,
+                                      pos_data_.data() + 3 * i.value());
+    builder.SetAttributeValueForPoint(intensity_att_id, i,
+                                      intensity_data_.data() + i.value());
+  }
+  builder.SetAttributeUniqueId(pos_att_id, 1234);
+  std::unique_ptr<PointCloud> res = builder.Finalize(false);
+  ASSERT_TRUE(res != nullptr);
+  ASSERT_EQ(res->GetAttributeByUniqueId(1234), res->attribute(pos_att_id));
+}
+
 }  // namespace draco
diff --git a/contrib/draco/src/draco/point_cloud/point_cloud_test.cc b/contrib/draco/src/draco/point_cloud/point_cloud_test.cc
index 1cd780db2..e83b35ea1 100644
--- a/contrib/draco/src/draco/point_cloud/point_cloud_test.cc
+++ b/contrib/draco/src/draco/point_cloud/point_cloud_test.cc
@@ -77,6 +77,71 @@ TEST_F(PointCloudTest, PointCloudCopy) {
   ASSERT_TRUE(att_metadata_copy->GetEntryInt("attribute_test", &att_test));
   ASSERT_EQ(att_test, 3);
 }
+
+TEST_F(PointCloudTest, TestCompressionSettings) {
+  // Tests compression settings of a point cloud.
+  draco::PointCloud pc;
+
+  // Check that compression is disabled and compression settings are default.
+  ASSERT_FALSE(pc.IsCompressionEnabled());
+  const draco::DracoCompressionOptions default_compression_options;
+  ASSERT_EQ(pc.GetCompressionOptions(), default_compression_options);
+
+  // Check that compression options can be set without enabling compression.
+  draco::DracoCompressionOptions compression_options;
+  compression_options.quantization_bits_normal = 12;
+  pc.SetCompressionOptions(compression_options);
+  ASSERT_EQ(pc.GetCompressionOptions(), compression_options);
+  ASSERT_FALSE(pc.IsCompressionEnabled());
+
+  // Check that compression can be enabled.
+  pc.SetCompressionEnabled(true);
+  ASSERT_TRUE(pc.IsCompressionEnabled());
+
+  // Check that individual compression options can be updated.
+  pc.GetCompressionOptions().compression_level++;
+  pc.GetCompressionOptions().compression_level--;
+
+  // Check that compression settings can be copied.
+  draco::PointCloud pc_copy;
+  pc_copy.Copy(pc);
+  ASSERT_TRUE(pc_copy.IsCompressionEnabled());
+  ASSERT_EQ(pc_copy.GetCompressionOptions(), compression_options);
+}
+
+TEST_F(PointCloudTest, TestGetNamedAttributeByName) {
+  draco::PointCloud pc;
+  // Test whether we can get named attributes by name.
+  constexpr auto kPosition = draco::GeometryAttribute::POSITION;
+  constexpr auto kGeneric = draco::GeometryAttribute::GENERIC;
+  draco::GeometryAttribute pos_att;
+  draco::GeometryAttribute gen_att0;
+  draco::GeometryAttribute gen_att1;
+  pos_att.Init(kPosition, nullptr, 3, draco::DT_FLOAT32, false, 12, 0);
+  gen_att0.Init(kGeneric, nullptr, 3, draco::DT_FLOAT32, false, 12, 0);
+  gen_att1.Init(kGeneric, nullptr, 3, draco::DT_FLOAT32, false, 12, 0);
+  pos_att.set_name("Zero");
+  gen_att0.set_name("Zero");
+  gen_att1.set_name("One");
+
+  // Add one position, and two generic attributes.
+  pc.AddAttribute(pos_att, false, 0);
+  pc.AddAttribute(gen_att0, false, 0);
+  pc.AddAttribute(gen_att1, false, 0);
+
+  // Check added attributes.
+  ASSERT_EQ(pc.attribute(0)->attribute_type(), kPosition);
+  ASSERT_EQ(pc.attribute(1)->attribute_type(), kGeneric);
+  ASSERT_EQ(pc.attribute(2)->attribute_type(), kGeneric);
+  ASSERT_EQ(pc.attribute(0)->name(), "Zero");
+  ASSERT_EQ(pc.attribute(1)->name(), "Zero");
+  ASSERT_EQ(pc.attribute(2)->name(), "One");
+
+  // Check that we can get correct attributes by name.
+  ASSERT_EQ(pc.GetNamedAttributeByName(kPosition, "Zero"), pc.attribute(0));
+  ASSERT_EQ(pc.GetNamedAttributeByName(kGeneric, "Zero"), pc.attribute(1));
+  ASSERT_EQ(pc.GetNamedAttributeByName(kGeneric, "One"), pc.attribute(2));
+}
 #endif
 
 TEST_F(PointCloudTest, TestAttributeDeletion) {
diff --git a/contrib/draco/src/draco/scene/scene.cc b/contrib/draco/src/draco/scene/scene.cc
index 9ad574835..3162f086a 100644
--- a/contrib/draco/src/draco/scene/scene.cc
+++ b/contrib/draco/src/draco/scene/scene.cc
@@ -14,6 +14,7 @@
 //
 #include "draco/scene/scene.h"
 
+#include <memory>
 #include <utility>
 
 #ifdef DRACO_TRANSCODER_SUPPORTED
@@ -22,6 +23,8 @@
 
 namespace draco {
 
+Scene::Scene() { metadata_.reset(new Metadata()); }
+
 void Scene::Copy(const Scene &s) {
   meshes_.resize(s.meshes_.size());
   for (MeshIndex i(0); i < meshes_.size(); ++i) {
@@ -90,6 +93,9 @@ void Scene::Copy(const Scene &s) {
 
   // Copy structural metadata.
   structural_metadata_.Copy(s.structural_metadata_);
+
+  // Copy general metadata.
+  metadata_.reset(new Metadata(*s.metadata_));
 }
 
 Status Scene::RemoveMesh(MeshIndex index) {
diff --git a/contrib/draco/src/draco/scene/scene.h b/contrib/draco/src/draco/scene/scene.h
index 3c76ead7a..9d9a39c99 100644
--- a/contrib/draco/src/draco/scene/scene.h
+++ b/contrib/draco/src/draco/scene/scene.h
@@ -23,6 +23,7 @@
 #include "draco/animation/animation.h"
 #include "draco/animation/skin.h"
 #include "draco/mesh/mesh.h"
+#include "draco/metadata/metadata.h"
 #include "draco/metadata/structural_metadata.h"
 #include "draco/scene/instance_array.h"
 #include "draco/scene/light.h"
@@ -41,7 +42,7 @@ namespace draco {
 // meshes in this scene.
 class Scene {
  public:
-  Scene() {}
+  Scene();
 
   void Copy(const Scene &s);
 
@@ -221,6 +222,9 @@ class Scene {
     return instance_arrays_[index].get();
   }
 
+  const Metadata &GetMetadata() const { return *metadata_; }
+  Metadata &GetMetadata() { return *metadata_; }
+
  private:
   IndexTypeVector<MeshIndex, std::unique_ptr<Mesh>> meshes_;
   IndexTypeVector<MeshGroupIndex, std::unique_ptr<MeshGroup>> mesh_groups_;
@@ -250,6 +254,10 @@ class Scene {
 
   // Structural metadata defined by the EXT_structural_metadata glTF extension.
   StructuralMetadata structural_metadata_;
+
+  // General metadata associated with the scene (not related to the
+  // EXT_structural_metadata extension).
+  std::unique_ptr<Metadata> metadata_;
 };
 
 }  // namespace draco
diff --git a/contrib/draco/src/draco/scene/scene_test.cc b/contrib/draco/src/draco/scene/scene_test.cc
index d639614c7..83108abb3 100644
--- a/contrib/draco/src/draco/scene/scene_test.cc
+++ b/contrib/draco/src/draco/scene/scene_test.cc
@@ -15,6 +15,7 @@
 #include "draco/scene/scene.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
@@ -276,18 +277,40 @@ TEST(SceneTest, TestCopyWithStructuralMetadata) {
   draco::Scene &scene = *scene_ptr;
 
   // Add structural metadata to the scene.
-  draco::PropertyTable::Schema schema;
+  draco::StructuralMetadataSchema schema;
   schema.json.SetString("Data");
-  scene.GetStructuralMetadata().SetPropertyTableSchema(schema);
+  scene.GetStructuralMetadata().SetSchema(schema);
 
   // Copy the scene.
   draco::Scene copy;
   copy.Copy(scene);
 
   // Check that the structural metadata has been copied.
-  ASSERT_EQ(
-      copy.GetStructuralMetadata().GetPropertyTableSchema().json.GetString(),
-      "Data");
+  ASSERT_EQ(copy.GetStructuralMetadata().GetSchema().json.GetString(), "Data");
+}
+
+TEST(SceneTest, TestCopyWithMetadata) {
+  // Tests copying of a scene with general metadata.
+  auto scene_ptr =
+      draco::ReadSceneFromTestFile("CesiumMilkTruck/glTF/CesiumMilkTruck.gltf");
+  ASSERT_NE(scene_ptr, nullptr);
+  draco::Scene &scene = *scene_ptr;
+
+  // Add metadata to the scene.
+  scene.GetMetadata().AddEntryString("test_name", "test_value");
+  scene.GetMetadata().AddEntryInt("test_int", 101);
+
+  // Copy the scene.
+  draco::Scene copy;
+  copy.Copy(scene);
+
+  // Check that the metadata has been copied.
+  std::string string_val;
+  int int_val;
+  copy.GetMetadata().GetEntryString("test_name", &string_val);
+  copy.GetMetadata().GetEntryInt("test_int", &int_val);
+  ASSERT_EQ(string_val, "test_value");
+  ASSERT_EQ(int_val, 101);
 }
 
 #endif  // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/scene/scene_utils.cc b/contrib/draco/src/draco/scene/scene_utils.cc
index a7bf1dcb9..e43753e78 100644
--- a/contrib/draco/src/draco/scene/scene_utils.cc
+++ b/contrib/draco/src/draco/scene/scene_utils.cc
@@ -36,6 +36,22 @@ namespace draco {
 IndexTypeVector<MeshInstanceIndex, SceneUtils::MeshInstance>
 SceneUtils::ComputeAllInstances(const Scene &scene) {
   IndexTypeVector<MeshInstanceIndex, MeshInstance> instances;
+  for (int i = 0; i < scene.NumRootNodes(); ++i) {
+    const auto node_instances =
+        ComputeAllInstancesFromNode(scene, scene.GetRootNodeIndex(i));
+    const size_t old_size = instances.size();
+    instances.resize(instances.size() + node_instances.size());
+    for (MeshInstanceIndex mii(0); mii < node_instances.size(); ++mii) {
+      instances[mii + old_size] = node_instances[mii];
+    }
+  }
+  return instances;
+}
+
+IndexTypeVector<MeshInstanceIndex, SceneUtils::MeshInstance>
+SceneUtils::ComputeAllInstancesFromNode(const Scene &scene,
+                                        SceneNodeIndex node_index) {
+  IndexTypeVector<MeshInstanceIndex, MeshInstance> instances;
 
   // Traverse the scene assuming multiple root nodes.
   const Eigen::Matrix4d transform = Eigen::Matrix4d::Identity();
@@ -45,10 +61,7 @@ SceneUtils::ComputeAllInstances(const Scene &scene) {
     Eigen::Matrix4d transform;
   };
   std::vector<Node> nodes;
-  nodes.reserve(scene.NumRootNodes());
-  for (int i = 0; i < scene.NumRootNodes(); ++i) {
-    nodes.push_back({scene.GetRootNodeIndex(i), transform});
-  }
+  nodes.push_back({node_index, transform});
 
   while (!nodes.empty()) {
     const Node node = nodes.back();
@@ -220,7 +233,7 @@ void UpdateMeshFeaturesTexturesOnMesh(
 }  // namespace
 
 StatusOr<std::unique_ptr<Scene>> SceneUtils::MeshToScene(
-    std::unique_ptr<Mesh> mesh) {
+    std::unique_ptr<Mesh> mesh, bool deduplicate_vertices) {
   const size_t num_mesh_materials = mesh->GetMaterialLibrary().NumMaterials();
   std::unique_ptr<Scene> scene(new Scene());
   if (num_mesh_materials > 0) {
@@ -231,6 +244,9 @@ StatusOr<std::unique_ptr<Scene>> SceneUtils::MeshToScene(
     scene->GetMaterialLibrary().MutableMaterial(0);
   }
 
+  // Copy structural metadata.
+  scene->GetStructuralMetadata().Copy(mesh->GetStructuralMetadata());
+
   // Copy mesh feature textures.
   scene->GetNonMaterialTextureLibrary().Copy(
       mesh->GetNonMaterialTextureLibrary());
@@ -255,6 +271,10 @@ StatusOr<std::unique_ptr<Scene>> SceneUtils::MeshToScene(
                                      &scene->GetNonMaterialTextureLibrary(),
                                      &scene->GetMesh(mesh_index));
 
+    // The non-material texture library is now in the scene. The non-material
+    // texture library of the mesh must be cleared, because mesh features may
+    // contain texture pointers invalid for this non-material texture library.
+    scene->GetMesh(mesh_index).GetNonMaterialTextureLibrary().Clear();
   } else {
     const int32_t mat_att_id =
         mesh->GetNamedAttributeId(GeometryAttribute::MATERIAL);
@@ -274,6 +294,7 @@ StatusOr<std::unique_ptr<Scene>> SceneUtils::MeshToScene(
     }
 
     MeshSplitter splitter;
+    splitter.SetDeduplicateVertices(deduplicate_vertices);
     DRACO_ASSIGN_OR_RETURN(MeshSplitter::MeshVector split_meshes,
                            splitter.SplitMesh(*mesh, mat_att_id));
     // Note: cannot clear mesh here, since mat_att points into it.
@@ -296,9 +317,30 @@ StatusOr<std::unique_ptr<Scene>> SceneUtils::MeshToScene(
       // Copy over mesh features that were associated with the |material_index|.
       Mesh &scene_mesh = scene->GetMesh(mesh_index);
       Mesh::CopyMeshFeaturesForMaterial(*mesh, &scene_mesh, material_index);
+
+      // Update mesh features attribute indices if needed.
+      for (MeshFeaturesIndex mfi(0); mfi < scene_mesh.NumMeshFeatures();
+           ++mfi) {
+        auto &mesh_features = scene_mesh.GetMeshFeatures(mfi);
+        if (mesh_features.GetAttributeIndex() != -1) {
+          mesh_features.SetAttributeIndex(splitter.GetSplitMeshAttributeIndex(
+              mesh_features.GetAttributeIndex()));
+        }
+      }
+
       UpdateMeshFeaturesTexturesOnMesh(old_texture_to_index_map,
                                        &scene->GetNonMaterialTextureLibrary(),
                                        &scene_mesh);
+
+      // Copy over property attibutes indices that were associated with the
+      // |material_index|.
+      Mesh::CopyPropertyAttributesIndicesForMaterial(*mesh, &scene_mesh,
+                                                     material_index);
+
+      // The non-material texture library is now in the scene. The non-material
+      // texture library of the mesh must be cleared, because mesh features may
+      // contain texture pointers invalid for this non-material texture library.
+      scene_mesh.GetNonMaterialTextureLibrary().Clear();
     }
   }
 
diff --git a/contrib/draco/src/draco/scene/scene_utils.h b/contrib/draco/src/draco/scene/scene_utils.h
index 5b978c3c5..c205e6429 100644
--- a/contrib/draco/src/draco/scene/scene_utils.h
+++ b/contrib/draco/src/draco/scene/scene_utils.h
@@ -43,6 +43,12 @@ class SceneUtils {
   static IndexTypeVector<MeshInstanceIndex, MeshInstance> ComputeAllInstances(
       const Scene &scene);
 
+  // Computes all mesh instances in the node hierarchy originating from
+  // |node_index|. All instance transformations will be relative to the source
+  // node. That is transformation of parent nodes will not be included.
+  static IndexTypeVector<MeshInstanceIndex, MeshInstance>
+  ComputeAllInstancesFromNode(const Scene &scene, SceneNodeIndex node_index);
+
   // Computes global transform matrix of a |scene| node given by its |index|.
   static Eigen::Matrix4d ComputeGlobalNodeTransform(const Scene &scene,
                                                     SceneNodeIndex index);
@@ -97,8 +103,15 @@ class SceneUtils {
   // multiple materials, the returned scene will contain multiple meshes, one
   // for each of the source mesh's materials; if `mesh` has no material, one
   // will be created for it.
+  //
+  // By default, |MeshToScene| will attempt to deduplicate vertices if the mesh
+  // has multiple materials. This means lower memory usage and smaller output
+  // glTFs after encoding. However, for very large meshes, this may become an
+  // expensive operation. If that becomes an issue, you might want to consider
+  // disabling deduplication by setting |deduplicate_vertices| to false. Note
+  // that at this moment, disabling deduplication works ONLY for point clouds.
   static StatusOr<std::unique_ptr<Scene>> MeshToScene(
-      std::unique_ptr<Mesh> mesh);
+      std::unique_ptr<Mesh> mesh, bool deduplicate_vertices = true);
 
   // Creates a mesh according to mesh |instance| in |scene|. Error is returned
   // if there is no corresponding base mesh in the |scene| or the base mesh has
diff --git a/contrib/draco/src/draco/scene/scene_utils_test.cc b/contrib/draco/src/draco/scene/scene_utils_test.cc
index 4d6bd731d..c3ead1db1 100644
--- a/contrib/draco/src/draco/scene/scene_utils_test.cc
+++ b/contrib/draco/src/draco/scene/scene_utils_test.cc
@@ -22,6 +22,8 @@
 #include "draco/core/draco_test_base.h"
 #include "draco/core/draco_test_utils.h"
 #include "draco/io/texture_io.h"
+#include "draco/metadata/property_table.h"
+#include "draco/metadata/structural_metadata.h"
 #include "draco/scene/scene_indices.h"
 
 namespace {
@@ -120,6 +122,47 @@ TEST(SceneUtilsTest, TestComputeAllInstances) {
                    expected_transform, 1e-6f);
 }
 
+TEST(SceneUtilsTest, TestComputeInstanceFromRootNode) {
+  // Tests that we can compute all instances from a root node of a scene.
+  // This should result in the same instances all the ComputeAllInstances().
+
+  auto scene =
+      draco::ReadSceneFromTestFile("CesiumMilkTruck/glTF/CesiumMilkTruck.gltf");
+  const auto node_instances = draco::SceneUtils::ComputeAllInstancesFromNode(
+      *scene, scene->GetRootNodeIndex(0));
+  const auto scene_instances = draco::SceneUtils::ComputeAllInstances(*scene);
+  ASSERT_EQ(node_instances.size(), scene_instances.size());
+  for (draco::MeshInstanceIndex i(0); i < node_instances.size(); ++i) {
+    ASSERT_EQ(node_instances[i].scene_node_index,
+              scene_instances[i].scene_node_index);
+    ASSERT_EQ(node_instances[i].mesh_index, scene_instances[i].mesh_index);
+    ASSERT_EQ(node_instances[i].mesh_group_mesh_index,
+              scene_instances[i].mesh_group_mesh_index);
+    ASSERT_EQ(node_instances[i].transform, scene_instances[i].transform);
+  }
+}
+
+TEST(SceneUtilsTest, TestComputeInstanceFromChildNode) {
+  // Tests that we can compute all instances from a child node of a scene.
+  auto scene =
+      draco::ReadSceneFromTestFile("CesiumMilkTruck/glTF/CesiumMilkTruck.gltf");
+  const auto node_instances = draco::SceneUtils::ComputeAllInstancesFromNode(
+      *scene, draco::SceneNodeIndex(1));
+
+  // There should be only one instance in this node chain.
+  ASSERT_EQ(node_instances.size(), 1);
+
+  // clang-format off
+  AssertMatrixNear(node_instances[draco::MeshInstanceIndex(0)].transform,
+            Eigen::Matrix4d{
+              { 0.98434,  0.176278, 0, 1.43267},
+              {-0.176278, 0.98434,  0, 0.427722},
+              {0,         0,        1, -2.98e-8},
+              {0,         0,        0, 1}
+            }, 1e-6);
+  // clang-format on
+}
+
 TEST(SceneUtilsTest, TestComputeAllInstancesWithShiftedGeometryRoot) {
   // Tests that we can compute all instances in an input scene along with their
   // transformations. This scene has light and camera nodes before the geometry
@@ -334,8 +377,17 @@ TEST(SceneUtilsTest, TestMeshToSceneMultipleMeshFeatures) {
       const auto &scene_mf = scene->GetMesh(mi).GetMeshFeatures(mfi);
       const auto &scene_from_mesh_mf =
           scene_from_mesh->GetMesh(mi).GetMeshFeatures(mfi);
-      ASSERT_EQ(scene_mf.GetAttributeIndex(),
-                scene_from_mesh_mf.GetAttributeIndex());
+      const int att_index_0 = scene_mf.GetAttributeIndex();
+      const int att_index_1 = scene_from_mesh_mf.GetAttributeIndex();
+      if (att_index_0 == -1) {
+        ASSERT_EQ(att_index_0, att_index_1);
+      } else {
+        ASSERT_EQ(scene->GetMesh(mi).attribute(att_index_0)->name(),
+                  scene_from_mesh->GetMesh(mi).attribute(att_index_1)->name());
+        ASSERT_EQ(scene->GetMesh(mi).attribute(att_index_0)->size(),
+                  scene_from_mesh->GetMesh(mi).attribute(att_index_1)->size());
+      }
+
       ASSERT_EQ(scene_mf.GetPropertyTableIndex(),
                 scene_from_mesh_mf.GetPropertyTableIndex());
       ASSERT_EQ(scene_mf.GetLabel(), scene_from_mesh_mf.GetLabel());
@@ -351,6 +403,63 @@ TEST(SceneUtilsTest, TestMeshToSceneMultipleMeshFeatures) {
   }
 }
 
+TEST(SceneUtilsTest, TestMeshToSceneMeshFeaturesWithAttributes) {
+  // Tests that converting a mesh into scene properly updates mesh features
+  // attribute indices.
+  auto mesh =
+      draco::ReadMeshFromTestFile("CesiumMilkTruck/glTF/CesiumMilkTruck.gltf");
+  ASSERT_NE(mesh, nullptr);
+
+  // Add a new dummy mesh features and mesh features attribute to the mesh.
+  std::unique_ptr<draco::PointAttribute> mf_att(new draco::PointAttribute());
+  mf_att->Init(draco::GeometryAttribute::GENERIC, 1, draco::DT_FLOAT32, false,
+               mesh->num_points());
+  const int mf_att_id = mesh->AddAttribute(std::move(mf_att));
+  std::unique_ptr<draco::MeshFeatures> mf(new draco::MeshFeatures());
+  mf->SetAttributeIndex(mf_att_id);
+  mesh->AddMeshFeatures(std::move(mf));
+
+  // Convert the mesh into a scene.
+  DRACO_ASSIGN_OR_ASSERT(const std::unique_ptr<draco::Scene> scene_from_mesh,
+                         draco::SceneUtils::MeshToScene(std::move(mesh)));
+  ASSERT_NE(scene_from_mesh, nullptr);
+
+  // Ensure the attribute indices on the meshes from scene are decremented by
+  // one because the material attribute was removed.
+  ASSERT_EQ(scene_from_mesh->NumMeshes(), 4);
+  for (draco::MeshIndex mi(0); mi < scene_from_mesh->NumMeshes(); ++mi) {
+    for (draco::MeshFeaturesIndex mfi(0);
+         mfi < scene_from_mesh->GetMesh(mi).NumMeshFeatures(); ++mfi) {
+      const auto &mf = scene_from_mesh->GetMesh(mi).GetMeshFeatures(mfi);
+      ASSERT_EQ(mf.GetAttributeIndex(), mf_att_id - 1);
+    }
+  }
+}
+
+TEST(SceneUtilsTest, TestMeshToSceneStructuralMetadata) {
+  const std::string filename = "cube_att.obj";
+  std::unique_ptr<draco::Mesh> mesh = draco::ReadMeshFromTestFile(filename);
+  ASSERT_NE(mesh, nullptr);
+
+  // Setting a sample schema to:
+  // {
+  //   "classes": []
+  // }
+  draco::StructuralMetadataSchema sample_schema;
+  auto &classes_json = sample_schema.json.SetObjects().emplace_back("classes");
+  classes_json.SetArray();
+
+  mesh->GetStructuralMetadata().SetSchema(sample_schema);
+  draco::StructuralMetadata mesh_structural_metadata;
+  mesh_structural_metadata.Copy(mesh->GetStructuralMetadata());
+  ASSERT_FALSE(mesh_structural_metadata.GetSchema().Empty());
+
+  DRACO_ASSIGN_OR_ASSERT(const std::unique_ptr<draco::Scene> scene_from_mesh,
+                         draco::SceneUtils::MeshToScene(std::move(mesh)));
+  ASSERT_NE(scene_from_mesh, nullptr);
+  ASSERT_EQ(scene_from_mesh->GetStructuralMetadata(), mesh_structural_metadata);
+}
+
 TEST(SceneUtilsTest, TestInstantiateMeshWithIdentityTransformation) {
   auto scene =
       draco::ReadSceneFromTestFile("CesiumMilkTruck/glTF/CesiumMilkTruck.gltf");
diff --git a/contrib/draco/src/draco/scene/trs_matrix.h b/contrib/draco/src/draco/scene/trs_matrix.h
index 6c2ab7388..837d8350a 100644
--- a/contrib/draco/src/draco/scene/trs_matrix.h
+++ b/contrib/draco/src/draco/scene/trs_matrix.h
@@ -39,9 +39,10 @@ class TrsMatrix {
 
   void Copy(const TrsMatrix &tm);
 
-  void SetMatrix(const Eigen::Matrix4d &matrix) {
+  TrsMatrix &SetMatrix(const Eigen::Matrix4d &matrix) {
     matrix_ = matrix;
     matrix_set_ = true;
+    return *this;
   }
   bool MatrixSet() const { return matrix_set_; }
   StatusOr<const Eigen::Matrix4d> Matrix() const {
@@ -51,9 +52,10 @@ class TrsMatrix {
     return matrix_;
   }
 
-  void SetTranslation(const Eigen::Vector3d &translation) {
+  TrsMatrix &SetTranslation(const Eigen::Vector3d &translation) {
     translation_ = translation;
     translation_set_ = true;
+    return *this;
   }
   bool TranslationSet() const { return translation_set_; }
   StatusOr<const Eigen::Vector3d> Translation() const {
@@ -63,9 +65,10 @@ class TrsMatrix {
     return translation_;
   }
 
-  void SetRotation(const Eigen::Quaterniond &rotation) {
+  TrsMatrix &SetRotation(const Eigen::Quaterniond &rotation) {
     rotation_ = rotation;
     rotation_set_ = true;
+    return *this;
   }
   bool RotationSet() const { return rotation_set_; }
   StatusOr<const Eigen::Quaterniond> Rotation() const {
@@ -75,9 +78,10 @@ class TrsMatrix {
     return rotation_;
   }
 
-  void SetScale(const Eigen::Vector3d &scale) {
+  TrsMatrix &SetScale(const Eigen::Vector3d &scale) {
     scale_ = scale;
     scale_set_ = true;
+    return *this;
   }
   bool ScaleSet() const { return scale_set_; }
   StatusOr<const Eigen::Vector3d> Scale() const {
diff --git a/contrib/draco/src/draco/texture/texture.h b/contrib/draco/src/draco/texture/texture.h
index 1d3b6e382..a0ef05c6b 100644
--- a/contrib/draco/src/draco/texture/texture.h
+++ b/contrib/draco/src/draco/texture/texture.h
@@ -29,7 +29,7 @@ namespace draco {
 // Texture class storing the source image data.
 class Texture {
  public:
-  void Copy(Texture &other) { source_image_.Copy(other.source_image_); }
+  void Copy(const Texture &other) { source_image_.Copy(other.source_image_); }
 
   void set_source_image(const SourceImage &image) { source_image_.Copy(image); }
   const SourceImage &source_image() const { return source_image_; }
diff --git a/contrib/draco/src/draco/texture/texture_utils.cc b/contrib/draco/src/draco/texture/texture_utils.cc
index 7598ac780..db5fce434 100644
--- a/contrib/draco/src/draco/texture/texture_utils.cc
+++ b/contrib/draco/src/draco/texture/texture_utils.cc
@@ -23,6 +23,13 @@
 #include <unordered_set>
 #include <vector>
 
+#include "draco/core/status.h"
+#include "draco/core/status_or.h"
+#include "draco/io/file_utils.h"
+#include "draco/io/image_compression_options.h"
+#include "draco/texture/texture.h"
+#include "draco/texture/texture_map.h"
+
 namespace draco {
 
 std::string TextureUtils::GetTargetStem(const Texture &texture) {
@@ -61,6 +68,42 @@ std::string TextureUtils::GetTargetExtension(const Texture &texture) {
   return GetExtension(GetTargetFormat(texture));
 }
 
+std::string TextureUtils::GetTargetMimeType(const Texture &texture) {
+  const ImageFormat format = GetTargetFormat(texture);
+  if (format == ImageFormat::NONE) {
+    // Unknown format, try to re-use mime type stored in the source_image.
+    // This is mostly useful if users need to handle image formats not directly
+    // supported by the Draco library.
+    if (!texture.source_image().mime_type().empty()) {
+      return texture.source_image().mime_type();
+    } else if (!texture.source_image().filename().empty()) {
+      // Try to set mime type based on the extension of the filename.
+      const std::string extension =
+          LowercaseFileExtension(texture.source_image().filename());
+      if (!extension.empty()) {
+        return "image/" + extension;
+      }
+    }
+  }
+  return GetMimeType(format);
+}
+
+std::string TextureUtils::GetMimeType(ImageFormat image_format) {
+  switch (image_format) {
+    case ImageFormat::PNG:
+      return "image/png";
+    case ImageFormat::JPEG:
+      return "image/jpeg";
+    case ImageFormat::BASIS:
+      return "image/ktx2";
+    case ImageFormat::WEBP:
+      return "image/webp";
+    case ImageFormat::NONE:
+    default:
+      return "";
+  }
+}
+
 ImageFormat TextureUtils::GetSourceFormat(const Texture &texture) {
   // Try to get the extension based on source image mime type.
   std::string extension =
diff --git a/contrib/draco/src/draco/texture/texture_utils.h b/contrib/draco/src/draco/texture/texture_utils.h
index 18d29950a..eb33b26ff 100644
--- a/contrib/draco/src/draco/texture/texture_utils.h
+++ b/contrib/draco/src/draco/texture/texture_utils.h
@@ -48,6 +48,13 @@ class TextureUtils {
   // source image mime type or the source image filename.
   static std::string GetTargetExtension(const Texture &texture);
 
+  // Returns mime type string based on |texture| compression settings, source
+  // image mime type or the source image filename.
+  static std::string GetTargetMimeType(const Texture &texture);
+
+  // Returns mime type string for a given |image_format|.
+  static std::string GetMimeType(ImageFormat image_format);
+
   // Returns |texture| format based on source image mime type or the source
   // image filename.
   static ImageFormat GetSourceFormat(const Texture &texture);
diff --git a/contrib/draco/src/draco/texture/texture_utils_test.cc b/contrib/draco/src/draco/texture/texture_utils_test.cc
index 45873ea7a..b3896f824 100644
--- a/contrib/draco/src/draco/texture/texture_utils_test.cc
+++ b/contrib/draco/src/draco/texture/texture_utils_test.cc
@@ -89,6 +89,39 @@ TEST(TextureUtilsTest, TestGetFormat) {
   ASSERT_EQ(draco::TextureUtils::GetFormat("bmp"), ImageFormat::NONE);
 }
 
+TEST(TextureUtilsTest, TestGetTargetMimeType) {
+  draco::Texture texture;
+  texture.source_image().set_mime_type("image/jpeg");
+  ASSERT_EQ(draco::TextureUtils::GetTargetMimeType(texture), "image/jpeg");
+
+  // Set compression settings to a different format.
+  draco::ImageCompressionOptions options;
+  options.target_image_format = draco::ImageFormat::BASIS;
+  texture.SetCompressionOptions(options);
+  ASSERT_EQ(draco::TextureUtils::GetTargetMimeType(texture), "image/ktx2");
+
+  // Test custom mime type in source image.
+  draco::Texture unknown_format;
+  unknown_format.source_image().set_mime_type("image/custom");
+  ASSERT_EQ(draco::TextureUtils::GetTargetMimeType(unknown_format),
+            "image/custom");
+
+  // Test custom mime type from file name.
+  draco::Texture unknown_format_file_name;
+  unknown_format_file_name.source_image().set_filename("test.extension");
+  ASSERT_EQ(draco::TextureUtils::GetTargetMimeType(unknown_format_file_name),
+            "image/extension");
+}
+
+TEST(TextureUtilsTest, TestGetMimeType) {
+  typedef draco::ImageFormat ImageFormat;
+  ASSERT_EQ(draco::TextureUtils::GetMimeType(ImageFormat::PNG), "image/png");
+  ASSERT_EQ(draco::TextureUtils::GetMimeType(ImageFormat::JPEG), "image/jpeg");
+  ASSERT_EQ(draco::TextureUtils::GetMimeType(ImageFormat::BASIS), "image/ktx2");
+  ASSERT_EQ(draco::TextureUtils::GetMimeType(ImageFormat::WEBP), "image/webp");
+  ASSERT_EQ(draco::TextureUtils::GetMimeType(ImageFormat::NONE), "");
+}
+
 TEST(TextureUtilsTest, TestGetExtension) {
   typedef draco::ImageFormat ImageFormat;
   ASSERT_EQ(draco::TextureUtils::GetExtension(ImageFormat::PNG), "png");
diff --git a/contrib/draco/src/draco/tools/install_test/test.py b/contrib/draco/src/draco/tools/install_test/test.py
old mode 100644
new mode 100755
diff --git a/contrib/earcut-hpp/LICENSE b/contrib/earcut-hpp/LICENSE
new file mode 100644
index 000000000..8bafb5773
--- /dev/null
+++ b/contrib/earcut-hpp/LICENSE
@@ -0,0 +1,15 @@
+ISC License
+
+Copyright (c) 2015, Mapbox
+
+Permission to use, copy, modify, and/or distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.
diff --git a/contrib/earcut-hpp/earcut.hpp b/contrib/earcut-hpp/earcut.hpp
new file mode 100644
index 000000000..fd3381484
--- /dev/null
+++ b/contrib/earcut-hpp/earcut.hpp
@@ -0,0 +1,814 @@
+#pragma once
+
+#include <algorithm>
+#include <cassert>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <limits>
+#include <memory>
+#include <utility>
+#include <vector>
+
+namespace mapbox {
+
+namespace util {
+
+template <std::size_t I, typename T> struct nth {
+    inline static typename std::tuple_element<I, T>::type
+    get(const T& t) { return std::get<I>(t); };
+};
+
+}
+
+namespace detail {
+
+template <typename N = uint32_t>
+class Earcut {
+public:
+    std::vector<N> indices;
+    std::size_t vertices = 0;
+
+    template <typename Polygon>
+    void operator()(const Polygon& points);
+
+private:
+    struct Node {
+        Node(N index, double x_, double y_) : i(index), x(x_), y(y_) {}
+        Node(const Node&) = delete;
+        Node& operator=(const Node&) = delete;
+        Node(Node&&) = delete;
+        Node& operator=(Node&&) = delete;
+
+        const N i;
+        const double x;
+        const double y;
+
+        // previous and next vertice nodes in a polygon ring
+        Node* prev = nullptr;
+        Node* next = nullptr;
+
+        // z-order curve value
+        int32_t z = 0;
+
+        // previous and next nodes in z-order
+        Node* prevZ = nullptr;
+        Node* nextZ = nullptr;
+
+        // indicates whether this is a steiner point
+        bool steiner = false;
+    };
+
+    template <typename Ring> Node* linkedList(const Ring& points, const bool clockwise);
+    Node* filterPoints(Node* start, Node* end = nullptr);
+    void earcutLinked(Node* ear, int pass = 0);
+    bool isEar(Node* ear);
+    bool isEarHashed(Node* ear);
+    Node* cureLocalIntersections(Node* start);
+    void splitEarcut(Node* start);
+    template <typename Polygon> Node* eliminateHoles(const Polygon& points, Node* outerNode);
+    Node* eliminateHole(Node* hole, Node* outerNode);
+    Node* findHoleBridge(Node* hole, Node* outerNode);
+    bool sectorContainsSector(const Node* m, const Node* p);
+    void indexCurve(Node* start);
+    Node* sortLinked(Node* list);
+    int32_t zOrder(const double x_, const double y_);
+    Node* getLeftmost(Node* start);
+    bool pointInTriangle(double ax, double ay, double bx, double by, double cx, double cy, double px, double py) const;
+    bool isValidDiagonal(Node* a, Node* b);
+    double area(const Node* p, const Node* q, const Node* r) const;
+    bool equals(const Node* p1, const Node* p2);
+    bool intersects(const Node* p1, const Node* q1, const Node* p2, const Node* q2);
+    bool onSegment(const Node* p, const Node* q, const Node* r);
+    int sign(double val);
+    bool intersectsPolygon(const Node* a, const Node* b);
+    bool locallyInside(const Node* a, const Node* b);
+    bool middleInside(const Node* a, const Node* b);
+    Node* splitPolygon(Node* a, Node* b);
+    template <typename Point> Node* insertNode(std::size_t i, const Point& p, Node* last);
+    void removeNode(Node* p);
+
+    bool hashing;
+    double minX, maxX;
+    double minY, maxY;
+    double inv_size = 0;
+
+    template <typename T, typename Alloc = std::allocator<T>>
+    class ObjectPool {
+    public:
+        ObjectPool() { }
+        ObjectPool(std::size_t blockSize_) {
+            reset(blockSize_);
+        }
+        ~ObjectPool() {
+            clear();
+        }
+        template <typename... Args>
+        T* construct(Args&&... args) {
+            if (currentIndex >= blockSize) {
+                currentBlock = alloc_traits::allocate(alloc, blockSize);
+                allocations.emplace_back(currentBlock);
+                currentIndex = 0;
+            }
+            T* object = &currentBlock[currentIndex++];
+            alloc_traits::construct(alloc, object, std::forward<Args>(args)...);
+            return object;
+        }
+        void reset(std::size_t newBlockSize) {
+            for (auto allocation : allocations) {
+                alloc_traits::deallocate(alloc, allocation, blockSize);
+            }
+            allocations.clear();
+            blockSize = std::max<std::size_t>(1, newBlockSize);
+            currentBlock = nullptr;
+            currentIndex = blockSize;
+        }
+        void clear() { reset(blockSize); }
+    private:
+        T* currentBlock = nullptr;
+        std::size_t currentIndex = 1;
+        std::size_t blockSize = 1;
+        std::vector<T*> allocations;
+        Alloc alloc;
+        typedef typename std::allocator_traits<Alloc> alloc_traits;
+    };
+    ObjectPool<Node> nodes;
+};
+
+template <typename N> template <typename Polygon>
+void Earcut<N>::operator()(const Polygon& points) {
+    // reset
+    indices.clear();
+    vertices = 0;
+
+    if (points.empty()) return;
+
+    double x;
+    double y;
+    int threshold = 80;
+    std::size_t len = 0;
+
+    for (size_t i = 0; threshold >= 0 && i < points.size(); i++) {
+        threshold -= static_cast<int>(points[i].size());
+        len += points[i].size();
+    }
+
+    //estimate size of nodes and indices
+    nodes.reset(len * 3 / 2);
+    indices.reserve(len + points[0].size());
+
+    Node* outerNode = linkedList(points[0], true);
+    if (!outerNode || outerNode->prev == outerNode->next) return;
+
+    if (points.size() > 1) outerNode = eliminateHoles(points, outerNode);
+
+    // if the shape is not too simple, we'll use z-order curve hash later; calculate polygon bbox
+    hashing = threshold < 0;
+    if (hashing) {
+        Node* p = outerNode->next;
+        minX = maxX = outerNode->x;
+        minY = maxY = outerNode->y;
+        do {
+            x = p->x;
+            y = p->y;
+            minX = std::min<double>(minX, x);
+            minY = std::min<double>(minY, y);
+            maxX = std::max<double>(maxX, x);
+            maxY = std::max<double>(maxY, y);
+            p = p->next;
+        } while (p != outerNode);
+
+        // minX, minY and inv_size are later used to transform coords into integers for z-order calculation
+        inv_size = std::max<double>(maxX - minX, maxY - minY);
+        inv_size = inv_size != .0 ? (32767. / inv_size) : .0;
+    }
+
+    earcutLinked(outerNode);
+
+    nodes.clear();
+}
+
+// create a circular doubly linked list from polygon points in the specified winding order
+template <typename N> template <typename Ring>
+typename Earcut<N>::Node*
+Earcut<N>::linkedList(const Ring& points, const bool clockwise) {
+    using Point = typename Ring::value_type;
+    double sum = 0;
+    const std::size_t len = points.size();
+    std::size_t i, j;
+    Node* last = nullptr;
+
+    // calculate original winding order of a polygon ring
+    for (i = 0, j = len > 0 ? len - 1 : 0; i < len; j = i++) {
+        const auto& p1 = points[i];
+        const auto& p2 = points[j];
+        const double p20 = util::nth<0, Point>::get(p2);
+        const double p10 = util::nth<0, Point>::get(p1);
+        const double p11 = util::nth<1, Point>::get(p1);
+        const double p21 = util::nth<1, Point>::get(p2);
+        sum += (p20 - p10) * (p11 + p21);
+    }
+
+    // link points into circular doubly-linked list in the specified winding order
+    if (clockwise == (sum > 0)) {
+        for (i = 0; i < len; i++) last = insertNode(vertices + i, points[i], last);
+    } else {
+        for (i = len; i-- > 0;) last = insertNode(vertices + i, points[i], last);
+    }
+
+    if (last && equals(last, last->next)) {
+        removeNode(last);
+        last = last->next;
+    }
+
+    vertices += len;
+
+    return last;
+}
+
+// eliminate colinear or duplicate points
+template <typename N>
+typename Earcut<N>::Node*
+Earcut<N>::filterPoints(Node* start, Node* end) {
+    if (!end) end = start;
+
+    Node* p = start;
+    bool again;
+    do {
+        again = false;
+
+        if (!p->steiner && (equals(p, p->next) || area(p->prev, p, p->next) == 0)) {
+            removeNode(p);
+            p = end = p->prev;
+
+            if (p == p->next) break;
+            again = true;
+
+        } else {
+            p = p->next;
+        }
+    } while (again || p != end);
+
+    return end;
+}
+
+// main ear slicing loop which triangulates a polygon (given as a linked list)
+template <typename N>
+void Earcut<N>::earcutLinked(Node* ear, int pass) {
+    if (!ear) return;
+
+    // interlink polygon nodes in z-order
+    if (!pass && hashing) indexCurve(ear);
+
+    Node* stop = ear;
+    Node* prev;
+    Node* next;
+
+    // iterate through ears, slicing them one by one
+    while (ear->prev != ear->next) {
+        prev = ear->prev;
+        next = ear->next;
+
+        if (hashing ? isEarHashed(ear) : isEar(ear)) {
+            // cut off the triangle
+            indices.emplace_back(prev->i);
+            indices.emplace_back(ear->i);
+            indices.emplace_back(next->i);
+
+            removeNode(ear);
+
+            // skipping the next vertice leads to less sliver triangles
+            ear = next->next;
+            stop = next->next;
+
+            continue;
+        }
+
+        ear = next;
+
+        // if we looped through the whole remaining polygon and can't find any more ears
+        if (ear == stop) {
+            // try filtering points and slicing again
+            if (!pass) earcutLinked(filterPoints(ear), 1);
+
+            // if this didn't work, try curing all small self-intersections locally
+            else if (pass == 1) {
+                ear = cureLocalIntersections(filterPoints(ear));
+                earcutLinked(ear, 2);
+
+            // as a last resort, try splitting the remaining polygon into two
+            } else if (pass == 2) splitEarcut(ear);
+
+            break;
+        }
+    }
+}
+
+// check whether a polygon node forms a valid ear with adjacent nodes
+template <typename N>
+bool Earcut<N>::isEar(Node* ear) {
+    const Node* a = ear->prev;
+    const Node* b = ear;
+    const Node* c = ear->next;
+
+    if (area(a, b, c) >= 0) return false; // reflex, can't be an ear
+
+    // now make sure we don't have other points inside the potential ear
+    Node* p = ear->next->next;
+
+    while (p != ear->prev) {
+        if (pointInTriangle(a->x, a->y, b->x, b->y, c->x, c->y, p->x, p->y) &&
+            area(p->prev, p, p->next) >= 0) return false;
+        p = p->next;
+    }
+
+    return true;
+}
+
+template <typename N>
+bool Earcut<N>::isEarHashed(Node* ear) {
+    const Node* a = ear->prev;
+    const Node* b = ear;
+    const Node* c = ear->next;
+
+    if (area(a, b, c) >= 0) return false; // reflex, can't be an ear
+
+    // triangle bbox; min & max are calculated like this for speed
+    const double minTX = std::min<double>(a->x, std::min<double>(b->x, c->x));
+    const double minTY = std::min<double>(a->y, std::min<double>(b->y, c->y));
+    const double maxTX = std::max<double>(a->x, std::max<double>(b->x, c->x));
+    const double maxTY = std::max<double>(a->y, std::max<double>(b->y, c->y));
+
+    // z-order range for the current triangle bbox;
+    const int32_t minZ = zOrder(minTX, minTY);
+    const int32_t maxZ = zOrder(maxTX, maxTY);
+
+    // first look for points inside the triangle in increasing z-order
+    Node* p = ear->nextZ;
+
+    while (p && p->z <= maxZ) {
+        if (p != ear->prev && p != ear->next &&
+            pointInTriangle(a->x, a->y, b->x, b->y, c->x, c->y, p->x, p->y) &&
+            area(p->prev, p, p->next) >= 0) return false;
+        p = p->nextZ;
+    }
+
+    // then look for points in decreasing z-order
+    p = ear->prevZ;
+
+    while (p && p->z >= minZ) {
+        if (p != ear->prev && p != ear->next &&
+            pointInTriangle(a->x, a->y, b->x, b->y, c->x, c->y, p->x, p->y) &&
+            area(p->prev, p, p->next) >= 0) return false;
+        p = p->prevZ;
+    }
+
+    return true;
+}
+
+// go through all polygon nodes and cure small local self-intersections
+template <typename N>
+typename Earcut<N>::Node*
+Earcut<N>::cureLocalIntersections(Node* start) {
+    Node* p = start;
+    do {
+        Node* a = p->prev;
+        Node* b = p->next->next;
+
+        // a self-intersection where edge (v[i-1],v[i]) intersects (v[i+1],v[i+2])
+        if (!equals(a, b) && intersects(a, p, p->next, b) && locallyInside(a, b) && locallyInside(b, a)) {
+            indices.emplace_back(a->i);
+            indices.emplace_back(p->i);
+            indices.emplace_back(b->i);
+
+            // remove two nodes involved
+            removeNode(p);
+            removeNode(p->next);
+
+            p = start = b;
+        }
+        p = p->next;
+    } while (p != start);
+
+    return filterPoints(p);
+}
+
+// try splitting polygon into two and triangulate them independently
+template <typename N>
+void Earcut<N>::splitEarcut(Node* start) {
+    // look for a valid diagonal that divides the polygon into two
+    Node* a = start;
+    do {
+        Node* b = a->next->next;
+        while (b != a->prev) {
+            if (a->i != b->i && isValidDiagonal(a, b)) {
+                // split the polygon in two by the diagonal
+                Node* c = splitPolygon(a, b);
+
+                // filter colinear points around the cuts
+                a = filterPoints(a, a->next);
+                c = filterPoints(c, c->next);
+
+                // run earcut on each half
+                earcutLinked(a);
+                earcutLinked(c);
+                return;
+            }
+            b = b->next;
+        }
+        a = a->next;
+    } while (a != start);
+}
+
+// link every hole into the outer loop, producing a single-ring polygon without holes
+template <typename N> template <typename Polygon>
+typename Earcut<N>::Node*
+Earcut<N>::eliminateHoles(const Polygon& points, Node* outerNode) {
+    const size_t len = points.size();
+
+    std::vector<Node*> queue;
+    for (size_t i = 1; i < len; i++) {
+        Node* list = linkedList(points[i], false);
+        if (list) {
+            if (list == list->next) list->steiner = true;
+            queue.push_back(getLeftmost(list));
+        }
+    }
+    std::sort(queue.begin(), queue.end(), [](const Node* a, const Node* b) {
+        return a->x < b->x;
+    });
+
+    // process holes from left to right
+    for (size_t i = 0; i < queue.size(); i++) {
+        outerNode = eliminateHole(queue[i], outerNode);
+    }
+
+    return outerNode;
+}
+
+// find a bridge between vertices that connects hole with an outer ring and and link it
+template <typename N>
+typename Earcut<N>::Node*
+Earcut<N>::eliminateHole(Node* hole, Node* outerNode) {
+    Node* bridge = findHoleBridge(hole, outerNode);
+    if (!bridge) {
+        return outerNode;
+    }
+
+    Node* bridgeReverse = splitPolygon(bridge, hole);
+
+    // filter collinear points around the cuts
+    filterPoints(bridgeReverse, bridgeReverse->next);
+
+    // Check if input node was removed by the filtering
+    return filterPoints(bridge, bridge->next);
+}
+
+// David Eberly's algorithm for finding a bridge between hole and outer polygon
+template <typename N>
+typename Earcut<N>::Node*
+Earcut<N>::findHoleBridge(Node* hole, Node* outerNode) {
+    Node* p = outerNode;
+    double hx = hole->x;
+    double hy = hole->y;
+    double qx = -std::numeric_limits<double>::infinity();
+    Node* m = nullptr;
+
+    // find a segment intersected by a ray from the hole's leftmost Vertex to the left;
+    // segment's endpoint with lesser x will be potential connection Vertex
+    do {
+        if (hy <= p->y && hy >= p->next->y && p->next->y != p->y) {
+          double x = p->x + (hy - p->y) * (p->next->x - p->x) / (p->next->y - p->y);
+          if (x <= hx && x > qx) {
+            qx = x;
+            m = p->x < p->next->x ? p : p->next;
+            if (x == hx) return m; // hole touches outer segment; pick leftmost endpoint
+          }
+        }
+        p = p->next;
+    } while (p != outerNode);
+
+    if (!m) return 0;
+
+    // look for points inside the triangle of hole Vertex, segment intersection and endpoint;
+    // if there are no points found, we have a valid connection;
+    // otherwise choose the Vertex of the minimum angle with the ray as connection Vertex
+
+    const Node* stop = m;
+    double tanMin = std::numeric_limits<double>::infinity();
+    double tanCur = 0;
+
+    p = m;
+    double mx = m->x;
+    double my = m->y;
+
+    do {
+        if (hx >= p->x && p->x >= mx && hx != p->x &&
+            pointInTriangle(hy < my ? hx : qx, hy, mx, my, hy < my ? qx : hx, hy, p->x, p->y)) {
+
+            tanCur = std::abs(hy - p->y) / (hx - p->x); // tangential
+
+            if (locallyInside(p, hole) &&
+                (tanCur < tanMin || (tanCur == tanMin && (p->x > m->x || sectorContainsSector(m, p))))) {
+                m = p;
+                tanMin = tanCur;
+            }
+        }
+
+        p = p->next;
+    } while (p != stop);
+
+    return m;
+}
+
+// whether sector in vertex m contains sector in vertex p in the same coordinates
+template <typename N>
+bool Earcut<N>::sectorContainsSector(const Node* m, const Node* p) {
+    return area(m->prev, m, p->prev) < 0 && area(p->next, m, m->next) < 0;
+}
+
+// interlink polygon nodes in z-order
+template <typename N>
+void Earcut<N>::indexCurve(Node* start) {
+    assert(start);
+    Node* p = start;
+
+    do {
+        p->z = p->z ? p->z : zOrder(p->x, p->y);
+        p->prevZ = p->prev;
+        p->nextZ = p->next;
+        p = p->next;
+    } while (p != start);
+
+    p->prevZ->nextZ = nullptr;
+    p->prevZ = nullptr;
+
+    sortLinked(p);
+}
+
+// Simon Tatham's linked list merge sort algorithm
+// http://www.chiark.greenend.org.uk/~sgtatham/algorithms/listsort.html
+template <typename N>
+typename Earcut<N>::Node*
+Earcut<N>::sortLinked(Node* list) {
+    assert(list);
+    Node* p;
+    Node* q;
+    Node* e;
+    Node* tail;
+    int i, numMerges, pSize, qSize;
+    int inSize = 1;
+
+    for (;;) {
+        p = list;
+        list = nullptr;
+        tail = nullptr;
+        numMerges = 0;
+
+        while (p) {
+            numMerges++;
+            q = p;
+            pSize = 0;
+            for (i = 0; i < inSize; i++) {
+                pSize++;
+                q = q->nextZ;
+                if (!q) break;
+            }
+
+            qSize = inSize;
+
+            while (pSize > 0 || (qSize > 0 && q)) {
+
+                if (pSize == 0) {
+                    e = q;
+                    q = q->nextZ;
+                    qSize--;
+                } else if (qSize == 0 || !q) {
+                    e = p;
+                    p = p->nextZ;
+                    pSize--;
+                } else if (p->z <= q->z) {
+                    e = p;
+                    p = p->nextZ;
+                    pSize--;
+                } else {
+                    e = q;
+                    q = q->nextZ;
+                    qSize--;
+                }
+
+                if (tail) tail->nextZ = e;
+                else list = e;
+
+                e->prevZ = tail;
+                tail = e;
+            }
+
+            p = q;
+        }
+
+        tail->nextZ = nullptr;
+
+        if (numMerges <= 1) return list;
+
+        inSize *= 2;
+    }
+}
+
+// z-order of a Vertex given coords and size of the data bounding box
+template <typename N>
+int32_t Earcut<N>::zOrder(const double x_, const double y_) {
+    // coords are transformed into non-negative 15-bit integer range
+    int32_t x = static_cast<int32_t>((x_ - minX) * inv_size);
+    int32_t y = static_cast<int32_t>((y_ - minY) * inv_size);
+
+    x = (x | (x << 8)) & 0x00FF00FF;
+    x = (x | (x << 4)) & 0x0F0F0F0F;
+    x = (x | (x << 2)) & 0x33333333;
+    x = (x | (x << 1)) & 0x55555555;
+
+    y = (y | (y << 8)) & 0x00FF00FF;
+    y = (y | (y << 4)) & 0x0F0F0F0F;
+    y = (y | (y << 2)) & 0x33333333;
+    y = (y | (y << 1)) & 0x55555555;
+
+    return x | (y << 1);
+}
+
+// find the leftmost node of a polygon ring
+template <typename N>
+typename Earcut<N>::Node*
+Earcut<N>::getLeftmost(Node* start) {
+    Node* p = start;
+    Node* leftmost = start;
+    do {
+        if (p->x < leftmost->x || (p->x == leftmost->x && p->y < leftmost->y))
+            leftmost = p;
+        p = p->next;
+    } while (p != start);
+
+    return leftmost;
+}
+
+// check if a point lies within a convex triangle
+template <typename N>
+bool Earcut<N>::pointInTriangle(double ax, double ay, double bx, double by, double cx, double cy, double px, double py) const {
+    return (cx - px) * (ay - py) >= (ax - px) * (cy - py) &&
+           (ax - px) * (by - py) >= (bx - px) * (ay - py) &&
+           (bx - px) * (cy - py) >= (cx - px) * (by - py);
+}
+
+// check if a diagonal between two polygon nodes is valid (lies in polygon interior)
+template <typename N>
+bool Earcut<N>::isValidDiagonal(Node* a, Node* b) {
+    return a->next->i != b->i && a->prev->i != b->i && !intersectsPolygon(a, b) && // dones't intersect other edges
+           ((locallyInside(a, b) && locallyInside(b, a) && middleInside(a, b) && // locally visible
+            (area(a->prev, a, b->prev) != 0.0 || area(a, b->prev, b) != 0.0)) || // does not create opposite-facing sectors
+            (equals(a, b) && area(a->prev, a, a->next) > 0 && area(b->prev, b, b->next) > 0)); // special zero-length case
+}
+
+// signed area of a triangle
+template <typename N>
+double Earcut<N>::area(const Node* p, const Node* q, const Node* r) const {
+    return (q->y - p->y) * (r->x - q->x) - (q->x - p->x) * (r->y - q->y);
+}
+
+// check if two points are equal
+template <typename N>
+bool Earcut<N>::equals(const Node* p1, const Node* p2) {
+    return p1->x == p2->x && p1->y == p2->y;
+}
+
+// check if two segments intersect
+template <typename N>
+bool Earcut<N>::intersects(const Node* p1, const Node* q1, const Node* p2, const Node* q2) {
+    int o1 = sign(area(p1, q1, p2));
+    int o2 = sign(area(p1, q1, q2));
+    int o3 = sign(area(p2, q2, p1));
+    int o4 = sign(area(p2, q2, q1));
+
+    if (o1 != o2 && o3 != o4) return true; // general case
+
+    if (o1 == 0 && onSegment(p1, p2, q1)) return true; // p1, q1 and p2 are collinear and p2 lies on p1q1
+    if (o2 == 0 && onSegment(p1, q2, q1)) return true; // p1, q1 and q2 are collinear and q2 lies on p1q1
+    if (o3 == 0 && onSegment(p2, p1, q2)) return true; // p2, q2 and p1 are collinear and p1 lies on p2q2
+    if (o4 == 0 && onSegment(p2, q1, q2)) return true; // p2, q2 and q1 are collinear and q1 lies on p2q2
+
+    return false;
+}
+
+// for collinear points p, q, r, check if point q lies on segment pr
+template <typename N>
+bool Earcut<N>::onSegment(const Node* p, const Node* q, const Node* r) {
+    return q->x <= std::max<double>(p->x, r->x) &&
+        q->x >= std::min<double>(p->x, r->x) &&
+        q->y <= std::max<double>(p->y, r->y) &&
+        q->y >= std::min<double>(p->y, r->y);
+}
+
+template <typename N>
+int Earcut<N>::sign(double val) {
+    return (0.0 < val) - (val < 0.0);
+}
+
+// check if a polygon diagonal intersects any polygon segments
+template <typename N>
+bool Earcut<N>::intersectsPolygon(const Node* a, const Node* b) {
+    const Node* p = a;
+    do {
+        if (p->i != a->i && p->next->i != a->i && p->i != b->i && p->next->i != b->i &&
+                intersects(p, p->next, a, b)) return true;
+        p = p->next;
+    } while (p != a);
+
+    return false;
+}
+
+// check if a polygon diagonal is locally inside the polygon
+template <typename N>
+bool Earcut<N>::locallyInside(const Node* a, const Node* b) {
+    return area(a->prev, a, a->next) < 0 ?
+        area(a, b, a->next) >= 0 && area(a, a->prev, b) >= 0 :
+        area(a, b, a->prev) < 0 || area(a, a->next, b) < 0;
+}
+
+// check if the middle Vertex of a polygon diagonal is inside the polygon
+template <typename N>
+bool Earcut<N>::middleInside(const Node* a, const Node* b) {
+    const Node* p = a;
+    bool inside = false;
+    double px = (a->x + b->x) / 2;
+    double py = (a->y + b->y) / 2;
+    do {
+        if (((p->y > py) != (p->next->y > py)) && p->next->y != p->y &&
+                (px < (p->next->x - p->x) * (py - p->y) / (p->next->y - p->y) + p->x))
+            inside = !inside;
+        p = p->next;
+    } while (p != a);
+
+    return inside;
+}
+
+// link two polygon vertices with a bridge; if the vertices belong to the same ring, it splits
+// polygon into two; if one belongs to the outer ring and another to a hole, it merges it into a
+// single ring
+template <typename N>
+typename Earcut<N>::Node*
+Earcut<N>::splitPolygon(Node* a, Node* b) {
+    Node* a2 = nodes.construct(a->i, a->x, a->y);
+    Node* b2 = nodes.construct(b->i, b->x, b->y);
+    Node* an = a->next;
+    Node* bp = b->prev;
+
+    a->next = b;
+    b->prev = a;
+
+    a2->next = an;
+    an->prev = a2;
+
+    b2->next = a2;
+    a2->prev = b2;
+
+    bp->next = b2;
+    b2->prev = bp;
+
+    return b2;
+}
+
+// create a node and util::optionally link it with previous one (in a circular doubly linked list)
+template <typename N> template <typename Point>
+typename Earcut<N>::Node*
+Earcut<N>::insertNode(std::size_t i, const Point& pt, Node* last) {
+    Node* p = nodes.construct(static_cast<N>(i), util::nth<0, Point>::get(pt), util::nth<1, Point>::get(pt));
+
+    if (!last) {
+        p->prev = p;
+        p->next = p;
+
+    } else {
+        assert(last);
+        p->next = last->next;
+        p->prev = last;
+        last->next->prev = p;
+        last->next = p;
+    }
+    return p;
+}
+
+template <typename N>
+void Earcut<N>::removeNode(Node* p) {
+    p->next->prev = p->prev;
+    p->prev->next = p->next;
+
+    if (p->prevZ) p->prevZ->nextZ = p->nextZ;
+    if (p->nextZ) p->nextZ->prevZ = p->prevZ;
+}
+}
+
+template <typename N = uint32_t, typename Polygon>
+std::vector<N> earcut(const Polygon& poly) {
+    mapbox::detail::Earcut<N> earcut;
+    earcut(poly);
+    return std::move(earcut.indices);
+}
+}
diff --git a/contrib/meshlab/README.md b/contrib/meshlab/README.md
new file mode 100644
index 000000000..13a06bda6
--- /dev/null
+++ b/contrib/meshlab/README.md
@@ -0,0 +1,11 @@
+# meshlab
+Meshlab project cloned in entirety but only using two files: "Parser" and "Scanner" in order to
+reformat .wrl/.x3dv files as .xml
+
+## Automatic repo clone
+Meshlab repo is automatically cloned.  Users who haven't opted-in to VRML support
+won't be burdened with the extra download volume.
+
+To update the git commit hash pulled down, modify `Meshlab_GIT_TAG` in file
+`code/CMakeLists.txt`; it is not expected that the sole files of interest "Parser" and "Scanner"
+will change frequently, if at all, going forward
diff --git a/contrib/meshlab/patches/README.md b/contrib/meshlab/patches/README.md
new file mode 100644
index 000000000..992d7f57b
--- /dev/null
+++ b/contrib/meshlab/patches/README.md
@@ -0,0 +1,14 @@
+# meshlab patch
+
+## Notes
+Depending on user's OS, build environment etc it may be necessary to change line endings of
+`patches/meshlab.patch` file from `CRLF` to `LF` in order for patch operation to succeed
+
+## Overview
+"Parser" based on QtXml, need to change to use pugixml
+
+## pugixml notes
+Note that it isn't possible to add an unattached pugixml Node object, modify it, then
+add it to the tree later; the node needs to be attached somewhere in the tree on instantiation
+(even if it's a temporary at root level to be removed when finished) before populating, adding
+children etc.
diff --git a/contrib/meshlab/patches/meshlab.patch b/contrib/meshlab/patches/meshlab.patch
new file mode 100644
index 000000000..cb6763ef1
--- /dev/null
+++ b/contrib/meshlab/patches/meshlab.patch
@@ -0,0 +1,1191 @@
+diff -rupN -x .git autoclone/meshlab_repo-src/CMakeLists.txt meshlab_repo_patch/CMakeLists.txt
+--- autoclone/meshlab_repo-src/CMakeLists.txt	2024-12-06 18:01:10.831623800 -0800
++++ meshlab_repo_patch/CMakeLists.txt	2024-12-06 18:15:09.647799500 -0800
+@@ -16,4 +16,6 @@ option(MESHLAB_USE_DEFAULT_BUILD_AND_INS
+ 
+ option(MESHLAB_IS_NIGHTLY_VERSION "Nightly version of meshlab will be used instead of ML_VERSION" OFF)
+ 
+-add_subdirectory(src)
+\ No newline at end of file
++# Disable meshlab project to avoid breaking assimp build (for converting VMRL (.wrl/.x3dv) files to
++# .xml format, just need to compile two source files)
++#add_subdirectory(src)
+diff -rupN -x .git autoclone/meshlab_repo-src/src/meshlabplugins/io_x3d/vrml/Parser.cpp meshlab_repo_patch/src/meshlabplugins/io_x3d/vrml/Parser.cpp
+--- autoclone/meshlab_repo-src/src/meshlabplugins/io_x3d/vrml/Parser.cpp	2024-12-06 18:01:12.268963700 -0800
++++ meshlab_repo_patch/src/meshlabplugins/io_x3d/vrml/Parser.cpp	2024-12-06 14:19:26.138842300 -0800
+@@ -32,11 +32,11 @@
+ 
+ *****************************************************************************/
+ 
++#include <vector>
+ #include <wchar.h>
+ #include "Parser.h"
+ #include "Scanner.h"
+ 
+-
+ namespace VrmlTranslator {
+ 
+ 
+@@ -95,9 +95,11 @@ bool Parser::WeakSeparator(int n, int sy
+ }
+ 
+ void Parser::VrmlTranslator() {
+-		QDomElement root = doc->createElement("X3D");
+-		QDomElement scene = doc->createElement("Scene");
+-		root.appendChild(scene);
++//		QDomElement root = doc->createElement("X3D");
++        pugi::xml_node root = doc->append_child("X3D");
++//		QDomElement scene = doc->createElement("Scene");
++//		root.appendChild(scene);
++        pugi::xml_node scene = root.append_child("Scene");
+ 		InitX3dNode();
+ 		if (la->kind == 7) {
+ 			HeaderStatement();
+@@ -108,7 +110,7 @@ void Parser::VrmlTranslator() {
+ 		ComponentStatements();
+ 		MetaStatements();
+ 		Statements(scene);
+-		doc->appendChild(root);
++//		doc->appendChild(root);
+ }
+ 
+ void Parser::HeaderStatement() {
+@@ -147,7 +149,7 @@ void Parser::MetaStatements() {
+ 		}
+ }
+ 
+-void Parser::Statements(QDomElement& parent) {
++void Parser::Statements(pugi::xml_node& parent) {
+ 		while (StartOf(1)) {
+ 			Statement(parent);
+ 		}
+@@ -173,16 +175,16 @@ void Parser::ComponentSupportLevel() {
+ }
+ 
+ void Parser::ExportStatement() {
+-		QString str;
++		std::string str;
+ 		Expect(14);
+ 		NodeNameId(str);
+ 		Expect(15);
+ 		ExportedNodeNameId();
+ }
+ 
+-void Parser::NodeNameId(QString& str) {
++void Parser::NodeNameId(std::string& str) {
+ 		Expect(1);
+-		str = QString(coco_string_create_char(t->val));
++		str = std::string(coco_string_create_char(t->val));
+ }
+ 
+ void Parser::ExportedNodeNameId() {
+@@ -190,7 +192,7 @@ void Parser::ExportedNodeNameId() {
+ }
+ 
+ void Parser::ImportStatement() {
+-		QString str;
++		std::string str;
+ 		Expect(16);
+ 		InlineNodeNameId();
+ 		Expect(17);
+@@ -217,7 +219,7 @@ void Parser::Metavalue() {
+ 		Expect(4);
+ }
+ 
+-void Parser::Statement(QDomElement& parent) {
++void Parser::Statement(pugi::xml_node& parent) {
+ 		if (StartOf(2)) {
+ 			NodeStatement(parent);
+ 		} else if (la->kind == 16) {
+@@ -231,8 +233,8 @@ void Parser::Statement(QDomElement& pare
+ 		} else SynErr(87);
+ }
+ 
+-void Parser::NodeStatement(QDomElement& parent) {
+-		QString tagName, attrValue;
++void Parser::NodeStatement(pugi::xml_node& parent) {
++		std::string tagName, attrValue;
+ 		if (la->kind == 1 || la->kind == 38) {
+ 			Node(parent, tagName, "");
+ 		} else if (la->kind == 19) {
+@@ -242,17 +244,19 @@ void Parser::NodeStatement(QDomElement&
+ 		} else if (la->kind == 20) {
+ 			Get();
+ 			NodeNameId(attrValue);
+-			std::map<QString, QString>::const_iterator iter = defNode.find(attrValue);
++			std::map<std::string, std::string>::const_iterator iter = defNode.find(attrValue);
+ 			if(iter != defNode.end())
+ 			{
+-			  QDomElement node = doc->createElement(iter->second);
+-			  node.setAttribute("USE", attrValue);
+-			  parent.appendChild(node);
++//			  QDomElement node = doc->createElement(iter->second);
++              pugi::xml_node node = parent.append_child((iter->second).c_str());
++//			  node.setAttribute("USE", attrValue);
++              node.append_attribute("USE") = attrValue.c_str();
++//			  parent.appendChild(node);
+ 			}
+ 		} else SynErr(88);
+ }
+ 
+-void Parser::ProtoStatement(QDomElement& parent) {
++void Parser::ProtoStatement(pugi::xml_node& parent) {
+ 		if (la->kind == 21) {
+ 			Proto(parent);
+ 		} else if (la->kind == 34) {
+@@ -261,7 +265,7 @@ void Parser::ProtoStatement(QDomElement&
+ }
+ 
+ void Parser::RouteStatement() {
+-		QString str;
++		std::string str;
+ 		Expect(35);
+ 		NodeNameId(str);
+ 		Expect(17);
+@@ -272,22 +276,27 @@ void Parser::RouteStatement() {
+ 		InputOnlyId(str);
+ }
+ 
+-void Parser::Node(QDomElement& parent, QString& tagName, const QString defValue) {
+-		bool flag = false; QDomElement node;
++void Parser::Node(pugi::xml_node& parent, std::string& tagName, const std::string defValue) {
++		bool flag = false; pugi::xml_node node;
+ 		if (la->kind == 1) {
+ 			NodeTypeId(tagName);
+-			std::set<QString>::const_iterator iter = proto.find(tagName);
++			std::set<std::string>::const_iterator iter = proto.find(tagName);
+ 			if (iter != proto.end())
+ 			{
+-			  node = doc->createElement("ProtoInstance");
+-			  node.setAttribute("name", tagName);
++//			  node = doc->createElement("ProtoInstance");
++              node = parent.append_child("ProtoInstance");
++//			  node.setAttribute("name", tagName);
++              node.append_attribute("name") = tagName.c_str();
+ 			  flag = true;
+ 			}
+-			else
+-			  node = doc->createElement(tagName);
++			else {
++//			  node = doc->createElement(tagName);
++              node = parent.append_child(tagName.c_str());
++            }
+ 			if (defValue != "")
+ 			{
+-			  node.setAttribute("DEF", defValue);
++//			  node.setAttribute("DEF", defValue);
++              node.append_attribute("DEF") = defValue.c_str();
+ 			  defNode[defValue] = tagName;
+ 			}
+ 			Expect(24);
+@@ -298,13 +307,14 @@ void Parser::Node(QDomElement& parent, Q
+ 			Expect(24);
+ 			ScriptBody();
+ 			Expect(25);
+-			node = doc->createElement("Script");
++//			node = doc->createElement("Script");
++            node = parent.append_child("Script");
+ 		} else SynErr(90);
+-		parent.appendChild(node);
++//		parent.appendChild(node);
+ }
+ 
+-void Parser::RootNodeStatement(QDomElement& parent) {
+-		QString tagName, attrValue;
++void Parser::RootNodeStatement(pugi::xml_node& parent) {
++		std::string tagName, attrValue;
+ 		if (la->kind == 1 || la->kind == 38) {
+ 			Node(parent, tagName, "");
+ 		} else if (la->kind == 19) {
+@@ -314,70 +324,82 @@ void Parser::RootNodeStatement(QDomEleme
+ 		} else SynErr(91);
+ }
+ 
+-void Parser::Proto(QDomElement& parent) {
+-		QString name; QDomElement node;
++void Parser::Proto(pugi::xml_node& parent) {
++//        QString name; QDomElement node;
++		std::string name; pugi::xml_node node;
+ 		Expect(21);
+ 		NodeTypeId(name);
+-		node = doc->createElement("ProtoDeclare");
+-		node.setAttribute("name", name);
++//		node = doc->createElement("ProtoDeclare");
++        node = parent.append_child("ProtoDeclare");
++//		node.setAttribute("name", name);
++        node.append_attribute("name") = name.c_str();
+ 		proto.insert(name);
+ 		Expect(22);
+-		QDomElement interf = doc->createElement("ProtoInterface");
++//		QDomElement interf = doc->createElement("ProtoInterface");
++        pugi::xml_node interf = node.append_child("ProtoInterface");
+ 		InterfaceDeclarations(interf);
+-		node.appendChild(interf);
++//		node.appendChild(interf);
+ 		Expect(23);
+ 		Expect(24);
+-		QDomElement body = doc->createElement("ProtoBody");
++//		QDomElement body = doc->createElement("ProtoBody");
++        pugi::xml_node body = node.append_child("ProtoBody");
+ 		ProtoBody(body);
+-		node.appendChild(body);
++//		node.appendChild(body);
+ 		Expect(25);
+-		parent.appendChild(node);
++//		parent.appendChild(node);
+ }
+ 
+-void Parser::Externproto(QDomElement& parent) {
+-		QString name, url;
+-		QDomElement node = doc->createElement("ExternProtoDeclare");
++void Parser::Externproto(pugi::xml_node& parent) {
++//        QString name, url;
++		std::string name, url;
++//		QDomElement node = doc->createElement("ExternProtoDeclare");
++        pugi::xml_node node = doc->append_child("ExternProtoDeclare");
+ 		Expect(34);
+ 		NodeTypeId(name);
+ 		Expect(22);
+ 		ExternInterfaceDeclarations(node);
+ 		Expect(23);
+ 		URLList(url);
+-		std::set<QString>::const_iterator iter = x3dNode.find(name);
++		std::set<std::string>::const_iterator iter = x3dNode.find(name);
+ 		if (iter == x3dNode.end())
+ 		{
+-		  node.setAttribute("name", name);
+-		  node.setAttribute("url", url);
+-		  parent.appendChild(node);
++//		  node.setAttribute("name", name);
++          node.append_attribute("name") = name.c_str();
++//		  node.setAttribute("url", url);
++          node.append_attribute("url") = url.c_str();
++//		  parent.appendChild(node);
++          parent.append_copy(node);
+ 		  proto.insert(name);
+ 		}
++        doc->remove_child(node);
+ }
+ 
+-void Parser::ProtoStatements(QDomElement& parent) {
++void Parser::ProtoStatements(pugi::xml_node& parent) {
+ 		while (la->kind == 21 || la->kind == 34) {
+ 			ProtoStatement(parent);
+ 		}
+ }
+ 
+-void Parser::NodeTypeId(QString& str) {
++void Parser::NodeTypeId(std::string& str) {
+ 		Expect(1);
+-		str = QString(coco_string_create_char(t->val));
++		str = std::string(coco_string_create_char(t->val));
+ }
+ 
+-void Parser::InterfaceDeclarations(QDomElement& parent) {
++void Parser::InterfaceDeclarations(pugi::xml_node& parent) {
+ 		while (StartOf(3)) {
+ 			InterfaceDeclaration(parent);
+ 		}
+ }
+ 
+-void Parser::ProtoBody(QDomElement& parent) {
++void Parser::ProtoBody(pugi::xml_node& parent) {
+ 		ProtoStatements(parent);
+ 		RootNodeStatement(parent);
+ 		Statements(parent);
+ }
+ 
+-void Parser::InterfaceDeclaration(QDomElement& parent) {
+-		QString name, type, val; QDomElement node;
++void Parser::InterfaceDeclaration(pugi::xml_node& parent) {
++//        QString name, type, val; QDomElement node;
++		std::string name, type, val; pugi::xml_node node;
+ 		if (StartOf(4)) {
+ 			RestrictedInterfaceDeclaration(parent);
+ 		} else if (la->kind == 32 || la->kind == 33) {
+@@ -388,18 +410,23 @@ void Parser::InterfaceDeclaration(QDomEl
+ 			}
+ 			FieldType(type);
+ 			FieldId(name);
++            node = parent.append_child("field");
+ 			FieldValue(node, "value", false);
+-			node = doc->createElement("field");
+-			node.setAttribute("name", name);
+-			node.setAttribute("type", type);
+-			node.setAttribute("accessType", "inputOutput");
+-			parent.appendChild(node);
++//			node = doc->createElement("field");
++//			node.setAttribute("name", name);
++            node.append_attribute("name") = name.c_str();
++//			node.setAttribute("type", type);
++            node.append_attribute("type") = type.c_str();
++//			node.setAttribute("accessType", "inputOutput");
++            node.append_attribute("accessType") = "inputOutput";
++//			parent.appendChild(node);
+ 		} else SynErr(92);
+ }
+ 
+-void Parser::RestrictedInterfaceDeclaration(QDomElement& parent) {
+-		QString name; QString type; QString val;
+-		QDomElement node = doc->createElement("field");
++void Parser::RestrictedInterfaceDeclaration(pugi::xml_node& parent) {
++		std::string name; std::string type; std::string val;
++//		QDomElement node = doc->createElement("field");
++        pugi::xml_node node = parent.append_child("field");
+ 		if (la->kind == 26 || la->kind == 27) {
+ 			if (la->kind == 26) {
+ 				Get();
+@@ -408,7 +435,8 @@ void Parser::RestrictedInterfaceDeclarat
+ 			}
+ 			FieldType(type);
+ 			InputOnlyId(name);
+-			node.setAttribute("accessType", "inputOnly");
++//			node.setAttribute("accessType", "inputOnly");
++            node.append_attribute("accessType") = "inputOnly";
+ 		} else if (la->kind == 28 || la->kind == 29) {
+ 			if (la->kind == 28) {
+ 				Get();
+@@ -417,7 +445,8 @@ void Parser::RestrictedInterfaceDeclarat
+ 			}
+ 			FieldType(type);
+ 			OutputOnlyId(name);
+-			node.setAttribute("accessType", "outputOnly");
++//			node.setAttribute("accessType", "outputOnly");
++            node.append_attribute("accessType") = "outputOnly";
+ 		} else if (la->kind == 30 || la->kind == 31) {
+ 			if (la->kind == 30) {
+ 				Get();
+@@ -427,14 +456,17 @@ void Parser::RestrictedInterfaceDeclarat
+ 			FieldType(type);
+ 			InitializeOnlyId(name);
+ 			FieldValue(node, "value", false);
+-			node.setAttribute("accessType", "initializeOnly");
++//			node.setAttribute("accessType", "initializeOnly");
++            node.append_attribute("accessType") = "initializeOnly";
+ 		} else SynErr(93);
+-		node.setAttribute("name", name);
+-		node.setAttribute("type", type);
+-		parent.appendChild(node);
++//		node.setAttribute("name", name);
++        node.append_attribute("name") = name.c_str();
++//		node.setAttribute("type", type);
++        node.append_attribute("type") = type.c_str();
++//		parent.appendChild(node);
+ }
+ 
+-void Parser::FieldType(QString& str) {
++void Parser::FieldType(std::string& str) {
+ 		switch (la->kind) {
+ 		case 40: {
+ 			Get();
+@@ -606,25 +638,25 @@ void Parser::FieldType(QString& str) {
+ 		}
+ 		default: SynErr(94); break;
+ 		}
+-		str = QString(coco_string_create_char(t->val));
++		str = std::string(coco_string_create_char(t->val));
+ }
+ 
+-void Parser::InputOnlyId(QString& str) {
++void Parser::InputOnlyId(std::string& str) {
+ 		Expect(1);
+-		str = QString(coco_string_create_char(t->val));
++		str = std::string(coco_string_create_char(t->val));
+ }
+ 
+-void Parser::OutputOnlyId(QString& str) {
++void Parser::OutputOnlyId(std::string& str) {
+ 		Expect(1);
+-		str = QString(coco_string_create_char(t->val));
++		str = std::string(coco_string_create_char(t->val));
+ }
+ 
+-void Parser::InitializeOnlyId(QString& str) {
++void Parser::InitializeOnlyId(std::string& str) {
+ 		Expect(1);
+-		str = QString(coco_string_create_char(t->val));
++		str = std::string(coco_string_create_char(t->val));
+ }
+ 
+-void Parser::FieldValue(QDomElement& parent, QString fieldName, bool flag) {
++void Parser::FieldValue(pugi::xml_node& parent, std::string fieldName, bool flag) {
+ 		if (StartOf(5)) {
+ 			SingleValue(parent, fieldName, flag);
+ 		} else if (la->kind == 22) {
+@@ -632,21 +664,21 @@ void Parser::FieldValue(QDomElement& par
+ 		} else SynErr(95);
+ }
+ 
+-void Parser::FieldId(QString& str) {
++void Parser::FieldId(std::string& str) {
+ 		Expect(1);
+-		str = QString(coco_string_create_char(t->val));
++		str = std::string(coco_string_create_char(t->val));
+ }
+ 
+-void Parser::ExternInterfaceDeclarations(QDomElement& parent) {
++void Parser::ExternInterfaceDeclarations(pugi::xml_node& parent) {
+ 		while (StartOf(3)) {
+ 			ExternInterfaceDeclaration(parent);
+ 		}
+ }
+ 
+-void Parser::URLList(QString& url) {
++void Parser::URLList(std::string& url) {
+ 		if (la->kind == 4) {
+ 			Get();
+-			url = QString(coco_string_create_char(t->val));
++			url = std::string(coco_string_create_char(t->val));
+ 		} else if (la->kind == 22) {
+ 			Get();
+ 			while (la->kind == 4) {
+@@ -660,9 +692,10 @@ void Parser::URLList(QString& url) {
+ 		} else SynErr(96);
+ }
+ 
+-void Parser::ExternInterfaceDeclaration(QDomElement& parent) {
+-		QString type, name;
+-		QDomElement node = doc->createElement("field");
++void Parser::ExternInterfaceDeclaration(pugi::xml_node& parent) {
++		std::string type, name;
++//		QDomElement node = doc->createElement("field");
++        pugi::xml_node node = parent.append_child("field");
+ 		if (la->kind == 26 || la->kind == 27) {
+ 			if (la->kind == 26) {
+ 				Get();
+@@ -671,7 +704,8 @@ void Parser::ExternInterfaceDeclaration(
+ 			}
+ 			FieldType(type);
+ 			InputOnlyId(name);
+-			node.setAttribute("accessType", "inputOnly");
++//			node.setAttribute("accessType", "inputOnly");
++            node.append_attribute("accessType") = "inputOnly";
+ 		} else if (la->kind == 28 || la->kind == 29) {
+ 			if (la->kind == 28) {
+ 				Get();
+@@ -680,7 +714,8 @@ void Parser::ExternInterfaceDeclaration(
+ 			}
+ 			FieldType(type);
+ 			OutputOnlyId(name);
+-			node.setAttribute("accessType", "outputOnly");
++//			node.setAttribute("accessType", "outputOnly");
++            node.append_attribute("accessType") = "outputOnly";
+ 		} else if (la->kind == 30 || la->kind == 31) {
+ 			if (la->kind == 30) {
+ 				Get();
+@@ -689,7 +724,8 @@ void Parser::ExternInterfaceDeclaration(
+ 			}
+ 			FieldType(type);
+ 			InitializeOnlyId(name);
+-			node.setAttribute("accessType", "initializeOnly");
++//			node.setAttribute("accessType", "initializeOnly");
++            node.append_attribute("accessType") = "initializeOnly";
+ 		} else if (la->kind == 32 || la->kind == 33) {
+ 			if (la->kind == 32) {
+ 				Get();
+@@ -698,14 +734,17 @@ void Parser::ExternInterfaceDeclaration(
+ 			}
+ 			FieldType(type);
+ 			FieldId(name);
+-			node.setAttribute("accessType", "inputOutput");
++//			node.setAttribute("accessType", "inputOutput");
++            node.append_attribute("accessType") = "inputOutput";
+ 		} else SynErr(97);
+-		node.setAttribute("name" , name);
+-		node.setAttribute("type", type);
+-		parent.appendChild(node);
++//		node.setAttribute("name" , name);
++        node.append_attribute("name") = name.c_str();
++//		node.setAttribute("type", type);
++        node.append_attribute("type") = type.c_str();
++//		parent.appendChild(node);
+ }
+ 
+-void Parser::NodeBody(QDomElement& parent, bool flag) {
++void Parser::NodeBody(pugi::xml_node& parent, bool flag) {
+ 		while (StartOf(6)) {
+ 			NodeBodyElement(parent, flag);
+ 		}
+@@ -717,24 +756,29 @@ void Parser::ScriptBody() {
+ 		}
+ }
+ 
+-void Parser::NodeBodyElement(QDomElement& parent, bool flag) {
+-		QString idName, idProto; QDomElement node;
++void Parser::NodeBodyElement(pugi::xml_node& parent, bool flag) {
++//        QString idName, idProto; QDomElement node;
++		std::string idName, idProto; pugi::xml_node node;
+ 		if (la->kind == 1) {
+ 			Get();
+-			idName = QString(coco_string_create_char(t->val));
++			idName = std::string(coco_string_create_char(t->val));
+ 			if (StartOf(8)) {
+ 				FieldValue(parent, idName, flag);
+ 			} else if (la->kind == 39) {
+ 				Get();
+ 				Expect(1);
+-				idProto = QString(coco_string_create_char(t->val));
+-				node = doc->createElement("IS");
+-				QDomElement connect = doc->createElement("connect");
+-				connect.setAttribute("nodeField", idName);
+-				connect.setAttribute("protoField", idProto);
+-				node.appendChild(connect);
+-				parent.appendChild(node);
+-				
++				idProto = std::string(coco_string_create_char(t->val));
++//				node = doc->createElement("IS");
++                node = parent.append_child("IS");
++//				QDomElement connect = doc->createElement("connect");
++                pugi::xml_node connect = node.append_child("connect");
++//				connect.setAttribute("nodeField", idName);
++                connect.append_attribute("nodeField") = idName.c_str();
++//				connect.setAttribute("protoField", idProto);
++                connect.append_attribute("protoField") = idProto.c_str();
++//				node.appendChild(connect);
++//				parent.appendChild(node);
++
+ 			} else SynErr(98);
+ 		} else if (la->kind == 35) {
+ 			RouteStatement();
+@@ -744,7 +788,7 @@ void Parser::NodeBodyElement(QDomElement
+ }
+ 
+ void Parser::ScriptBodyElement() {
+-		QString str; QDomElement elem;
++		std::string str; pugi::xml_node elem;
+ 		if (StartOf(6)) {
+ 			NodeBodyElement(elem, false);
+ 		} else if (la->kind == 26 || la->kind == 27) {
+@@ -798,17 +842,21 @@ void Parser::ScriptBodyElement() {
+ 		} else SynErr(101);
+ }
+ 
+-void Parser::InputOutputId(QString& str) {
++void Parser::InputOutputId(std::string& str) {
+ 		Expect(1);
+-		str = QString(coco_string_create_char(t->val));
++		str = std::string(coco_string_create_char(t->val));
+ }
+ 
+-void Parser::SingleValue(QDomElement& parent, QString fieldName, bool flag) {
+-		QString value; QDomElement tmpParent = doc->createElement("tmp");
++void Parser::SingleValue(pugi::xml_node& parent, std::string fieldName, bool flag) {
++//        QString value; QDomElement tmpParent = doc->createElement("tmp");
++		std::string value; pugi::xml_node tmpParent = doc->append_child("tmpParent");
+ 		if (StartOf(9)) {
+ 			if (la->kind == 4) {
+ 				Get();
+-				value.append(coco_string_create_char(t->val)); value.remove("\"");
++				value.append(coco_string_create_char(t->val)); //value.remove("\"");
++                // TODO: modify quotation removal; below violates const-correctness:
++                //   error: cannot convert ‘std::__cxx11::basic_string<char>::iterator’ to ‘const char*’
++//                value.erase(std::remove(value.begin(), value.end(), '"'), value.end());
+ 			} else if (la->kind == 2 || la->kind == 3) {
+ 				if (la->kind == 2) {
+ 					Get();
+@@ -839,29 +887,41 @@ void Parser::SingleValue(QDomElement& pa
+ 			}
+ 			if (flag)
+ 			{
+-			  QDomElement node = doc->createElement("fieldValue");
+-			  node.setAttribute("name", fieldName);
+-			  node.setAttribute("value", value);
+-			  parent.appendChild(node);
+-			}
+-			else
+-			  parent.setAttribute(fieldName, value);
++//			  QDomElement node = doc->createElement("fieldValue");
++              pugi::xml_node node = parent.append_child("fieldValue");
++//			  node.setAttribute("name", fieldName);
++              node.append_attribute("name") = fieldName.c_str();
++//			  node.setAttribute("value", value);
++              node.append_attribute("value") = value.c_str();
++//			  parent.appendChild(node);
++			}
++			else {
++//			  parent.setAttribute(fieldName, value);
++              parent.append_attribute(fieldName.c_str()) = value.c_str();
++            }
+ 		} else if (StartOf(2)) {
+ 			NodeStatement(tmpParent);
+ 			if (flag)
+ 			{
+-			  QDomElement tmp = doc->createElement("fieldValue");
+-			  tmp.setAttribute("name", fieldName);
+-			  tmp.appendChild(tmpParent.firstChildElement());
+-			  parent.appendChild(tmp);
+-			}
+-			else
+-			  parent.appendChild(tmpParent.firstChildElement());
++//			  QDomElement tmp = doc->createElement("fieldValue");
++              pugi::xml_node tmp = parent.append_child("fieldValue");
++//			  tmp.setAttribute("name", fieldName);
++              tmp.append_attribute("name") = fieldName.c_str();
++//			  tmp.appendChild(tmpParent.firstChildElement());
++              tmp.insert_child_before(pugi::node_element, tmpParent.first_child());
++//			  parent.appendChild(tmp);
++			}
++			else {
++//              parent.appendChild(tmpParent.firstChildElement());
++              parent.append_copy(tmpParent.first_child());
++            }
+ 		} else SynErr(102);
++        doc->remove_child(tmpParent);
+ }
+ 
+-void Parser::MultiValue(QDomElement& parent, QString fieldName, bool flag) {
+-		QString value; QDomElement tmpParent = doc->createElement("tmp");
++void Parser::MultiValue(pugi::xml_node& parent, std::string fieldName, bool flag) {
++//        QString value; QDomElement tmpParent = doc->createElement("tmp");
++		std::string value; pugi::xml_node tmpParent = doc->append_child("tmpParent");
+ 		Expect(22);
+ 		if (StartOf(10)) {
+ 			if (la->kind == 2 || la->kind == 3) {
+@@ -873,14 +933,19 @@ void Parser::MultiValue(QDomElement& par
+ 			}
+ 			if (flag)
+ 			{
+-			  QDomElement tmp = doc->createElement("fieldValue");
+-			  tmp.setAttribute("name", fieldName);
+-			  tmp.setAttribute("value", value);
+-			  parent.appendChild(tmp);
+-			}
+-			else
+-			  parent.setAttribute(fieldName, value);
+-			
++//			  QDomElement tmp = doc->createElement("fieldValue");
++              pugi::xml_node tmp = parent.append_child("fieldValue");
++//			  tmp.setAttribute("name", fieldName);
++              tmp.append_attribute("name") = fieldName.c_str();
++//			  tmp.setAttribute("value", value);
++              tmp.append_attribute("value") = value.c_str();
++//			  parent.appendChild(tmp);
++			}
++			else {
++//              parent.setAttribute(fieldName, value);
++              parent.append_attribute(fieldName.c_str()) = value.c_str();
++            }
++
+ 		} else if (StartOf(11)) {
+ 			while (StartOf(2)) {
+ 				NodeStatement(tmpParent);
+@@ -888,28 +953,41 @@ void Parser::MultiValue(QDomElement& par
+ 					Get();
+ 				}
+ 			}
+-			QDomElement child;
+-			QDomNodeList list = tmpParent.childNodes();
+-			QDomElement field = doc->createElement("field");
+-			field.setAttribute("name", fieldName);
+-			int i = 0;
++//			QDomElement child;
++            pugi::xml_node child;
++//			QDomNodeList list = tmpParent.childNodes();
++            std::vector<pugi::xml_node> list;
++            for (auto item : tmpParent.children()) {
++                list.push_back(item);
++            }
++//			QDomElement field = doc->createElement("field");
++            pugi::xml_node field = parent.append_child("field");
++//			field.setAttribute("name", fieldName);
++            field.append_attribute("name") = fieldName.c_str();
++			unsigned int i = 0;
+ 			while(i < list.size())
+ 			{
+-			  child = list.at(i).toElement();
+-			  if (flag)
+-			    field.appendChild(child.cloneNode());
+-			  else
+-			    parent.appendChild(child.cloneNode());
++			  child = list.at(i);//.toElement();
++			  if (flag) {
++//                field.appendChild(child.cloneNode());
++                  field.append_copy(child);
++              } else {
++//                parent.appendChild(child.cloneNode());
++                  parent.append_copy(child);
++              }
+ 			  i++;
+ 			}
+-			if (flag)
+-			  parent.appendChild(field);
+-			
++			if (flag) {
++//              parent.appendChild(field);
++            } else {
++                parent.remove_child(field);
++            }
+ 		} else SynErr(103);
+ 		Expect(23);
++        doc->remove_child(tmpParent);
+ }
+ 
+-void Parser::MultiNumber(QString& value) {
++void Parser::MultiNumber(std::string& value) {
+ 		if (la->kind == 2) {
+ 			Get();
+ 		} else if (la->kind == 3) {
+@@ -932,7 +1010,7 @@ void Parser::MultiNumber(QString& value)
+ 		}
+ }
+ 
+-void Parser::MultiString(QString& value) {
++void Parser::MultiString(std::string& value) {
+ 		Expect(4);
+ 		value.append(coco_string_create_char(t->val));
+ 		if (la->kind == 37) {
+@@ -947,7 +1025,7 @@ void Parser::MultiString(QString& value)
+ 		}
+ }
+ 
+-void Parser::MultiBool(QString& value) {
++void Parser::MultiBool(std::string& value) {
+ 		if (la->kind == 82) {
+ 			Get();
+ 		} else if (la->kind == 84) {
+@@ -1173,7 +1251,7 @@ void Errors::Warning(const wchar_t *s) {
+ }
+ 
+ void Errors::Exception(const wchar_t* s) {
+-	wprintf(L"%ls", s); 
++	wprintf(L"%ls", s);
+ 	exit(1);
+ }
+ */
+diff -rupN -x .git autoclone/meshlab_repo-src/src/meshlabplugins/io_x3d/vrml/Parser.h meshlab_repo_patch/src/meshlabplugins/io_x3d/vrml/Parser.h
+--- autoclone/meshlab_repo-src/src/meshlabplugins/io_x3d/vrml/Parser.h	2024-12-06 18:01:12.268963700 -0800
++++ meshlab_repo_patch/src/meshlabplugins/io_x3d/vrml/Parser.h	2024-12-06 18:48:17.891284300 -0800
+@@ -35,9 +35,10 @@
+ #if !defined(VRML_PARSER_H__)
+ #define VRML_PARSER_H__
+ 
+-#include <QtXml>
++#include "contrib/pugixml/src/pugixml.hpp"
++#include <map>
+ #include <set>
+-
++#include <string>
+ 
+ #include "Scanner.h"
+ 
+@@ -48,7 +49,7 @@ class Errors {
+ public:
+ 	int count;			// number of errors detected
+ 	wchar_t* stringError;
+-	
++
+ 	Errors();
+ 	~Errors();
+ 	void SynErr(int line, int col, int n);
+@@ -90,14 +91,15 @@ public:
+ 	Token *t;			// last recognized token
+ 	Token *la;			// lookahead token
+ 
+-QDomDocument *doc;
+-	
+-	std::map<QString, QString> defNode;
+-	
+-	std::set<QString> proto;
+-	
+-	std::set<QString> x3dNode;
+-	
++    pugi::xml_document doc_;
++    pugi::xml_document *doc = &doc_; // IrrXMLReader* createIrrXMLReader(const char* filename);
++
++    std::map<std::string, std::string> defNode;
++
++	std::set<std::string> proto;
++
++	std::set<std::string> x3dNode;
++
+ 	void InitX3dNode()
+ 	{
+ 	  x3dNode.insert("Arc2D"); x3dNode.insert("ArcClose2D"); x3dNode.insert("BallJoint");
+@@ -116,7 +118,7 @@ QDomDocument *doc;
+ 	  x3dNode.insert("EspduTransform"); x3dNode.insert("ExplosionEmitter");
+ 	  x3dNode.insert("FillProperties"); x3dNode.insert("FloatVertexAttribute");
+ 	  x3dNode.insert("FogCoordinate"); x3dNode.insert(" GeneratedCubeMapTexture");
+-	  x3dNode.insert("GeoCoordinate"); x3dNode.insert("GeoElevationGrid"); x3dNode.insert("GeoLocation"); 
++	  x3dNode.insert("GeoCoordinate"); x3dNode.insert("GeoElevationGrid"); x3dNode.insert("GeoLocation");
+ 	  x3dNode.insert("GeoLOD"); x3dNode.insert("GeoMetadata"); x3dNode.insert("GeoOrigin");
+ 	  x3dNode.insert("GeoPositionInterpolator"); x3dNode.insert("GeoProximitySensor");
+ 	  x3dNode.insert("GeoTouchSensor"); x3dNode.insert("GeoViewpoint");	x3dNode.insert("GravityPhysicsModel");
+@@ -128,7 +130,7 @@ QDomDocument *doc;
+ 	  x3dNode.insert("Layer"); x3dNode.insert("LayerSet"); x3dNode.insert("Layout");
+ 	  x3dNode.insert("LayoutGroup"); x3dNode.insert("LayoutLayer"); x3dNode.insert("LinePicker");
+ 	  x3dNode.insert("LineProperties"); x3dNode.insert("LineSet"); x3dNode.insert("LoadSensor");
+-	  x3dNode.insert("LocalFog"); x3dNode.insert("Material"); x3dNode.insert("Matrix3VertexAttribute"); 
++	  x3dNode.insert("LocalFog"); x3dNode.insert("Material"); x3dNode.insert("Matrix3VertexAttribute");
+ 	  x3dNode.insert("Matrix4VertexAttribute"); x3dNode.insert("MetadataDouble");
+ 	  x3dNode.insert("MetadataFloat"); x3dNode.insert("MetadataInteger"); x3dNode.insert("MetadataSet");
+ 	  x3dNode.insert("MetadataString"); x3dNode.insert("MotorJoint"); x3dNode.insert("MultiTexture");
+@@ -162,7 +164,7 @@ QDomDocument *doc;
+ 	  x3dNode.insert(" Viewpoint"); x3dNode.insert("ViewpointGroup"); x3dNode.insert("VolumeEmitter");
+ 	  x3dNode.insert("VolumePicker"); x3dNode.insert("WindPhysicsModel"); x3dNode.insert("Cylinder"); x3dNode.insert("Sphere");
+ 	}
+-	
++
+ 
+ 
+ 	Parser(Scanner *scanner);
+@@ -174,52 +176,52 @@ QDomDocument *doc;
+ 	void ProfileStatement();
+ 	void ComponentStatements();
+ 	void MetaStatements();
+-	void Statements(QDomElement& parent);
++	void Statements(pugi::xml_node& parent);
+ 	void ProfileNameId();
+ 	void ComponentStatement();
+ 	void ComponentNameId();
+ 	void ComponentSupportLevel();
+ 	void ExportStatement();
+-	void NodeNameId(QString& str);
++	void NodeNameId(std::string& str);
+ 	void ExportedNodeNameId();
+ 	void ImportStatement();
+ 	void InlineNodeNameId();
+ 	void MetaStatement();
+ 	void Metakey();
+ 	void Metavalue();
+-	void Statement(QDomElement& parent);
+-	void NodeStatement(QDomElement& parent);
+-	void ProtoStatement(QDomElement& parent);
++	void Statement(pugi::xml_node& parent);
++	void NodeStatement(pugi::xml_node& parent);
++	void ProtoStatement(pugi::xml_node& parent);
+ 	void RouteStatement();
+-	void Node(QDomElement& parent, QString& tagName, const QString defValue);
+-	void RootNodeStatement(QDomElement& parent);
+-	void Proto(QDomElement& parent);
+-	void Externproto(QDomElement& parent);
+-	void ProtoStatements(QDomElement& parent);
+-	void NodeTypeId(QString& str);
+-	void InterfaceDeclarations(QDomElement& parent);
+-	void ProtoBody(QDomElement& parent);
+-	void InterfaceDeclaration(QDomElement& parent);
+-	void RestrictedInterfaceDeclaration(QDomElement& parent);
+-	void FieldType(QString& str);
+-	void InputOnlyId(QString& str);
+-	void OutputOnlyId(QString& str);
+-	void InitializeOnlyId(QString& str);
+-	void FieldValue(QDomElement& parent, QString fieldName, bool flag);
+-	void FieldId(QString& str);
+-	void ExternInterfaceDeclarations(QDomElement& parent);
+-	void URLList(QString& url);
+-	void ExternInterfaceDeclaration(QDomElement& parent);
+-	void NodeBody(QDomElement& parent, bool flag);
++	void Node(pugi::xml_node& parent, std::string& tagName, const std::string defValue);
++	void RootNodeStatement(pugi::xml_node& parent);
++	void Proto(pugi::xml_node& parent);
++	void Externproto(pugi::xml_node& parent);
++	void ProtoStatements(pugi::xml_node& parent);
++	void NodeTypeId(std::string& str);
++	void InterfaceDeclarations(pugi::xml_node& parent);
++	void ProtoBody(pugi::xml_node& parent);
++	void InterfaceDeclaration(pugi::xml_node& parent);
++	void RestrictedInterfaceDeclaration(pugi::xml_node& parent);
++	void FieldType(std::string& str);
++	void InputOnlyId(std::string& str);
++	void OutputOnlyId(std::string& str);
++	void InitializeOnlyId(std::string& str);
++	void FieldValue(pugi::xml_node& parent, std::string fieldName, bool flag);
++	void FieldId(std::string& str);
++	void ExternInterfaceDeclarations(pugi::xml_node& parent);
++	void URLList(std::string& url);
++	void ExternInterfaceDeclaration(pugi::xml_node& parent);
++	void NodeBody(pugi::xml_node& parent, bool flag);
+ 	void ScriptBody();
+-	void NodeBodyElement(QDomElement& parent, bool flag);
++	void NodeBodyElement(pugi::xml_node& parent, bool flag);
+ 	void ScriptBodyElement();
+-	void InputOutputId(QString& str);
+-	void SingleValue(QDomElement& parent, QString fieldName, bool flag);
+-	void MultiValue(QDomElement& parent, QString fieldName, bool flag);
+-	void MultiNumber(QString& value);
+-	void MultiString(QString& value);
+-	void MultiBool(QString& value);
++	void InputOutputId(std::string& str);
++	void SingleValue(pugi::xml_node& parent, std::string fieldName, bool flag);
++	void MultiValue(pugi::xml_node& parent, std::string fieldName, bool flag);
++	void MultiNumber(std::string& value);
++	void MultiString(std::string& value);
++	void MultiBool(std::string& value);
+ 
+ 	void Parse();
+ 
+diff -rupN -x .git autoclone/meshlab_repo-src/src/meshlabplugins/io_x3d/vrml/Scanner.cpp meshlab_repo_patch/src/meshlabplugins/io_x3d/vrml/Scanner.cpp
+--- autoclone/meshlab_repo-src/src/meshlabplugins/io_x3d/vrml/Scanner.cpp	2024-12-06 18:01:12.268963700 -0800
++++ meshlab_repo_patch/src/meshlabplugins/io_x3d/vrml/Scanner.cpp	2024-12-06 14:21:47.920443100 -0800
+@@ -39,7 +39,7 @@
+ 
+ wchar_t* coco_string_create(const wchar_t* value) {
+ 	wchar_t* data;
+-	int len = 0;
++	size_t len = 0;
+ 	if (value) { len = wcslen(value); }
+ 	data = new wchar_t[len + 1];
+ 	wcsncpy(data, value, len);
+@@ -63,7 +63,7 @@ wchar_t* coco_string_create_upper(const
+ 	if (!data) { return NULL; }
+ 
+ 	int dataLen = 0;
+-	if (data) { dataLen = wcslen(data); }
++	if (data) { dataLen = static_cast<int>(wcslen(data)); }
+ 
+ 	wchar_t *newData = new wchar_t[dataLen + 1];
+ 
+@@ -80,7 +80,7 @@ wchar_t* coco_string_create_upper(const
+ 
+ wchar_t* coco_string_create_lower(const wchar_t* data) {
+ 	if (!data) { return NULL; }
+-	int dataLen = wcslen(data);
++	int dataLen = static_cast<int>(wcslen(data));
+ 	return coco_string_create_lower(data, 0, dataLen);
+ }
+ 
+@@ -102,11 +102,11 @@ wchar_t* coco_string_create_lower(const
+ 
+ wchar_t* coco_string_create_append(const wchar_t* data1, const wchar_t* data2) {
+ 	wchar_t* data;
+-	int data1Len = 0;
+-	int data2Len = 0;
++    size_t data1Len = 0;
++    size_t data2Len = 0;
+ 
+ 	if (data1) { data1Len = wcslen(data1); }
+-	if (data2) {data2Len = wcslen(data2); }
++	if (data2) { data2Len = wcslen(data2); }
+ 
+ 	data = new wchar_t[data1Len + data2Len + 1];
+ 
+@@ -133,13 +133,13 @@ void coco_string_delete(wchar_t* &data)
+ }
+ 
+ int coco_string_length(const wchar_t* data) {
+-	if (data) { return wcslen(data); }
++	if (data) { return static_cast<int>(wcslen(data)); }
+ 	return 0;
+ }
+ 
+ bool coco_string_endswith(const wchar_t* data, const wchar_t *end) {
+-	int dataLen = wcslen(data);
+-	int endLen = wcslen(end);
++	size_t dataLen = wcslen(data);
++    size_t endLen = wcslen(end);
+ 	return (endLen <= dataLen) && (wcscmp(data + dataLen - endLen, end) == 0);
+ }
+ 
+@@ -186,8 +186,8 @@ int coco_string_hash(const wchar_t *data
+ // string handling, ascii character
+ 
+ wchar_t* coco_string_create(const char* value) {
+-	int len = 0;
+-	if (value) { len = strlen(value); }
++    int len = 0;
++	if (value) { len = static_cast<int>(strlen(value)); }
+ 	wchar_t* data = new wchar_t[len + 1];
+ 	for (int i = 0; i < len; ++i) { data[i] = (wchar_t) value[i]; }
+ 	data[len] = 0;
+@@ -240,7 +240,7 @@ Buffer::Buffer(FILE* s, bool isUserStrea
+ 		fileLen = bufLen = bufStart = 0;
+ 	}
+ 	bufCapacity = (bufLen>0) ? bufLen : MIN_BUFFER_LENGTH;
+-	buf = new unsigned char[bufCapacity];	
++	buf = new unsigned char[bufCapacity];
+ 	if (fileLen > 0) SetPos(0);          // setup  buffer to position 0 (start)
+ 	else bufPos = 0; // index 0 is already after the file, thus Pos = 0 is invalid
+ 	if (bufLen == fileLen && CanSeek()) Close();
+@@ -270,7 +270,7 @@ Buffer::Buffer(const unsigned char* buf,
+ }
+ 
+ Buffer::~Buffer() {
+-	Close(); 
++	Close();
+ 	if (buf != NULL) {
+ 		delete [] buf;
+ 		buf = NULL;
+@@ -306,12 +306,12 @@ int Buffer::Peek() {
+ 
+ wchar_t* Buffer::GetString(int beg, int end) {
+ 	int len = end - beg;
+-	wchar_t *buf = new wchar_t[len];
++	wchar_t *retBuf = new wchar_t[len];
+ 	int oldPos = GetPos();
+ 	SetPos(beg);
+-	for (int i = 0; i < len; ++i) buf[i] = (wchar_t) Read();
++	for (int i = 0; i < len; ++i) retBuf[i] = (wchar_t) Read();
+ 	SetPos(oldPos);
+-	return buf;
++	return retBuf;
+ }
+ 
+ int Buffer::GetPos() {
+@@ -329,16 +329,16 @@ void Buffer::SetPos(int value) {
+ 
+ 	if ((value < 0) || (value > fileLen)) {
+ 		char msg[50];
+-		sprintf(msg, "Buffer out of bounds access, position: %d", value);
++		snprintf(msg, 50, "Buffer out of bounds access, position: %d", value);
+ 		throw msg;
+-		
++
+ 	}
+ 
+ 	if ((value >= bufStart) && (value < (bufStart + bufLen))) { // already in buffer
+ 		bufPos = value - bufStart;
+ 	} else if (stream != NULL) { // must be swapped in
+ 		fseek(stream, value, SEEK_SET);
+-		bufLen = fread(buf, sizeof(unsigned char), bufCapacity, stream);
++		bufLen = static_cast<int>(fread(buf, sizeof(unsigned char), bufCapacity, stream));
+ 		bufStart = value; bufPos = 0;
+ 	} else {
+ 		bufPos = fileLen - bufStart; // make Pos return fileLen
+@@ -362,7 +362,7 @@ int Buffer::ReadNextStreamChunk() {
+ 		buf = newBuf;
+ 		free = bufLen;
+ 	}
+-	int read = fread(buf + bufLen, sizeof(unsigned char), free, stream);
++    int read = static_cast<int>(fread(buf + bufLen, sizeof(unsigned char), free, stream));
+ 	if (read > 0) {
+ 		fileLen = bufLen = (bufLen + read);
+ 		return read;
+@@ -416,7 +416,7 @@ Scanner::Scanner(const wchar_t* fileName
+ 	char *chFileName = coco_string_create_char(fileName);
+ 	if ((stream = fopen(chFileName, "rb")) == NULL) {
+ 		char msg[50];
+-		sprintf(msg, "Can not open file: %s", chFileName);
++		snprintf(msg, 50, "Can not open file: %s", chFileName);
+ 		coco_string_delete(chFileName);
+ 		throw msg;
+ 	}
+@@ -554,7 +554,7 @@ void Scanner::Init() {
+ 	heapEnd = (void**) (((char*) heap) + HEAP_BLOCK_SIZE);
+ 	*heapEnd = 0;
+ 	heapTop = heap;
+-	if (sizeof(Token) > HEAP_BLOCK_SIZE) {
++	if constexpr (sizeof(Token) > HEAP_BLOCK_SIZE) {
+ 		throw "Too small HEAP_BLOCK_SIZE";
+ 	}
+ 
+@@ -637,18 +637,18 @@ void Scanner::CreateHeapBlock() {
+ }
+ 
+ Token* Scanner::CreateToken() {
+-	Token *t;
++	Token *tkn;
+ 	if (((char*) heapTop + (int) sizeof(Token)) >= (char*) heapEnd) {
+ 		CreateHeapBlock();
+ 	}
+-	t = (Token*) heapTop;
++	tkn = (Token*) heapTop;
+ 	heapTop = (void*) ((char*) heapTop + sizeof(Token));
+-	t->val = NULL;
+-	t->next = NULL;
+-	return t;
++	tkn->val = NULL;
++	tkn->next = NULL;
++	return tkn;
+ }
+ 
+-void Scanner::AppendVal(Token *t) {
++void Scanner::AppendVal(Token *tkn) {
+ 	int reqMem = (tlen + 1) * sizeof(wchar_t);
+ 	if (((char*) heapTop + reqMem) >= (char*) heapEnd) {
+ 		if (reqMem > HEAP_BLOCK_SIZE) {
+@@ -656,11 +656,11 @@ void Scanner::AppendVal(Token *t) {
+ 		}
+ 		CreateHeapBlock();
+ 	}
+-	t->val = (wchar_t*) heapTop;
++	tkn->val = (wchar_t*) heapTop;
+ 	heapTop = (void*) ((char*) heapTop + reqMem);
+ 
+-	wcsncpy(t->val, tval, tlen);
+-	t->val[tlen] = L'\0';
++	wcsncpy(tkn->val, tval, tlen);
++	tkn->val[tlen] = L'\0';
+ }
+ 
+ Token* Scanner::NextToken() {
+diff -rupN -x .git autoclone/meshlab_repo-src/src/meshlabplugins/io_x3d/vrml/Scanner.h meshlab_repo_patch/src/meshlabplugins/io_x3d/vrml/Scanner.h
+--- autoclone/meshlab_repo-src/src/meshlabplugins/io_x3d/vrml/Scanner.h	2024-12-06 18:01:12.268963700 -0800
++++ meshlab_repo_patch/src/meshlabplugins/io_x3d/vrml/Scanner.h	2024-12-06 14:21:59.453748300 -0800
+@@ -52,9 +52,9 @@
+ //#define coco_swprintf _snwprintf
+ //#elif defined __GNUC__
+ //#define coco_swprintf swprintf
+-//#else 
++//#else
+ //#error unknown compiler!
+-//#endif 
++//#endif
+ 
+ #ifdef WIN32
+   #ifndef __MINGW32__
+@@ -62,7 +62,7 @@
+       #define coco_swprintf swprintf_s
+     #elif _MSC_VER >= 1300
+        #define coco_swprintf _snwprintf
+-    #else 
++    #else
+        #error unknown compiler!
+     #endif
+    #else
+@@ -106,7 +106,7 @@ void  coco_string_delete(char* &data);
+ namespace VrmlTranslator {
+ 
+ 
+-class Token  
++class Token
+ {
+ public:
+ 	int kind;     // token kind
+@@ -135,10 +135,10 @@ private:
+ 	int bufPos;         // current position in buffer
+ 	FILE* stream;       // input stream (seekable)
+ 	bool isUserStream;  // was the stream opened by the user?
+-	
++
+ 	int ReadNextStreamChunk();
+ 	bool CanSeek();     // true if stream can seek otherwise false
+-	
++
+ public:
+ 	static const int EoF = COCO_WCHAR_MAX + 1;
+ 
+@@ -146,7 +146,7 @@ public:
+ 	Buffer(const unsigned char* buf, int len);
+ 	Buffer(Buffer *b);
+ 	virtual ~Buffer();
+-	
++
+ 	virtual void Close();
+ 	virtual int Read();
+ 	virtual int Peek();
+@@ -256,7 +256,7 @@ private:
+ 	int eofSym;
+ 	int noSym;
+ 	int maxT;
+-	int charSetSize;
++//	int charSetSize; // unused
+ 	StartStates start;
+ 	KeywordMap keywords;
+ 
+@@ -277,7 +277,7 @@ private:
+ 
+ 	void CreateHeapBlock();
+ 	Token* CreateToken();
+-	void AppendVal(Token *t);
++	void AppendVal(Token *tkn);
+ 
+ 	void Init();
+ 	void NextCh();
+@@ -288,7 +288,7 @@ private:
+ 
+ public:
+ 	Buffer *buffer;   // scanner buffer
+-	
++
+ 	Scanner(const unsigned char* buf, int len);
+ 	Scanner(const wchar_t* fileName);
+ 	Scanner(FILE* s);
diff --git a/contrib/openddlparser/code/OpenDDLParser.cpp b/contrib/openddlparser/code/OpenDDLParser.cpp
index 3d7dce45e..60fddc8be 100644
--- a/contrib/openddlparser/code/OpenDDLParser.cpp
+++ b/contrib/openddlparser/code/OpenDDLParser.cpp
@@ -1,7 +1,7 @@
 /*-----------------------------------------------------------------------------------------------
 The MIT License (MIT)
 
-Copyright (c) 2014-2020 Kim Kulling
+Copyright (c) 2014-2025 Kim Kulling
 
 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
@@ -74,12 +74,11 @@ const char *getTypeToken(Value::ValueType type) {
     return Grammar::PrimitiveTypeToken[(size_t)type];
 }
 
-static void logInvalidTokenError(const char *in, const std::string &exp, OpenDDLParser::logCallback callback) {
-    if (callback) {
-        std::string full(in);
-        std::string part(full.substr(0, 50));
+static void logInvalidTokenError(const std::string &in, const std::string &exp, OpenDDLParser::logCallback callback) {
+    if (callback) {\
+        std::string part(in.substr(0, 50));
         std::stringstream stream;
-        stream << "Invalid token \"" << *in << "\" "
+        stream << "Invalid token \"" << in << "\" "
                << "(expected \"" << exp << "\") "
                << "in: \"" << part << "\"";
         callback(ddl_error_msg, stream.str());
@@ -150,7 +149,7 @@ void OpenDDLParser::logToStream(FILE *f, LogSeverity severity, const std::string
 
 OpenDDLParser::logCallback OpenDDLParser::StdLogCallback (FILE *destination) {
     using namespace std::placeholders;
-    return std::bind(logToStream, destination ? destination : stderr, _1, _2);
+    return [capture0 = destination ? destination : stderr](auto && PH1, auto && PH2) { logToStream(capture0, std::forward<decltype(PH1)>(PH1), std::forward<decltype(PH2)>(PH2)); };
 }
 
 void OpenDDLParser::setLogCallback(logCallback callback) {
@@ -290,8 +289,8 @@ char *OpenDDLParser::parseHeader(char *in, char *end) {
         if (nullptr != name && nullptr != node && nullptr != name->m_id->m_buffer) {
             const std::string nodeName(name->m_id->m_buffer);
             node->setName(nodeName);
-            delete name;
         }
+        delete name;
 
         Property *first(nullptr);
         in = lookForNextToken(in, end);
@@ -306,7 +305,7 @@ char *OpenDDLParser::parseHeader(char *in, char *end) {
                 }
 
                 if (*in != Grammar::CommaSeparator[0] && *in != Grammar::ClosePropertyToken[0]) {
-                    logInvalidTokenError(in, Grammar::ClosePropertyToken, m_logCallback);
+                    logInvalidTokenError(std::string(in, end), Grammar::ClosePropertyToken, m_logCallback);
                     return nullptr;
                 }
 
@@ -355,8 +354,7 @@ char *OpenDDLParser::parseStructure(char *in, char *end) {
                 ++in;
             }
         } else {
-            ++in;
-            logInvalidTokenError(in, std::string(Grammar::OpenBracketToken), m_logCallback);
+            logInvalidTokenError(std::string(in, end), std::string(Grammar::OpenBracketToken), m_logCallback);
             error = true;
             return nullptr;
         }
@@ -427,7 +425,7 @@ char *OpenDDLParser::parseStructureBody(char *in, char *end, bool &error) {
 
         in = lookForNextToken(in, end);
         if (in == end || *in != '}') {
-            logInvalidTokenError(in == end ? "" : in, std::string(Grammar::CloseBracketToken), m_logCallback);
+            logInvalidTokenError(std::string(in, end), std::string(Grammar::CloseBracketToken), m_logCallback);
             return nullptr;
         } else {
             //in++;
diff --git a/contrib/poly2tri/LICENSE b/contrib/poly2tri/LICENSE
index 9417c0836..dddc3ccc3 100644
--- a/contrib/poly2tri/LICENSE
+++ b/contrib/poly2tri/LICENSE
@@ -1,7 +1,6 @@
-Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
-http://code.google.com/p/poly2tri/
-
+Copyright (c) 2009-2018, Poly2Tri Contributors
 All rights reserved.
+
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
diff --git a/contrib/poly2tri/README b/contrib/poly2tri/README
deleted file mode 100644
index 883e9a581..000000000
--- a/contrib/poly2tri/README
+++ /dev/null
@@ -1,51 +0,0 @@
-==================
-INSTALLATION GUIDE
-==================
-
-------------
-Dependencies
-------------
-
-  Core poly2tri lib:
-  - Standard Template Library (STL)
-  
-  Testbed:
-  - gcc
-  - OpenGL
-  - GLFW (http://glfw.sf.net)
-  - Python
- 
-Waf (http://code.google.com/p/waf/) is used to compile the testbed.   
-A waf script (86kb) is included in the repositoty.
-
-----------------------------------------------
-Building the Testbed
-----------------------------------------------
-
-Posix/MSYS environment:
-
-  ./waf configure
-  ./waf build
-
-Windows command line:
-
-  python waf configure
-  python waf build
-
-----------------------------------------------
-Running the Examples
-----------------------------------------------
-
-Load data points from a file:
-p2t <filename> <center_x> <center_y> <zoom>
-
-Random distribution of points inside a consrained box:
-p2t random <num_points> <box_radius> <zoom>
-
-Examples:
-
-  ./p2t dude.dat 300 500 2
-  ./p2t nazca_monkey.dat 0 0 9
-  
-  ./p2t random 10 100 5.0
-  ./p2t random 1000 20000 0.025
diff --git a/contrib/poly2tri/README.md b/contrib/poly2tri/README.md
new file mode 100644
index 000000000..88a0618ea
--- /dev/null
+++ b/contrib/poly2tri/README.md
@@ -0,0 +1,101 @@
+Since there are no Input validation of the data given for triangulation you need
+to think about this. Poly2Tri does not support repeat points within epsilon.
+
+* If you have a cyclic function that generates random points make sure you don't
+  add the same coordinate twice.
+* If you are given input and aren't sure same point exist twice you need to
+  check for this yourself.
+* Only simple polygons are supported. You may add holes or interior Steiner points
+* Interior holes must not touch other holes, nor touch the polyline boundary
+* Use the library in this order:
+  1. Initialize CDT with a simple polyline (this defines the constrained edges)
+  2. Add holes if necessary (also simple polylines)
+  3. Add Steiner points
+  4. Triangulate
+
+Make sure you understand the preceding notice before posting an issue. If you have
+an issue not covered by the above, include your data-set with the problem.
+The only easy day was yesterday; have a nice day. <Mason Green>
+
+TESTBED INSTALLATION GUIDE
+==========================
+
+Dependencies
+------------
+
+Core poly2tri lib:
+
+* Standard Template Library (STL)
+
+Unit tests:
+* Boost (filesystem, test framework)
+
+Testbed:
+
+* OpenGL
+* [GLFW](http://glfw.sf.net)
+
+Build the library
+-----------------
+
+With the ninja build system installed:
+
+```
+mkdir build && cd build
+cmake -GNinja ..
+cmake --build .
+```
+
+Build and run with unit tests
+----------------------------
+
+With the ninja build system:
+
+```
+mkdir build && cd build
+cmake -GNinja -DP2T_BUILD_TESTS=ON ..
+cmake --build .
+ctest --output-on-failure
+```
+
+Build with the testbed
+-----------------
+
+```
+mkdir build && cd build
+cmake -GNinja -DP2T_BUILD_TESTBED=ON ..
+cmake --build .
+```
+
+Running the Examples
+--------------------
+
+Load data points from a file:
+```
+build/testbed/p2t <filename> <center_x> <center_y> <zoom>
+```
+Load data points from a file and automatically fit the geometry to the window:
+```
+build/testbed/p2t <filename>
+```
+Random distribution of points inside a constrained box:
+```
+build/testbed/p2t random <num_points> <box_radius> <zoom>
+```
+Examples:
+```
+build/testbed/p2t testbed/data/dude.dat 350 500 3
+
+build/testbed/p2t testbed/data/nazca_monkey.dat
+
+build/testbed/p2t random 10 100 5.0
+build/testbed/p2t random 1000 20000 0.025
+```
+
+References
+==========
+
+- Domiter V. and Zalik B. (2008) Sweep�line algorithm for constrained Delaunay triangulation
+- FlipScan by library author Thomas Åhlén
+
+![FlipScan](doc/FlipScan.png)
diff --git a/contrib/poly2tri/poly2tri/common/dll_symbol.h b/contrib/poly2tri/poly2tri/common/dll_symbol.h
new file mode 100644
index 000000000..f445cd67e
--- /dev/null
+++ b/contrib/poly2tri/poly2tri/common/dll_symbol.h
@@ -0,0 +1,61 @@
+/*
+ * Poly2Tri Copyright (c) 2009-2022, Poly2Tri Contributors
+ * https://github.com/jhasse/poly2tri
+ *
+ * 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 Poly2Tri 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.
+ */
+
+#pragma once
+
+#if defined(_MSC_VER)
+#  pragma warning( disable: 4273)
+#  define P2T_COMPILER_DLLEXPORT __declspec(dllexport)
+#  define P2T_COMPILER_DLLIMPORT __declspec(dllimport)
+#elif defined(__GNUC__)
+#  define P2T_COMPILER_DLLEXPORT __attribute__ ((visibility ("default")))
+#  define P2T_COMPILER_DLLIMPORT __attribute__ ((visibility ("default")))
+#else
+#  define P2T_COMPILER_DLLEXPORT
+#  define P2T_COMPILER_DLLIMPORT
+#endif
+
+// We need to enable shard linkage explicitely
+#ifdef ASSIMP_BUILD_DLL_EXPORT
+#  define P2T_SHARED_EXPORTS 1
+#endif
+
+#ifndef P2T_DLL_SYMBOL
+#  if defined(P2T_STATIC_EXPORTS)
+#    define P2T_DLL_SYMBOL
+#  elif defined(P2T_SHARED_EXPORTS)
+#    define P2T_DLL_SYMBOL P2T_COMPILER_DLLEXPORT
+#  elif defined(BUILD_SHARED_LIBS)
+#    define P2T_DLL_SYMBOL P2T_COMPILER_DLLIMPORT
+#  else
+#    define P2T_DLL_SYMBOL
+#  endif
+#endif
diff --git a/contrib/poly2tri/poly2tri/common/shapes.cc b/contrib/poly2tri/poly2tri/common/shapes.cc
index c94e11c03..359ef7586 100644
--- a/contrib/poly2tri/poly2tri/common/shapes.cc
+++ b/contrib/poly2tri/poly2tri/common/shapes.cc
@@ -1,6 +1,6 @@
 /*
- * Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
- * http://code.google.com/p/poly2tri/
+ * Poly2Tri Copyright (c) 2009-2018, Poly2Tri Contributors
+ * https://github.com/jhasse/poly2tri
  *
  * All rights reserved.
  *
@@ -29,14 +29,24 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "shapes.h"
+
+#include <cassert>
 #include <iostream>
 
 namespace p2t {
 
+Point::Point(double x, double y) : x(x), y(y)
+{
+}
+
+std::ostream& operator<<(std::ostream& out, const Point& point) {
+  return out << point.x << "," << point.y;
+}
+
 Triangle::Triangle(Point& a, Point& b, Point& c)
 {
   points_[0] = &a; points_[1] = &b; points_[2] = &c;
-  neighbors_[0] = NULL; neighbors_[1] = NULL; neighbors_[2] = NULL;
+  neighbors_[0] = nullptr; neighbors_[1] = nullptr; neighbors_[2] = nullptr;
   constrained_edge[0] = constrained_edge[1] = constrained_edge[2] = false;
   delaunay_edge[0] = delaunay_edge[1] = delaunay_edge[2] = false;
   interior_ = false;
@@ -76,39 +86,37 @@ void Triangle::MarkNeighbor(Triangle& t)
 void Triangle::Clear()
 {
     Triangle *t;
-    for( int i=0; i<3; i++ )
-    {
-        t = neighbors_[i];
-        if( t != NULL )
-        {
-            t->ClearNeighbor( this );
-        }
+    for (auto& neighbor : neighbors_) {
+      t = neighbor;
+      if (t != nullptr) {
+        t->ClearNeighbor(this);
+      }
     }
     ClearNeighbors();
-    points_[0]=points_[1]=points_[2] = NULL;
+    points_[0]=points_[1]=points_[2] = nullptr;
 }
 
 void Triangle::ClearNeighbor(const Triangle *triangle )
 {
     if( neighbors_[0] == triangle )
     {
-        neighbors_[0] = NULL;
+        neighbors_[0] = nullptr;
     }
     else if( neighbors_[1] == triangle )
     {
-        neighbors_[1] = NULL;
+        neighbors_[1] = nullptr;
     }
     else
     {
-        neighbors_[2] = NULL;
+        neighbors_[2] = nullptr;
     }
 }
 
 void Triangle::ClearNeighbors()
 {
-  neighbors_[0] = NULL;
-  neighbors_[1] = NULL;
-  neighbors_[2] = NULL;
+  neighbors_[0] = nullptr;
+  neighbors_[1] = nullptr;
+  neighbors_[2] = nullptr;
 }
 
 void Triangle::ClearDelunayEdges()
@@ -220,7 +228,7 @@ Point* Triangle::PointCW(const Point& point)
     return points_[1];
   }
   assert(0);
-  return NULL;
+  return nullptr;
 }
 
 // The point counter-clockwise to given point
@@ -234,7 +242,18 @@ Point* Triangle::PointCCW(const Point& point)
     return points_[0];
   }
   assert(0);
-  return NULL;
+  return nullptr;
+}
+
+// The neighbor across to given point
+Triangle* Triangle::NeighborAcross(const Point& point)
+{
+  if (&point == points_[0]) {
+    return neighbors_[0];
+  } else if (&point == points_[1]) {
+    return neighbors_[1];
+  }
+  return neighbors_[2];
 }
 
 // The neighbor clockwise to given point
@@ -343,23 +362,50 @@ void Triangle::SetDelunayEdgeCW(const Point& p, bool e)
   }
 }
 
-// The neighbor across to given point
-Triangle& Triangle::NeighborAcross(const Point& opoint)
-{
-  if (&opoint == points_[0]) {
-    return *neighbors_[0];
-  } else if (&opoint == points_[1]) {
-    return *neighbors_[1];
-  }
-  return *neighbors_[2];
-}
-
 void Triangle::DebugPrint()
 {
-  using namespace std;
-  cout << points_[0]->x << "," << points_[0]->y << " ";
-  cout << points_[1]->x << "," << points_[1]->y << " ";
-  cout << points_[2]->x << "," << points_[2]->y << endl;
+  std::cout << *points_[0] << " " << *points_[1] << " " << *points_[2] << std::endl;
 }
 
+bool Triangle::CircumcicleContains(const Point& point) const
+{
+  assert(IsCounterClockwise());
+  const double dx = points_[0]->x - point.x;
+  const double dy = points_[0]->y - point.y;
+  const double ex = points_[1]->x - point.x;
+  const double ey = points_[1]->y - point.y;
+  const double fx = points_[2]->x - point.x;
+  const double fy = points_[2]->y - point.y;
+
+  const double ap = dx * dx + dy * dy;
+  const double bp = ex * ex + ey * ey;
+  const double cp = fx * fx + fy * fy;
+
+  return (dx * (fy * bp - cp * ey) - dy * (fx * bp - cp * ex) + ap * (fx * ey - fy * ex)) < 0;
 }
+
+bool Triangle::IsCounterClockwise() const
+{
+  return (points_[1]->x - points_[0]->x) * (points_[2]->y - points_[0]->y) -
+             (points_[2]->x - points_[0]->x) * (points_[1]->y - points_[0]->y) >
+         0;
+}
+
+bool IsDelaunay(const std::vector<p2t::Triangle*>& triangles)
+{
+  for (const auto triangle : triangles) {
+    for (const auto other : triangles) {
+      if (triangle == other) {
+        continue;
+      }
+      for (int i = 0; i < 3; ++i) {
+        if (triangle->CircumcicleContains(*other->GetPoint(i))) {
+          return false;
+        }
+      }
+    }
+  }
+  return true;
+}
+
+} // namespace p2t
diff --git a/contrib/poly2tri/poly2tri/common/shapes.h b/contrib/poly2tri/poly2tri/common/shapes.h
index d3660f716..fe32a297c 100644
--- a/contrib/poly2tri/poly2tri/common/shapes.h
+++ b/contrib/poly2tri/poly2tri/common/shapes.h
@@ -1,6 +1,6 @@
 /*
- * Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
- * http://code.google.com/p/poly2tri/
+ * Poly2Tri Copyright (c) 2009-2018, Poly2Tri Contributors
+ * https://github.com/jhasse/poly2tri
  *
  * All rights reserved.
  *
@@ -29,22 +29,23 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// Include guard
-#ifndef SHAPES_H
-#define SHAPES_H
+#pragma once
 
-#include <vector>
+#include "dll_symbol.h"
+
+#include <cmath>
 #include <cstddef>
 #include <stdexcept>
-#include <assert.h>
-#include <cmath>
-#include <string>
+#include <vector>
 
+#if defined(_WIN32) && defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+#  pragma warning( disable: 4251)
+#endif
 namespace p2t {
 
 struct Edge;
 
-struct Point {
+struct P2T_DLL_SYMBOL Point {
 
   double x, y;
 
@@ -59,7 +60,7 @@ struct Point {
   std::vector<Edge*> edge_list;
 
   /// Construct using coordinates.
-  Point(double x, double y) : x(x), y(y) {}
+  Point(double x, double y);
 
   /// Set this point to all zeros.
   void set_zero()
@@ -121,8 +122,10 @@ struct Point {
 
 };
 
+P2T_DLL_SYMBOL std::ostream& operator<<(std::ostream&, const Point&);
+
 // Represents a simple polygon's edge
-struct Edge {
+struct P2T_DLL_SYMBOL Edge {
 
   Point* p, *q;
 
@@ -138,9 +141,7 @@ struct Edge {
         p = &p2;
       } else if (p1.x == p2.x) {
         // Repeat points
-        // ASSIMP_CHANGE (aramis_acg)
-        throw std::runtime_error(std::string("repeat points"));
-        //assert(false);
+        throw std::runtime_error("Edge::Edge: p1 == p2");
       }
     }
 
@@ -151,7 +152,7 @@ struct Edge {
 // Triangle-based data structures are know to have better performance than quad-edge structures
 // See: J. Shewchuk, "Triangle: Engineering a 2D Quality Mesh Generator and Delaunay Triangulator"
 //      "Triangulations in CGAL"
-class Triangle {
+class P2T_DLL_SYMBOL Triangle {
 public:
 
 /// Constructor
@@ -178,6 +179,7 @@ void MarkConstrainedEdge(Point* p, Point* q);
 int Index(const Point* p);
 int EdgeIndex(const Point* p1, const Point* p2);
 
+Triangle* NeighborAcross(const Point& point);
 Triangle* NeighborCW(const Point& point);
 Triangle* NeighborCCW(const Point& point);
 bool GetConstrainedEdgeCCW(const Point& p);
@@ -205,12 +207,14 @@ void ClearDelunayEdges();
 inline bool IsInterior();
 inline void IsInterior(bool b);
 
-Triangle& NeighborAcross(const Point& opoint);
-
 void DebugPrint();
 
+bool CircumcicleContains(const Point&) const;
+
 private:
 
+bool IsCounterClockwise() const;
+
 /// Triangle points
 Point* points_[3];
 /// Neighbor list
@@ -258,7 +262,7 @@ inline bool operator ==(const Point& a, const Point& b)
 
 inline bool operator !=(const Point& a, const Point& b)
 {
-  return !(a.x == b.x) && !(a.y == b.y);
+  return !(a.x == b.x) || !(a.y == b.y);
 }
 
 /// Peform the dot product on two vectors.
@@ -322,6 +326,7 @@ inline void Triangle::IsInterior(bool b)
   interior_ = b;
 }
 
-}
+/// Is this set a valid delaunay triangulation?
+P2T_DLL_SYMBOL bool IsDelaunay(const std::vector<p2t::Triangle*>&);
 
-#endif
+}
diff --git a/contrib/poly2tri/poly2tri/common/utils.h b/contrib/poly2tri/poly2tri/common/utils.h
index 2424c712c..c9f1c23c3 100644
--- a/contrib/poly2tri/poly2tri/common/utils.h
+++ b/contrib/poly2tri/poly2tri/common/utils.h
@@ -1,6 +1,6 @@
 /*
- * Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
- * http://code.google.com/p/poly2tri/
+ * Poly2Tri Copyright (c) 2009-2018, Poly2Tri Contributors
+ * https://github.com/jhasse/poly2tri
  *
  * All rights reserved.
  *
@@ -29,14 +29,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef UTILS_H
-#define UTILS_H
+#pragma once
 
 // Otherwise #defines like M_PI are undeclared under Visual Studio
 #define _USE_MATH_DEFINES
 
+#include "shapes.h"
+
+#include <cmath>
 #include <exception>
-#include <math.h>
 
 // C99 removes M_PI from math.h
 #ifndef M_PI
@@ -66,7 +67,11 @@ Orientation Orient2d(const Point& pa, const Point& pb, const Point& pc)
   double detleft = (pa.x - pc.x) * (pb.y - pc.y);
   double detright = (pa.y - pc.y) * (pb.x - pc.x);
   double val = detleft - detright;
-  if (val > -EPSILON && val < EPSILON) {
+
+// Using a tolerance here fails on concave-by-subepsilon boundaries
+//   if (val > -EPSILON && val < EPSILON) {
+// Using == on double makes -Wfloat-equal warnings yell at us
+  if (std::fpclassify(val) == FP_ZERO) {
     return COLLINEAR;
   } else if (val > 0) {
     return CCW;
@@ -123,5 +128,3 @@ bool InScanArea(const Point& pa, const Point& pb, const Point& pc, const Point&
 }
 
 }
-
-#endif
diff --git a/contrib/poly2tri/poly2tri/poly2tri.h b/contrib/poly2tri/poly2tri/poly2tri.h
index ba5cc159e..3d40373b0 100644
--- a/contrib/poly2tri/poly2tri/poly2tri.h
+++ b/contrib/poly2tri/poly2tri/poly2tri.h
@@ -1,6 +1,6 @@
 /*
- * Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
- * http://code.google.com/p/poly2tri/
+ * Poly2Tri Copyright (c) 2009-2018, Poly2Tri Contributors
+ * https://github.com/jhasse/poly2tri
  *
  * All rights reserved.
  *
@@ -29,10 +29,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef POLY2TRI_H
-#define POLY2TRI_H
+#pragma once
 
 #include "common/shapes.h"
 #include "sweep/cdt.h"
-
-#endif
diff --git a/contrib/poly2tri/poly2tri/sweep/advancing_front.cc b/contrib/poly2tri/poly2tri/sweep/advancing_front.cc
index 9739babce..e981bad2f 100644
--- a/contrib/poly2tri/poly2tri/sweep/advancing_front.cc
+++ b/contrib/poly2tri/poly2tri/sweep/advancing_front.cc
@@ -1,6 +1,6 @@
 /*
- * Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
- * http://code.google.com/p/poly2tri/
+ * Poly2Tri Copyright (c) 2009-2018, Poly2Tri Contributors
+ * https://github.com/jhasse/poly2tri
  *
  * All rights reserved.
  *
@@ -30,6 +30,8 @@
  */
 #include "advancing_front.h"
 
+#include <cassert>
+
 namespace p2t {
 
 AdvancingFront::AdvancingFront(Node& head, Node& tail)
@@ -44,21 +46,21 @@ Node* AdvancingFront::LocateNode(double x)
   Node* node = search_node_;
 
   if (x < node->value) {
-    while ((node = node->prev) != NULL) {
+    while ((node = node->prev) != nullptr) {
       if (x >= node->value) {
         search_node_ = node;
         return node;
       }
     }
   } else {
-    while ((node = node->next) != NULL) {
+    while ((node = node->next) != nullptr) {
       if (x < node->value) {
         search_node_ = node->prev;
         return node->prev;
       }
     }
   }
-  return NULL;
+  return nullptr;
 }
 
 Node* AdvancingFront::FindSearchNode(double x)
@@ -86,13 +88,13 @@ Node* AdvancingFront::LocatePoint(const Point* point)
       }
     }
   } else if (px < nx) {
-    while ((node = node->prev) != NULL) {
+    while ((node = node->prev) != nullptr) {
       if (point == node->point) {
         break;
       }
     }
   } else {
-    while ((node = node->next) != NULL) {
+    while ((node = node->next) != nullptr) {
       if (point == node->point)
         break;
     }
@@ -105,4 +107,4 @@ AdvancingFront::~AdvancingFront()
 {
 }
 
-}
+} // namespace p2t
diff --git a/contrib/poly2tri/poly2tri/sweep/advancing_front.h b/contrib/poly2tri/poly2tri/sweep/advancing_front.h
index 3bfec5368..ffd3fe71b 100644
--- a/contrib/poly2tri/poly2tri/sweep/advancing_front.h
+++ b/contrib/poly2tri/poly2tri/sweep/advancing_front.h
@@ -1,6 +1,6 @@
 /*
- * Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
- * http://code.google.com/p/poly2tri/
+ * Poly2Tri Copyright (c) 2009-2018, Poly2Tri Contributors
+ * https://github.com/jhasse/poly2tri
  *
  * All rights reserved.
  *
@@ -29,8 +29,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef ADVANCED_FRONT_H
-#define ADVANCED_FRONT_H
+#pragma once
 
 #include "../common/shapes.h"
 
@@ -114,5 +113,3 @@ inline void AdvancingFront::set_search(Node* node)
 }
 
 }
-
-#endif
diff --git a/contrib/poly2tri/poly2tri/sweep/cdt.cc b/contrib/poly2tri/poly2tri/sweep/cdt.cc
index b79f5a8de..4dfe6a641 100644
--- a/contrib/poly2tri/poly2tri/sweep/cdt.cc
+++ b/contrib/poly2tri/poly2tri/sweep/cdt.cc
@@ -1,6 +1,6 @@
 /*
- * Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
- * http://code.google.com/p/poly2tri/
+ * Poly2Tri Copyright (c) 2009-2021, Poly2Tri Contributors
+ * https://github.com/jhasse/poly2tri
  *
  * All rights reserved.
  *
@@ -68,4 +68,4 @@ CDT::~CDT()
   delete sweep_;
 }
 
-}
+} // namespace p2t
diff --git a/contrib/poly2tri/poly2tri/sweep/cdt.h b/contrib/poly2tri/poly2tri/sweep/cdt.h
index 4a9a292d3..7c54ea976 100644
--- a/contrib/poly2tri/poly2tri/sweep/cdt.h
+++ b/contrib/poly2tri/poly2tri/sweep/cdt.h
@@ -1,6 +1,6 @@
 /*
- * Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
- * http://code.google.com/p/poly2tri/
+ * Poly2Tri Copyright (c) 2009-2018, Poly2Tri Contributors
+ * https://github.com/jhasse/poly2tri
  *
  * All rights reserved.
  *
@@ -29,13 +29,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CDT_H
-#define CDT_H
+#pragma once
 
 #include "advancing_front.h"
 #include "sweep_context.h"
 #include "sweep.h"
 
+#include "../common/dll_symbol.h"
+
 /**
  *
  * @author Mason Green <mason.green@gmail.com>
@@ -44,7 +45,7 @@
 
 namespace p2t {
 
-class CDT
+class P2T_DLL_SYMBOL CDT
 {
 public:
 
@@ -101,5 +102,3 @@ public:
 };
 
 }
-
-#endif
diff --git a/contrib/poly2tri/poly2tri/sweep/sweep.cc b/contrib/poly2tri/poly2tri/sweep/sweep.cc
index 565a198d8..48e8bee8f 100644
--- a/contrib/poly2tri/poly2tri/sweep/sweep.cc
+++ b/contrib/poly2tri/poly2tri/sweep/sweep.cc
@@ -1,6 +1,6 @@
 /*
- * Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
- * http://code.google.com/p/poly2tri/
+ * Poly2Tri Copyright (c) 2009-2018, Poly2Tri Contributors
+ * https://github.com/jhasse/poly2tri
  *
  * All rights reserved.
  *
@@ -28,24 +28,21 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <stdexcept>
 #include "sweep.h"
 #include "sweep_context.h"
 #include "advancing_front.h"
 #include "../common/utils.h"
 
-namespace p2t {
+#include <cassert>
+#include <stdexcept>
 
-#ifdef _MSC_VER
-#    pragma warning(push)
-#    pragma warning( disable : 4702 )
-#endif // _MSC_VER
+namespace p2t {
 
 // Triangulate simple polygon with holes
 void Sweep::Triangulate(SweepContext& tcx)
 {
   tcx.InitTriangulation();
-  tcx.CreateAdvancingFront(nodes_);
+  tcx.CreateAdvancingFront();
   // Sweep points; build mesh
   SweepPoints(tcx);
   // Clean up
@@ -57,8 +54,8 @@ void Sweep::SweepPoints(SweepContext& tcx)
   for (size_t i = 1; i < tcx.point_count(); i++) {
     Point& point = *tcx.GetPoint(i);
     Node* node = &PointEvent(tcx, point);
-    for (unsigned int ii = 0; ii < point.edge_list.size(); ii++) {
-      EdgeEvent(tcx, point.edge_list[ii], node);
+    for (auto& j : point.edge_list) {
+      EdgeEvent(tcx, j, node);
     }
   }
 }
@@ -68,17 +65,25 @@ void Sweep::FinalizationPolygon(SweepContext& tcx)
   // Get an Internal triangle to start with
   Triangle* t = tcx.front()->head()->next->triangle;
   Point* p = tcx.front()->head()->next->point;
-  while (!t->GetConstrainedEdgeCW(*p)) {
+  while (t && !t->GetConstrainedEdgeCW(*p)) {
     t = t->NeighborCCW(*p);
   }
 
   // Collect interior triangles constrained by edges
-  tcx.MeshClean(*t);
+  if (t) {
+    tcx.MeshClean(*t);
+  }
 }
 
 Node& Sweep::PointEvent(SweepContext& tcx, Point& point)
 {
-  Node& node = tcx.LocateNode(point);
+  Node* node_ptr = tcx.LocateNode(point);
+  if (!node_ptr || !node_ptr->point || !node_ptr->next || !node_ptr->next->point)
+  {
+    throw std::runtime_error("PointEvent - null node");
+  }
+
+  Node& node = *node_ptr;
   Node& new_node = NewFrontTriangle(tcx, point, node);
 
   // Only need to check +epsilon since point never have smaller
@@ -111,6 +116,9 @@ void Sweep::EdgeEvent(SweepContext& tcx, Edge* edge, Node* node)
 
 void Sweep::EdgeEvent(SweepContext& tcx, Point& ep, Point& eq, Triangle* triangle, Point& point)
 {
+  if (triangle == nullptr) {
+    throw std::runtime_error("EdgeEvent - null triangle");
+  }
   if (IsEdgeSideOfTriangle(*triangle, ep, eq)) {
     return;
   }
@@ -118,17 +126,14 @@ void Sweep::EdgeEvent(SweepContext& tcx, Point& ep, Point& eq, Triangle* triangl
   Point* p1 = triangle->PointCCW(point);
   Orientation o1 = Orient2d(eq, *p1, ep);
   if (o1 == COLLINEAR) {
-
-
-    if( triangle->Contains(&eq, p1)) {
-      triangle->MarkConstrainedEdge(&eq, p1 );
+    if (triangle->Contains(&eq, p1)) {
+      triangle->MarkConstrainedEdge(&eq, p1);
       // We are modifying the constraint maybe it would be better to
       // not change the given constraint and just keep a variable for the new constraint
       tcx.edge_event.constrained_edge->q = p1;
-      triangle = &triangle->NeighborAcross(point);
-      EdgeEvent( tcx, ep, *p1, triangle, *p1 );
+      triangle = triangle->NeighborAcross(point);
+      EdgeEvent(tcx, ep, *p1, triangle, *p1);
     } else {
-	  // ASSIMP_CHANGE (aramis_acg)
       throw std::runtime_error("EdgeEvent - collinear points not supported");
     }
     return;
@@ -137,18 +142,14 @@ void Sweep::EdgeEvent(SweepContext& tcx, Point& ep, Point& eq, Triangle* triangl
   Point* p2 = triangle->PointCW(point);
   Orientation o2 = Orient2d(eq, *p2, ep);
   if (o2 == COLLINEAR) {
-
-
-
-    if( triangle->Contains(&eq, p2)) {
-      triangle->MarkConstrainedEdge(&eq, p2 );
+    if (triangle->Contains(&eq, p2)) {
+      triangle->MarkConstrainedEdge(&eq, p2);
       // We are modifying the constraint maybe it would be better to
       // not change the given constraint and just keep a variable for the new constraint
       tcx.edge_event.constrained_edge->q = p2;
-      triangle = &triangle->NeighborAcross(point);
-      EdgeEvent( tcx, ep, *p2, triangle, *p2 );
+      triangle = triangle->NeighborAcross(point);
+      EdgeEvent(tcx, ep, *p2, triangle, *p2);
     } else {
-      // ASSIMP_CHANGE (aramis_acg)
       throw std::runtime_error("EdgeEvent - collinear points not supported");
     }
     return;
@@ -159,12 +160,13 @@ void Sweep::EdgeEvent(SweepContext& tcx, Point& ep, Point& eq, Triangle* triangl
     // that will cross edge
     if (o1 == CW) {
       triangle = triangle->NeighborCCW(point);
-    }       else{
+    } else {
       triangle = triangle->NeighborCW(point);
     }
     EdgeEvent(tcx, ep, eq, triangle, point);
   } else {
     // This triangle crosses constraint so lets flippin start!
+    assert(triangle);
     FlipEdgeEvent(tcx, ep, eq, triangle, point);
   }
 }
@@ -225,7 +227,6 @@ void Sweep::Fill(SweepContext& tcx, Node& node)
   if (!Legalize(tcx, *triangle)) {
     tcx.MapTriangleToNodes(*triangle);
   }
-
 }
 
 void Sweep::FillAdvancingFront(SweepContext& tcx, Node& n)
@@ -234,7 +235,7 @@ void Sweep::FillAdvancingFront(SweepContext& tcx, Node& n)
   // Fill right holes
   Node* node = n.next;
 
-  while (node->next) {
+  while (node && node->next) {
     // if HoleAngle exceeds 90 degrees then break.
     if (LargeHole_DontFill(node)) break;
     Fill(tcx, *node);
@@ -244,7 +245,7 @@ void Sweep::FillAdvancingFront(SweepContext& tcx, Node& n)
   // Fill left holes
   node = n.prev;
 
-  while (node->prev) {
+  while (node && node->prev) {
     // if HoleAngle exceeds 90 degrees then break.
     if (LargeHole_DontFill(node)) break;
     Fill(tcx, *node);
@@ -261,6 +262,35 @@ void Sweep::FillAdvancingFront(SweepContext& tcx, Node& n)
 }
 
 // True if HoleAngle exceeds 90 degrees.
+// LargeHole_DontFill checks if the advancing front has a large hole.
+// A "Large hole" is a triangle formed by a sequence of points in the advancing
+// front where three neighbor points form a triangle.
+// And angle between left-top, bottom, and right-top points is more than 90 degrees.
+// The first part of the algorithm reviews only three neighbor points, e.g. named A, B, C.
+// Additional part of this logic reviews a sequence of 5 points -
+// additionally reviews one point before and one after the sequence of three (A, B, C),
+// e.g. named X and Y.
+// In this case, angles are XBC and ABY and this if angles are negative or more
+// than 90 degrees LargeHole_DontFill returns true.
+// But there is a configuration when ABC has a negative angle but XBC or ABY is less
+// than 90 degrees and positive.
+// Then function LargeHole_DontFill return false and initiates filling.
+// This filling creates a triangle ABC and adds it to the advancing front.
+// But in the case when angle ABC is negative this triangle goes inside the advancing front
+// and can intersect previously created triangles.
+// This triangle leads to making wrong advancing front and problems in triangulation in the future.
+// Looks like such a triangle should not be created.
+// The simplest way to check and fix it is to check an angle ABC.
+// If it is negative LargeHole_DontFill should return true and
+// not initiate creating the ABC triangle in the advancing front.
+// X______A         Y
+//        \        /
+//         \      /
+//          \ B  /
+//           |  /
+//           | /
+//           |/
+//           C
 bool Sweep::LargeHole_DontFill(const Node* node) const {
 
   const Node* nextNode = node->next;
@@ -268,20 +298,28 @@ bool Sweep::LargeHole_DontFill(const Node* node) const {
   if (!AngleExceeds90Degrees(node->point, nextNode->point, prevNode->point))
           return false;
 
+  if (AngleIsNegative(node->point, nextNode->point, prevNode->point))
+          return true;
+
   // Check additional points on front.
   const Node* next2Node = nextNode->next;
   // "..Plus.." because only want angles on same side as point being added.
-  if ((next2Node != NULL) && !AngleExceedsPlus90DegreesOrIsNegative(node->point, next2Node->point, prevNode->point))
+  if ((next2Node != nullptr) && !AngleExceedsPlus90DegreesOrIsNegative(node->point, next2Node->point, prevNode->point))
           return false;
 
   const Node* prev2Node = prevNode->prev;
   // "..Plus.." because only want angles on same side as point being added.
-  if ((prev2Node != NULL) && !AngleExceedsPlus90DegreesOrIsNegative(node->point, nextNode->point, prev2Node->point))
+  if ((prev2Node != nullptr) && !AngleExceedsPlus90DegreesOrIsNegative(node->point, nextNode->point, prev2Node->point))
           return false;
 
   return true;
 }
 
+bool Sweep::AngleIsNegative(const Point* origin, const Point* pa, const Point* pb) const {
+    const double angle = Angle(origin, pa, pb);
+    return angle < 0;
+}
+
 bool Sweep::AngleExceeds90Degrees(const Point* origin, const Point* pa, const Point* pb) const {
   const double angle = Angle(origin, pa, pb);
   return ((angle > PI_div2) || (angle < -PI_div2));
@@ -303,7 +341,7 @@ double Sweep::Angle(const Point* origin, const Point* pa, const Point* pb) const
    */
   const double px = origin->x;
   const double py = origin->y;
-  const double ax = pa->x- px;
+  const double ax = pa->x - px;
   const double ay = pa->y - py;
   const double bx = pb->x - px;
   const double by = pb->y - py;
@@ -596,7 +634,7 @@ void Sweep::FillRightBelowEdgeEvent(SweepContext& tcx, Edge* edge, Node& node)
     if (Orient2d(*node.point, *node.next->point, *node.next->next->point) == CCW) {
       // Concave
       FillRightConcaveEdgeEvent(tcx, edge, node);
-    } else{
+    } else {
       // Convex
       FillRightConvexEdgeEvent(tcx, edge, node);
       // Retry this one
@@ -620,7 +658,6 @@ void Sweep::FillRightConcaveEdgeEvent(SweepContext& tcx, Edge* edge, Node& node)
       }
     }
   }
-
 }
 
 void Sweep::FillRightConvexEdgeEvent(SweepContext& tcx, Edge* edge, Node& node)
@@ -629,13 +666,13 @@ void Sweep::FillRightConvexEdgeEvent(SweepContext& tcx, Edge* edge, Node& node)
   if (Orient2d(*node.next->point, *node.next->next->point, *node.next->next->next->point) == CCW) {
     // Concave
     FillRightConcaveEdgeEvent(tcx, edge, *node.next);
-  } else{
+  } else {
     // Convex
     // Next above or below edge?
     if (Orient2d(*edge->q, *node.next->next->point, *edge->p) == CCW) {
       // Below
       FillRightConvexEdgeEvent(tcx, edge, *node.next);
-    } else{
+    } else {
       // Above
     }
   }
@@ -674,13 +711,13 @@ void Sweep::FillLeftConvexEdgeEvent(SweepContext& tcx, Edge* edge, Node& node)
   if (Orient2d(*node.prev->point, *node.prev->prev->point, *node.prev->prev->prev->point) == CW) {
     // Concave
     FillLeftConcaveEdgeEvent(tcx, edge, *node.prev);
-  } else{
+  } else {
     // Convex
     // Next above or below edge?
     if (Orient2d(*edge->q, *node.prev->prev->point, *edge->p) == CW) {
       // Below
       FillLeftConvexEdgeEvent(tcx, edge, *node.prev);
-    } else{
+    } else {
       // Above
     }
   }
@@ -696,17 +733,22 @@ void Sweep::FillLeftConcaveEdgeEvent(SweepContext& tcx, Edge* edge, Node& node)
       if (Orient2d(*node.point, *node.prev->point, *node.prev->prev->point) == CW) {
         // Next is concave
         FillLeftConcaveEdgeEvent(tcx, edge, node);
-      } else{
+      } else {
         // Next is convex
       }
     }
   }
-
 }
 
 void Sweep::FlipEdgeEvent(SweepContext& tcx, Point& ep, Point& eq, Triangle* t, Point& p)
 {
-  Triangle& ot = t->NeighborAcross(p);
+  assert(t);
+  Triangle* ot_ptr = t->NeighborAcross(p);
+  if (ot_ptr == nullptr)
+  {
+    throw std::runtime_error("FlipEdgeEvent - null neighbor across");
+  }
+  Triangle& ot = *ot_ptr;
   Point& op = *ot.OppositePoint(*t, p);
 
   if (InScanArea(p, *t->PointCCW(p), *t->PointCW(p), op)) {
@@ -772,10 +814,26 @@ Point& Sweep::NextFlipPoint(Point& ep, Point& eq, Triangle& ot, Point& op)
 void Sweep::FlipScanEdgeEvent(SweepContext& tcx, Point& ep, Point& eq, Triangle& flip_triangle,
                               Triangle& t, Point& p)
 {
-  Triangle& ot = t.NeighborAcross(p);
-  Point& op = *ot.OppositePoint(t, p);
+  Triangle* ot_ptr = t.NeighborAcross(p);
+  if (ot_ptr == nullptr) {
+    throw std::runtime_error("FlipScanEdgeEvent - null neighbor across");
+  }
 
-  if (InScanArea(eq, *flip_triangle.PointCCW(eq), *flip_triangle.PointCW(eq), op)) {
+  Point* op_ptr = ot_ptr->OppositePoint(t, p);
+  if (op_ptr == nullptr) {
+    throw std::runtime_error("FlipScanEdgeEvent - null opposing point");
+  }
+
+  Point* p1 = flip_triangle.PointCCW(eq);
+  Point* p2 = flip_triangle.PointCW(eq);
+  if (p1 == nullptr || p2 == nullptr) {
+    throw std::runtime_error("FlipScanEdgeEvent - null on either of points");
+  }
+
+  Triangle& ot = *ot_ptr;
+  Point& op = *op_ptr;
+
+  if (InScanArea(eq, *p1, *p2, op)) {
     // flip with new edge op->eq
     FlipEdgeEvent(tcx, eq, op, &ot, op);
     // TODO: Actually I just figured out that it should be possible to
@@ -785,7 +843,7 @@ void Sweep::FlipScanEdgeEvent(SweepContext& tcx, Point& ep, Point& eq, Triangle&
     // also need to set a new flip_triangle first
     // Turns out at first glance that this is somewhat complicated
     // so it will have to wait.
-  } else{
+  } else {
     Point& newP = NextFlipPoint(ep, eq, ot, op);
     FlipScanEdgeEvent(tcx, ep, eq, flip_triangle, ot, newP);
   }
@@ -794,14 +852,9 @@ void Sweep::FlipScanEdgeEvent(SweepContext& tcx, Point& ep, Point& eq, Triangle&
 Sweep::~Sweep() {
 
     // Clean up memory
-    for(size_t i = 0; i < nodes_.size(); i++) {
-        delete nodes_[i];
+    for (auto& node : nodes_) {
+      delete node;
     }
-
 }
 
-#ifdef _MSC_VER
-#    pragma warning( pop )
-#endif // _MSC_VER
-
-}
+} // namespace p2t
diff --git a/contrib/poly2tri/poly2tri/sweep/sweep.h b/contrib/poly2tri/poly2tri/sweep/sweep.h
index ad429fd96..ad43f2e4a 100644
--- a/contrib/poly2tri/poly2tri/sweep/sweep.h
+++ b/contrib/poly2tri/poly2tri/sweep/sweep.h
@@ -1,6 +1,6 @@
 /*
- * Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
- * http://code.google.com/p/poly2tri/
+ * Poly2Tri Copyright (c) 2009-2018, Poly2Tri Contributors
+ * https://github.com/jhasse/poly2tri
  *
  * All rights reserved.
  *
@@ -33,11 +33,10 @@
  * 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 Åhlén, thahlen@gmail.com
  */
 
-#ifndef SWEEP_H
-#define SWEEP_H
+#pragma once
 
 #include <vector>
 
@@ -172,6 +171,7 @@ private:
   // Decision-making about when to Fill hole.
   // Contributed by ToolmakerSteve2
   bool LargeHole_DontFill(const Node* node) const;
+  bool AngleIsNegative(const Point* origin, const Point* pa, const Point* pb) const;
   bool AngleExceeds90Degrees(const Point* origin, const Point* pa, const Point* pb) const;
   bool AngleExceedsPlus90DegreesOrIsNegative(const Point* origin, const Point* pa, const Point* pb) const;
   double Angle(const Point* origin, const Point* pa, const Point* pb) const;
@@ -281,5 +281,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/contrib/poly2tri/poly2tri/sweep/sweep_context.cc b/contrib/poly2tri/poly2tri/sweep/sweep_context.cc
index a9f1fdf8e..7b9432feb 100644
--- a/contrib/poly2tri/poly2tri/sweep/sweep_context.cc
+++ b/contrib/poly2tri/poly2tri/sweep/sweep_context.cc
@@ -1,6 +1,6 @@
 /*
- * Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
- * http://code.google.com/p/poly2tri/
+ * Poly2Tri Copyright (c) 2009-2022, Poly2Tri Contributors
+ * https://github.com/jhasse/poly2tri
  *
  * All rights reserved.
  *
@@ -34,13 +34,13 @@
 
 namespace p2t {
 
-SweepContext::SweepContext(const std::vector<Point*>& polyline) : points_(polyline),
-  front_(0),
-  head_(0),
-  tail_(0),
-  af_head_(0),
-  af_middle_(0),
-  af_tail_(0)
+SweepContext::SweepContext(std::vector<Point*> polyline) : points_(std::move(polyline)),
+  front_(nullptr),
+  head_(nullptr),
+  tail_(nullptr),
+  af_head_(nullptr),
+  af_middle_(nullptr),
+  af_tail_(nullptr)
 {
   InitEdges(points_);
 }
@@ -48,8 +48,8 @@ SweepContext::SweepContext(const std::vector<Point*>& polyline) : points_(polyli
 void SweepContext::AddHole(const std::vector<Point*>& polyline)
 {
   InitEdges(polyline);
-  for(unsigned int i = 0; i < polyline.size(); i++) {
-    points_.push_back(polyline[i]);
+  for (auto i : polyline) {
+    points_.push_back(i);
   }
 }
 
@@ -73,8 +73,8 @@ void SweepContext::InitTriangulation()
   double ymax(points_[0]->y), ymin(points_[0]->y);
 
   // Calculate bounds.
-  for (unsigned int i = 0; i < points_.size(); i++) {
-    Point& p = *points_[i];
+  for (auto& point : points_) {
+    Point& p = *point;
     if (p.x > xmax)
       xmax = p.x;
     if (p.x < xmin)
@@ -87,8 +87,8 @@ void SweepContext::InitTriangulation()
 
   double dx = kAlpha * (xmax - xmin);
   double dy = kAlpha * (ymax - ymin);
-  head_ = new Point(xmax + dx, ymin - dy);
-  tail_ = new Point(xmin - dx, ymin - dy);
+  head_ = new Point(xmin - dx, ymin - dy);
+  tail_ = new Point(xmax + dx, ymin - dy);
 
   // Sort points along y-axis
   std::sort(points_.begin(), points_.end(), cmp);
@@ -114,18 +114,17 @@ void SweepContext::AddToMap(Triangle* triangle)
   map_.push_back(triangle);
 }
 
-Node& SweepContext::LocateNode(const Point& point)
+Node* SweepContext::LocateNode(const Point& point)
 {
   // TODO implement search tree
-  return *front_->LocateNode(point.x);
+  return front_->LocateNode(point.x);
 }
 
-void SweepContext::CreateAdvancingFront(const std::vector<Node*>& nodes)
+void SweepContext::CreateAdvancingFront()
 {
 
-  (void) nodes;
   // Initial triangle
-  Triangle* triangle = new Triangle(*points_[0], *tail_, *head_);
+  Triangle* triangle = new Triangle(*points_[0], *head_, *tail_);
 
   map_.push_back(triangle);
 
@@ -172,7 +171,7 @@ void SweepContext::MeshClean(Triangle& triangle)
 	Triangle *t = triangles.back();
 	triangles.pop_back();
 
-    if (t != NULL && !t->IsInterior()) {
+    if (t != nullptr && !t->IsInterior()) {
       t->IsInterior(true);
       triangles_.push_back(t);
       for (int i = 0; i < 3; i++) {
@@ -195,17 +194,13 @@ SweepContext::~SweepContext()
     delete af_middle_;
     delete af_tail_;
 
-    typedef std::list<Triangle*> type_list;
-
-    for(type_list::iterator iter = map_.begin(); iter != map_.end(); ++iter) {
-        Triangle* ptr = *iter;
-        delete ptr;
+    for (auto ptr : map_) {
+      delete ptr;
     }
 
-     for(unsigned int i = 0; i < edge_list.size(); i++) {
-        delete edge_list[i];
+    for (auto& i : edge_list) {
+      delete i;
     }
-
 }
 
-}
+} // namespace p2t
diff --git a/contrib/poly2tri/poly2tri/sweep/sweep_context.h b/contrib/poly2tri/poly2tri/sweep/sweep_context.h
index ba0d06581..11d573944 100644
--- a/contrib/poly2tri/poly2tri/sweep/sweep_context.h
+++ b/contrib/poly2tri/poly2tri/sweep/sweep_context.h
@@ -1,6 +1,6 @@
 /*
- * Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
- * http://code.google.com/p/poly2tri/
+ * Poly2Tri Copyright (c) 2009-2022, Poly2Tri Contributors
+ * https://github.com/jhasse/poly2tri
  *
  * All rights reserved.
  *
@@ -29,8 +29,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SWEEP_CONTEXT_H
-#define SWEEP_CONTEXT_H
+#pragma once
 
 #include <list>
 #include <vector>
@@ -52,7 +51,7 @@ class SweepContext {
 public:
 
 /// Constructor
-SweepContext(const std::vector<Point*>& polyline);
+explicit SweepContext(std::vector<Point*> polyline);
 /// Destructor
 ~SweepContext();
 
@@ -66,11 +65,11 @@ Point* tail() const;
 
 size_t point_count() const;
 
-Node& LocateNode(const Point& point);
+Node* LocateNode(const Point& point);
 
 void RemoveNode(Node* node);
 
-void CreateAdvancingFront(const std::vector<Node*>& nodes);
+void CreateAdvancingFront();
 
 /// Try to map a node to all sides of this triangle that don't have a neighbor
 void MapTriangleToNodes(Triangle& t);
@@ -103,15 +102,16 @@ struct Basin {
   double width;
   bool left_highest;
 
-  Basin() : left_node(NULL), bottom_node(NULL), right_node(NULL), width(0.0), left_highest(false)
+  Basin()
+  : left_node(nullptr), bottom_node(nullptr), right_node(nullptr), width(0.0), left_highest(false)
   {
   }
 
   void Clear()
   {
-    left_node = NULL;
-    bottom_node = NULL;
-    right_node = NULL;
+    left_node = nullptr;
+    bottom_node = nullptr;
+    right_node = nullptr;
     width = 0.0;
     left_highest = false;
   }
@@ -182,5 +182,3 @@ inline Point* SweepContext::tail() const
 }
 
 }
-
-#endif
diff --git a/contrib/pugixml/CMakeLists.txt b/contrib/pugixml/CMakeLists.txt
index af6b577e6..81ff5615b 100644
--- a/contrib/pugixml/CMakeLists.txt
+++ b/contrib/pugixml/CMakeLists.txt
@@ -1,87 +1,297 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.10...3.30)
 
-project(pugixml)
-
-option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF)
-option(BUILD_TESTS "Build tests" OFF)
-option(BUILD_PKGCONFIG "Build in PKGCONFIG mode" OFF)
-
-set(BUILD_DEFINES "" CACHE STRING "Build defines")
-
-if(MSVC)
-	option(STATIC_CRT "Use static CRT libraries" OFF)
-
-	# Rewrite command line flags to use /MT if necessary
-	if(STATIC_CRT)
-		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()
+# Policy configuration; this *MUST* be specified before project is defined
+if(POLICY CMP0091)
+    cmake_policy(SET CMP0091 NEW) # Enables use of MSVC_RUNTIME_LIBRARY
 endif()
 
-# Pre-defines standard install locations on *nix systems.
+project(pugixml VERSION 1.15 LANGUAGES CXX)
+
+include(CMakePackageConfigHelpers)
+include(CMakeDependentOption)
 include(GNUInstallDirs)
-mark_as_advanced(CLEAR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR)
 
-set(HEADERS src/pugixml.hpp src/pugiconfig.hpp)
-set(SOURCES src/pugixml.cpp)
+cmake_dependent_option(PUGIXML_USE_VERSIONED_LIBDIR
+  "Use a private subdirectory to install the headers and libraries" OFF
+  "CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR" OFF)
 
-if(DEFINED BUILD_DEFINES)
-	foreach(DEFINE ${BUILD_DEFINES})
-		add_definitions("-D" ${DEFINE})
-	endforeach()
-endif()
-#message(pugixml"   "${BUILD_SHARED_LIBS})
-#if(BUILD_SHARED_LIBS)
-#	add_library(pugixml SHARED ${HEADERS} ${SOURCES})
-#else()
-	add_library(pugixml STATIC ${HEADERS} ${SOURCES})
-#endif()
+cmake_dependent_option(PUGIXML_USE_POSTFIX
+  "Use separate postfix for each configuration to make sure you can install multiple build outputs" OFF
+  "CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR" OFF)
 
-# Export symbols for shared library builds
-if(BUILD_SHARED_LIBS AND MSVC)
-	target_compile_definitions(pugixml PRIVATE "PUGIXML_API=__declspec(dllexport)")
+cmake_dependent_option(PUGIXML_STATIC_CRT
+  "Use static MSVC RT libraries" OFF
+  "MSVC" OFF)
+
+cmake_dependent_option(PUGIXML_BUILD_TESTS
+  "Build pugixml tests" OFF
+  "CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR" OFF)
+
+# Custom build defines
+set(PUGIXML_BUILD_DEFINES CACHE STRING "Build defines for custom options")
+separate_arguments(PUGIXML_BUILD_DEFINES)
+
+# Technically not needed for this file. This is builtin CMAKE global variable.
+option(BUILD_SHARED_LIBS "Build shared instead of static library")
+
+# Expose option to build PUGIXML as static as well when the global BUILD_SHARED_LIBS variable is set
+cmake_dependent_option(PUGIXML_BUILD_SHARED_AND_STATIC_LIBS
+  "Build both shared and static libraries" OFF
+  "BUILD_SHARED_LIBS" OFF)
+
+# Expose options from the pugiconfig.hpp
+option(PUGIXML_WCHAR_MODE "Enable wchar_t mode" OFF)
+option(PUGIXML_COMPACT "Enable compact mode" OFF)
+option(PUGIXML_INSTALL "Enable installation rules" ON)
+
+# Advanced options from pugiconfig.hpp
+option(PUGIXML_NO_XPATH "Disable XPath" OFF)
+option(PUGIXML_NO_STL "Disable STL" OFF)
+option(PUGIXML_NO_EXCEPTIONS "Disable Exceptions" OFF)
+mark_as_advanced(PUGIXML_NO_XPATH PUGIXML_NO_STL PUGIXML_NO_EXCEPTIONS)
+
+if (APPLE)
+  option(PUGIXML_BUILD_APPLE_FRAMEWORK "Build as Apple Frameworks" OFF)
 endif()
 
-# Enable C++11 long long for compilers that are capable of it
-if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1 AND ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_long_long_type;")
-	target_compile_features(pugixml PUBLIC cxx_long_long_type)
+set(PUGIXML_PUBLIC_DEFINITIONS
+  $<$<BOOL:${PUGIXML_WCHAR_MODE}>:PUGIXML_WCHAR_MODE>
+  $<$<BOOL:${PUGIXML_COMPACT}>:PUGIXML_COMPACT>
+  $<$<BOOL:${PUGIXML_NO_XPATH}>:PUGIXML_NO_XPATH>
+  $<$<BOOL:${PUGIXML_NO_STL}>:PUGIXML_NO_STL>
+  $<$<BOOL:${PUGIXML_NO_EXCEPTIONS}>:PUGIXML_NO_EXCEPTIONS>
+)
+
+# This is used to backport a CMake 3.15 feature, but is also forwards compatible
+if (NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
+  set(CMAKE_MSVC_RUNTIME_LIBRARY
+    MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<NOT:$<BOOL:${PUGIXML_STATIC_CRT}>>:DLL>)
 endif()
 
-set_target_properties(pugixml PROPERTIES VERSION 1.9 SOVERSION 1)
-get_target_property(PUGIXML_VERSION_STRING pugixml VERSION)
+# Set the default C++ standard to C++17 if not set; CMake will automatically downgrade this if the compiler does not support it
+# When CMAKE_CXX_STANDARD_REQUIRED is set, we fall back to C++11 to avoid breaking older compilers
+if (NOT DEFINED CMAKE_CXX_STANDARD_REQUIRED AND NOT DEFINED CMAKE_CXX_STANDARD AND NOT CMAKE_VERSION VERSION_LESS 3.8)
 
-if(BUILD_PKGCONFIG)
-	# Install library into its own directory under LIBDIR
-	set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
+  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD_REQUIRED OFF)
+elseif (NOT DEFINED CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 11)
 endif()
 
-target_include_directories(pugixml PUBLIC
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src>
-	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX}>)
-
-install(TARGETS pugixml EXPORT pugixml-config
-	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX}
-	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX}
-	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX})
-install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
-
-if(BUILD_PKGCONFIG)
-	configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
-	install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+if (PUGIXML_USE_POSTFIX)
+  set(CMAKE_RELWITHDEBINFO_POSTFIX _r)
+  set(CMAKE_MINSIZEREL_POSTFIX _m)
+  set(CMAKE_DEBUG_POSTFIX _d)
 endif()
 
-if(BUILD_TESTS)
-	file(GLOB TEST_SOURCES tests/*.cpp)
-	file(GLOB FUZZ_SOURCES tests/fuzz_*.cpp)
-	list(REMOVE_ITEM TEST_SOURCES ${FUZZ_SOURCES})
+if (CMAKE_VERSION VERSION_LESS 3.15)
+  set(msvc-rt $<TARGET_PROPERTY:MSVC_RUNTIME_LIBRARY>)
 
-	add_executable(check ${TEST_SOURCES})
-	target_link_libraries(check pugixml)
-	add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+  set(msvc-rt-mtd-shared $<STREQUAL:${msvc-rt},MultiThreadedDebugDLL>)
+  set(msvc-rt-mtd-static $<STREQUAL:${msvc-rt},MultiThreadedDebug>)
+  set(msvc-rt-mt-shared $<STREQUAL:${msvc-rt},MultiThreadedDLL>)
+  set(msvc-rt-mt-static $<STREQUAL:${msvc-rt},MultiThreaded>)
+  unset(msvc-rt)
+
+  set(msvc-rt-mtd-shared $<${msvc-rt-mtd-shared}:-MDd>)
+  set(msvc-rt-mtd-static $<${msvc-rt-mtd-static}:-MTd>)
+  set(msvc-rt-mt-shared $<${msvc-rt-mt-shared}:-MD>)
+  set(msvc-rt-mt-static $<${msvc-rt-mt-static}:-MT>)
+endif()
+
+set(versioned-dir $<$<BOOL:${PUGIXML_USE_VERSIONED_LIBDIR}>:/pugixml-${PROJECT_VERSION}>)
+
+set(libs)
+
+if (BUILD_SHARED_LIBS)
+  add_library(pugixml-shared SHARED
+    ${PROJECT_SOURCE_DIR}/scripts/pugixml_dll.rc
+    ${PROJECT_SOURCE_DIR}/src/pugixml.cpp)
+  add_library(pugixml::shared ALIAS pugixml-shared)
+  list(APPEND libs pugixml-shared)
+  string(CONCAT pugixml.msvc $<OR:
+    $<STREQUAL:${CMAKE_CXX_COMPILER_FRONTEND_VARIANT},MSVC>,
+    $<CXX_COMPILER_ID:MSVC>
+  >)
+
+  set_property(TARGET pugixml-shared PROPERTY EXPORT_NAME shared)
+  target_include_directories(pugixml-shared
+    PUBLIC
+      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
+  target_compile_definitions(pugixml-shared
+    PUBLIC
+      ${PUGIXML_BUILD_DEFINES}
+      ${PUGIXML_PUBLIC_DEFINITIONS}
+    PRIVATE
+      PUGIXML_API=$<IF:${pugixml.msvc},__declspec\(dllexport\),__attribute__\(\(visibility\("default"\)\)\)>
+    )
+  target_compile_options(pugixml-shared
+    PRIVATE
+      ${msvc-rt-mtd-shared}
+      ${msvc-rt-mtd-static}
+      ${msvc-rt-mt-shared}
+      ${msvc-rt-mt-static})
+endif()
+
+if (NOT BUILD_SHARED_LIBS OR PUGIXML_BUILD_SHARED_AND_STATIC_LIBS)
+  add_library(pugixml-static STATIC
+    ${PROJECT_SOURCE_DIR}/src/pugixml.cpp)
+  add_library(pugixml::static ALIAS pugixml-static)
+  list(APPEND libs pugixml-static)
+
+  set_property(TARGET pugixml-static PROPERTY EXPORT_NAME static)
+  target_include_directories(pugixml-static
+    PUBLIC
+      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
+  target_compile_definitions(pugixml-static
+    PUBLIC
+      ${PUGIXML_BUILD_DEFINES}
+      ${PUGIXML_PUBLIC_DEFINITIONS})
+  target_compile_options(pugixml-static
+    PRIVATE
+      ${msvc-rt-mtd-shared}
+      ${msvc-rt-mtd-static}
+      ${msvc-rt-mt-shared}
+      ${msvc-rt-mt-static})
+endif()
+
+if (BUILD_SHARED_LIBS)
+  set(pugixml-alias pugixml-shared)
+else()
+  set(pugixml-alias pugixml-static)
+endif()
+add_library(pugixml INTERFACE)
+target_link_libraries(pugixml INTERFACE ${pugixml-alias})
+add_library(pugixml::pugixml ALIAS pugixml)
+
+set_target_properties(${libs}
+  PROPERTIES
+    MSVC_RUNTIME_LIBRARY ${CMAKE_MSVC_RUNTIME_LIBRARY}
+    EXCLUDE_FROM_ALL ON
+    POSITION_INDEPENDENT_CODE ON
+    SOVERSION ${PROJECT_VERSION_MAJOR}
+    VERSION ${PROJECT_VERSION}
+    OUTPUT_NAME pugixml)
+
+set_target_properties(${libs}
+  PROPERTIES
+    EXCLUDE_FROM_ALL OFF)
+set(install-targets pugixml ${libs})
+
+if (PUGIXML_BUILD_APPLE_FRAMEWORK)
+  set_target_properties(${libs} PROPERTIES
+    FRAMEWORK TRUE
+    FRAMEWORK_VERSION ${PROJECT_VERSION}
+    XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.zeux.pugixml
+    MACOSX_FRAMEWORK_IDENTIFIER com.zeux.pugixml
+    MACOSX_FRAMEWORK_BUNDLE_VERSION ${PROJECT_VERSION}
+    MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR})
+endif()
+
+configure_package_config_file(
+  "${PROJECT_SOURCE_DIR}/scripts/pugixml-config.cmake.in"
+  "${PROJECT_BINARY_DIR}/pugixml-config.cmake"
+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  NO_CHECK_REQUIRED_COMPONENTS_MACRO
+  NO_SET_AND_CHECK_MACRO)
+
+write_basic_package_version_file(
+  "${PROJECT_BINARY_DIR}/pugixml-config-version.cmake"
+  COMPATIBILITY SameMajorVersion)
+
+if (PUGIXML_USE_POSTFIX)
+  if(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
+    set(LIB_POSTFIX ${CMAKE_RELWITHDEBINFO_POSTFIX})
+  elseif(CMAKE_BUILD_TYPE MATCHES MinSizeRel)
+    set(LIB_POSTFIX ${CMAKE_MINSIZEREL_POSTFIX})
+  elseif(CMAKE_BUILD_TYPE MATCHES Debug)
+    set(LIB_POSTFIX ${CMAKE_DEBUG_POSTFIX})
+  endif()
+endif()
+
+# Handle both relative and absolute paths (e.g. NixOS) for a relocatable package
+if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
+  set(PUGIXML_PC_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
+else()
+  set(PUGIXML_PC_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+endif()
+if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
+  set(PUGIXML_PC_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
+else()
+  set(PUGIXML_PC_LIBDIR "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
+endif()
+configure_file(scripts/pugixml.pc.in pugixml.pc @ONLY)
+
+export(TARGETS ${install-targets}
+  NAMESPACE pugixml::
+  FILE pugixml-targets.cmake)
+
+if(PUGIXML_INSTALL)
+  if (NOT DEFINED PUGIXML_RUNTIME_COMPONENT)
+    set(PUGIXML_RUNTIME_COMPONENT Runtime)
+  endif()
+
+  if (NOT DEFINED PUGIXML_LIBRARY_COMPONENT)
+    set(PUGIXML_LIBRARY_COMPONENT Library)
+  endif()
+
+  if (NOT DEFINED PUGIXML_DEVELOPMENT_COMPONENT)
+    set(PUGIXML_DEVELOPMENT_COMPONENT Development)
+  endif()
+
+  set(namelink-component)
+  if (NOT CMAKE_VERSION VERSION_LESS 3.12)
+    set(namelink-component NAMELINK_COMPONENT ${PUGIXML_DEVELOPMENT_COMPONENT})
+  endif()
+  install(TARGETS ${install-targets}
+    EXPORT pugixml-targets
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${PUGIXML_RUNTIME_COMPONENT}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${PUGIXML_LIBRARY_COMPONENT} ${namelink-component}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${PUGIXML_DEVELOPMENT_COMPONENT}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${versioned-dir}
+    FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime OPTIONAL)
+
+  install(EXPORT pugixml-targets
+    NAMESPACE pugixml::
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml COMPONENT ${PUGIXML_DEVELOPMENT_COMPONENT})
+
+  install(FILES
+    "${PROJECT_BINARY_DIR}/pugixml-config-version.cmake"
+    "${PROJECT_BINARY_DIR}/pugixml-config.cmake"
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml COMPONENT ${PUGIXML_DEVELOPMENT_COMPONENT})
+
+  install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT ${PUGIXML_DEVELOPMENT_COMPONENT})
+
+  install(
+    FILES
+      "${PROJECT_SOURCE_DIR}/src/pugiconfig.hpp"
+      "${PROJECT_SOURCE_DIR}/src/pugixml.hpp"
+    DESTINATION
+      ${CMAKE_INSTALL_INCLUDEDIR}${versioned-dir} COMPONENT ${PUGIXML_DEVELOPMENT_COMPONENT})
+endif()
+
+if (PUGIXML_BUILD_TESTS)
+  include(CTest)
+  set(fuzz-pattern "tests/fuzz_*.cpp")
+  set(test-pattern "tests/*.cpp")
+  if (CMAKE_VERSION VERSION_GREATER 3.11)
+    list(INSERT fuzz-pattern 0 CONFIGURE_DEPENDS)
+    list(INSERT test-pattern 0 CONFIGURE_DEPENDS)
+  endif()
+  file(GLOB test-sources ${test-pattern})
+  file(GLOB fuzz-sources ${fuzz-pattern})
+  list(REMOVE_ITEM test-sources ${fuzz-sources})
+
+  add_custom_target(check
+    COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure)
+
+  add_executable(pugixml-check ${test-sources})
+  add_test(NAME pugixml::test
+    COMMAND pugixml-check
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+  add_dependencies(check pugixml-check)
+  target_link_libraries(pugixml-check
+    PRIVATE
+      pugixml::pugixml)
 endif()
diff --git a/contrib/pugixml/LICENSE.md b/contrib/pugixml/LICENSE.md
new file mode 100644
index 000000000..cc9e51fa0
--- /dev/null
+++ b/contrib/pugixml/LICENSE.md
@@ -0,0 +1,24 @@
+MIT License
+
+Copyright (c) 2006-2025 Arseny Kapoulkine
+
+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/contrib/pugixml/readme.txt b/contrib/pugixml/readme.txt
index 9dffb72a1..2d4c884ab 100644
--- a/contrib/pugixml/readme.txt
+++ b/contrib/pugixml/readme.txt
@@ -1,6 +1,6 @@
-pugixml 1.13 - an XML processing library
+pugixml 1.15 - an XML processing library
 
-Copyright (C) 2006-2022, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+Copyright (C) 2006-2025, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
 Report bugs and download new versions at https://pugixml.org/
 
 This is the distribution of pugixml, which is a C++ XML processing library,
@@ -26,7 +26,7 @@ The distribution contains the following folders:
 
 This library is distributed under the MIT License:
 
-Copyright (c) 2006-2022 Arseny Kapoulkine
+Copyright (c) 2006-2025 Arseny Kapoulkine
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
diff --git a/contrib/pugixml/src/pugiconfig.hpp b/contrib/pugixml/src/pugiconfig.hpp
index 9bf2efd39..9bcf0b654 100644
--- a/contrib/pugixml/src/pugiconfig.hpp
+++ b/contrib/pugixml/src/pugiconfig.hpp
@@ -1,7 +1,7 @@
 /**
- * pugixml parser - version 1.13
+ * pugixml parser - version 1.15
  * --------------------------------------------------------
- * Copyright (C) 2006-2022, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Copyright (C) 2006-2025, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
  * Report bugs and download new versions at https://pugixml.org/
  *
  * This library is distributed under the MIT License. See notice at the end
@@ -30,9 +30,14 @@
 // #define PUGIXML_NO_EXCEPTIONS
 
 // Set this to control attributes for public classes/functions, i.e.:
-// #define PUGIXML_API __declspec(dllexport) // to export all public symbols from DLL
-// #define PUGIXML_CLASS __declspec(dllimport) // to import all classes from DLL
-// #define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall
+#ifdef _WIN32
+#   define PUGIXML_API __declspec(dllexport) // to export all public symbols from DLL
+#else
+#  define PUGIXML_API __attribute__((visibility("default")))
+#endif // _WIN32
+#
+//define PUGIXML_CLASS __declspec(dllimport) // to import all classes from DLL
+//#define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall
 // In absence of PUGIXML_CLASS/PUGIXML_FUNCTION definitions PUGIXML_API is used instead
 
 // Tune these constants to adjust memory-related behavior
@@ -44,15 +49,18 @@
 // #define PUGIXML_XPATH_DEPTH_LIMIT 1024
 
 // Uncomment this to switch to header-only version
-#define PUGIXML_HEADER_ONLY
+// #define PUGIXML_HEADER_ONLY
 
-// Uncomment this to enable long long support
+// Uncomment this to enable long long support (usually enabled automatically)
 // #define PUGIXML_HAS_LONG_LONG
 
+// Uncomment this to enable support for std::string_view (usually enabled automatically)
+// #define PUGIXML_HAS_STRING_VIEW
+
 #endif
 
 /**
- * Copyright (c) 2006-2022 Arseny Kapoulkine
+ * Copyright (c) 2006-2025 Arseny Kapoulkine
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/contrib/pugixml/src/pugixml.cpp b/contrib/pugixml/src/pugixml.cpp
index c63645b67..5f145b849 100644
--- a/contrib/pugixml/src/pugixml.cpp
+++ b/contrib/pugixml/src/pugixml.cpp
@@ -1,7 +1,7 @@
 /**
- * pugixml parser - version 1.13
+ * pugixml parser - version 1.15
  * --------------------------------------------------------
- * Copyright (C) 2006-2022, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Copyright (C) 2006-2025, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
  * Report bugs and download new versions at https://pugixml.org/
  *
  * This library is distributed under the MIT License. See notice at the end
@@ -40,6 +40,11 @@
 // For placement new
 #include <new>
 
+// For load_file
+#if defined(__linux__) || defined(__APPLE__)
+#include <sys/stat.h>
+#endif
+
 #ifdef _MSC_VER
 #	pragma warning(push)
 #	pragma warning(disable: 4127) // conditional expression is constant
@@ -48,6 +53,11 @@
 #	pragma warning(disable: 4996) // this function or variable may be unsafe
 #endif
 
+#if defined(__clang__)
+#	pragma clang diagnostic push
+#	pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // NULL as null pointer constant
+#endif
+
 #if defined(_MSC_VER) && defined(__c2__)
 #	pragma clang diagnostic push
 #	pragma clang diagnostic ignored "-Wdeprecated" // this function or variable may be unsafe
@@ -82,39 +92,39 @@
 
 // Inlining controls
 #if defined(_MSC_VER) && _MSC_VER >= 1300
-#	define PUGI__NO_INLINE __declspec(noinline)
+#	define PUGI_IMPL_NO_INLINE __declspec(noinline)
 #elif defined(__GNUC__)
-#	define PUGI__NO_INLINE __attribute__((noinline))
+#	define PUGI_IMPL_NO_INLINE __attribute__((noinline))
 #else
-#	define PUGI__NO_INLINE
+#	define PUGI_IMPL_NO_INLINE
 #endif
 
 // Branch weight controls
 #if defined(__GNUC__) && !defined(__c2__)
-#	define PUGI__UNLIKELY(cond) __builtin_expect(cond, 0)
+#	define PUGI_IMPL_UNLIKELY(cond) __builtin_expect(cond, 0)
 #else
-#	define PUGI__UNLIKELY(cond) (cond)
+#	define PUGI_IMPL_UNLIKELY(cond) (cond)
 #endif
 
 // Simple static assertion
-#define PUGI__STATIC_ASSERT(cond) { static const char condition_failed[(cond) ? 1 : -1] = {0}; (void)condition_failed[0]; }
+#define PUGI_IMPL_STATIC_ASSERT(cond) { static const char condition_failed[(cond) ? 1 : -1] = {0}; (void)condition_failed[0]; }
 
 // Digital Mars C++ bug workaround for passing char loaded from memory via stack
 #ifdef __DMC__
-#	define PUGI__DMC_VOLATILE volatile
+#	define PUGI_IMPL_DMC_VOLATILE volatile
 #else
-#	define PUGI__DMC_VOLATILE
+#	define PUGI_IMPL_DMC_VOLATILE
 #endif
 
 // Integer sanitizer workaround; we only apply this for clang since gcc8 has no_sanitize but not unsigned-integer-overflow and produces "attribute directive ignored" warnings
 #if defined(__clang__) && defined(__has_attribute)
 #	if __has_attribute(no_sanitize)
-#		define PUGI__UNSIGNED_OVERFLOW __attribute__((no_sanitize("unsigned-integer-overflow")))
+#		define PUGI_IMPL_UNSIGNED_OVERFLOW __attribute__((no_sanitize("unsigned-integer-overflow")))
 #	else
-#		define PUGI__UNSIGNED_OVERFLOW
+#		define PUGI_IMPL_UNSIGNED_OVERFLOW
 #	endif
 #else
-#	define PUGI__UNSIGNED_OVERFLOW
+#	define PUGI_IMPL_UNSIGNED_OVERFLOW
 #endif
 
 // Borland C++ bug workaround for not defining ::memcpy depending on header include order (can't always use std::memcpy because some compilers don't have it at all)
@@ -124,6 +134,12 @@ using std::memmove;
 using std::memset;
 #endif
 
+// Old versions of GCC do not define ::malloc and ::free depending on header include order
+#if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4))
+using std::malloc;
+using std::free;
+#endif
+
 // Some MinGW/GCC versions have headers that erroneously omit LLONG_MIN/LLONG_MAX/ULLONG_MAX definitions from limits.h in some configurations
 #if defined(PUGIXML_HAS_LONG_LONG) && defined(__GNUC__) && !defined(LLONG_MAX) && !defined(LLONG_MIN) && !defined(ULLONG_MAX)
 #	define LLONG_MIN (-LLONG_MAX - 1LL)
@@ -133,36 +149,38 @@ using std::memset;
 
 // In some environments MSVC is a compiler but the CRT lacks certain MSVC-specific features
 #if defined(_MSC_VER) && !defined(__S3E__) && !defined(_WIN32_WCE)
-#	define PUGI__MSVC_CRT_VERSION _MSC_VER
+#	define PUGI_IMPL_MSVC_CRT_VERSION _MSC_VER
 #elif defined(_WIN32_WCE)
-#	define PUGI__MSVC_CRT_VERSION 1310 // MSVC7.1
+#	define PUGI_IMPL_MSVC_CRT_VERSION 1310 // MSVC7.1
 #endif
 
 // Not all platforms have snprintf; we define a wrapper that uses snprintf if possible. This only works with buffers with a known size.
 #if __cplusplus >= 201103
-#	define PUGI__SNPRINTF(buf, ...) snprintf(buf, sizeof(buf), __VA_ARGS__)
-#elif defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400
-#	define PUGI__SNPRINTF(buf, ...) _snprintf_s(buf, _countof(buf), _TRUNCATE, __VA_ARGS__)
+#	define PUGI_IMPL_SNPRINTF(buf, ...) snprintf(buf, sizeof(buf), __VA_ARGS__)
+#elif defined(PUGI_IMPL_MSVC_CRT_VERSION) && PUGI_IMPL_MSVC_CRT_VERSION >= 1400
+#	define PUGI_IMPL_SNPRINTF(buf, ...) _snprintf_s(buf, _countof(buf), _TRUNCATE, __VA_ARGS__)
+#elif defined(__APPLE__) && __clang_major__ >= 14 // Xcode 14 marks sprintf as deprecated while still using C++98 by default
+#	define PUGI_IMPL_SNPRINTF(buf, fmt, arg1, arg2) snprintf(buf, sizeof(buf), fmt, arg1, arg2)
 #else
-#	define PUGI__SNPRINTF sprintf
+#	define PUGI_IMPL_SNPRINTF sprintf
 #endif
 
 // We put implementation details into an anonymous namespace in source mode, but have to keep it in non-anonymous namespace in header-only mode to prevent binary bloat.
 #ifdef PUGIXML_HEADER_ONLY
-#	define PUGI__NS_BEGIN namespace pugi { namespace impl {
-#	define PUGI__NS_END } }
-#	define PUGI__FN inline
-#	define PUGI__FN_NO_INLINE inline
+#	define PUGI_IMPL_NS_BEGIN namespace pugi { namespace impl {
+#	define PUGI_IMPL_NS_END } }
+#	define PUGI_IMPL_FN inline
+#	define PUGI_IMPL_FN_NO_INLINE inline
 #else
 #	if defined(_MSC_VER) && _MSC_VER < 1300 // MSVC6 seems to have an amusing bug with anonymous namespaces inside namespaces
-#		define PUGI__NS_BEGIN namespace pugi { namespace impl {
-#		define PUGI__NS_END } }
+#		define PUGI_IMPL_NS_BEGIN namespace pugi { namespace impl {
+#		define PUGI_IMPL_NS_END } }
 #	else
-#		define PUGI__NS_BEGIN namespace pugi { namespace impl { namespace {
-#		define PUGI__NS_END } } }
+#		define PUGI_IMPL_NS_BEGIN namespace pugi { namespace impl { namespace {
+#		define PUGI_IMPL_NS_END } } }
 #	endif
-#	define PUGI__FN
-#	define PUGI__FN_NO_INLINE PUGI__NO_INLINE
+#	define PUGI_IMPL_FN
+#	define PUGI_IMPL_FN_NO_INLINE PUGI_IMPL_NO_INLINE
 #endif
 
 // uintptr_t
@@ -182,13 +200,13 @@ namespace pugi
 #endif
 
 // Memory allocation
-PUGI__NS_BEGIN
-	PUGI__FN void* default_allocate(size_t size)
+PUGI_IMPL_NS_BEGIN
+	PUGI_IMPL_FN void* default_allocate(size_t size)
 	{
 		return malloc(size);
 	}
 
-	PUGI__FN void default_deallocate(void* ptr)
+	PUGI_IMPL_FN void default_deallocate(void* ptr)
 	{
 		free(ptr);
 	}
@@ -206,12 +224,12 @@ PUGI__NS_BEGIN
 	template <typename T> deallocation_function xml_memory_management_function_storage<T>::deallocate = default_deallocate;
 
 	typedef xml_memory_management_function_storage<int> xml_memory;
-PUGI__NS_END
+PUGI_IMPL_NS_END
 
 // String utilities
-PUGI__NS_BEGIN
+PUGI_IMPL_NS_BEGIN
 	// Get string length
-	PUGI__FN size_t strlength(const char_t* s)
+	PUGI_IMPL_FN size_t strlength(const char_t* s)
 	{
 		assert(s);
 
@@ -223,7 +241,7 @@ PUGI__NS_BEGIN
 	}
 
 	// Compare two strings
-	PUGI__FN bool strequal(const char_t* src, const char_t* dst)
+	PUGI_IMPL_FN bool strequal(const char_t* src, const char_t* dst)
 	{
 		assert(src && dst);
 
@@ -234,8 +252,26 @@ PUGI__NS_BEGIN
 	#endif
 	}
 
+#ifdef PUGIXML_HAS_STRING_VIEW
+	// Check if the null-terminated dst string is equal to the entire contents of srcview
+	PUGI_IMPL_FN bool stringview_equal(string_view_t srcview, const char_t* dst)
+	{
+		// std::basic_string_view::compare(const char*) has the right behavior, but it performs an
+		// extra traversal of dst to compute its length.
+		assert(dst);
+		const char_t* src = srcview.data();
+		size_t srclen = srcview.size();
+
+		while (srclen && *dst && *src == *dst)
+		{
+			--srclen; ++dst; ++src; 
+		}
+		return srclen == 0 && *dst == 0;
+	}
+#endif
+
 	// Compare lhs with [rhs_begin, rhs_end)
-	PUGI__FN bool strequalrange(const char_t* lhs, const char_t* rhs, size_t count)
+	PUGI_IMPL_FN bool strequalrange(const char_t* lhs, const char_t* rhs, size_t count)
 	{
 		for (size_t i = 0; i < count; ++i)
 			if (lhs[i] != rhs[i])
@@ -245,7 +281,7 @@ PUGI__NS_BEGIN
 	}
 
 	// Get length of wide string, even if CRT lacks wide character support
-	PUGI__FN size_t strlength_wide(const wchar_t* s)
+	PUGI_IMPL_FN size_t strlength_wide(const wchar_t* s)
 	{
 		assert(s);
 
@@ -257,10 +293,10 @@ PUGI__NS_BEGIN
 		return static_cast<size_t>(end - s);
 	#endif
 	}
-PUGI__NS_END
+PUGI_IMPL_NS_END
 
 // auto_ptr-like object for exception recovery
-PUGI__NS_BEGIN
+PUGI_IMPL_NS_BEGIN
 	template <typename T> struct auto_deleter
 	{
 		typedef void (*D)(T*);
@@ -280,18 +316,18 @@ PUGI__NS_BEGIN
 		T* release()
 		{
 			T* result = data;
-			data = 0;
+			data = nullptr;
 			return result;
 		}
 	};
-PUGI__NS_END
+PUGI_IMPL_NS_END
 
 #ifdef PUGIXML_COMPACT
-PUGI__NS_BEGIN
+PUGI_IMPL_NS_BEGIN
 	class compact_hash_table
 	{
 	public:
-		compact_hash_table(): _items(0), _capacity(0), _count(0)
+		compact_hash_table(): _items(NULL), _capacity(0), _count(0)
 		{
 		}
 
@@ -300,7 +336,7 @@ PUGI__NS_BEGIN
 			if (_items)
 			{
 				xml_memory::deallocate(_items);
-				_items = 0;
+				_items = nullptr;
 				_capacity = 0;
 				_count = 0;
 			}
@@ -308,11 +344,11 @@ PUGI__NS_BEGIN
 
 		void* find(const void* key)
 		{
-			if (_capacity == 0) return 0;
+			if (_capacity == 0) return nullptr;
 
 			item_t* item = get_item(key);
 			assert(item);
-			assert(item->key == key || (item->key == 0 && item->value == 0));
+			assert(item->key == key || (item->key == nullptr && item->value == nullptr));
 
 			return item->value;
 		}
@@ -324,7 +360,7 @@ PUGI__NS_BEGIN
 			item_t* item = get_item(key);
 			assert(item);
 
-			if (item->key == 0)
+			if (item->key == nullptr)
 			{
 				_count++;
 				item->key = key;
@@ -367,7 +403,7 @@ PUGI__NS_BEGIN
 			{
 				item_t& probe_item = _items[bucket];
 
-				if (probe_item.key == key || probe_item.key == 0)
+				if (probe_item.key == key || probe_item.key == nullptr)
 					return &probe_item;
 
 				// hash collision, quadratic probing
@@ -375,10 +411,10 @@ PUGI__NS_BEGIN
 			}
 
 			assert(false && "Hash table is full"); // unreachable
-			return 0;
+			return nullptr;
 		}
 
-		static PUGI__UNSIGNED_OVERFLOW unsigned int hash(const void* key)
+		static PUGI_IMPL_UNSIGNED_OVERFLOW unsigned int hash(const void* key)
 		{
 			unsigned int h = static_cast<unsigned int>(reinterpret_cast<uintptr_t>(key) & 0xffffffff);
 
@@ -393,7 +429,7 @@ PUGI__NS_BEGIN
 		}
 	};
 
-	PUGI__FN_NO_INLINE bool compact_hash_table::rehash(size_t count)
+	PUGI_IMPL_FN_NO_INLINE bool compact_hash_table::rehash(size_t count)
 	{
 		size_t capacity = 32;
 		while (count >= capacity - capacity / 4)
@@ -423,10 +459,10 @@ PUGI__NS_BEGIN
 		return true;
 	}
 
-PUGI__NS_END
+PUGI_IMPL_NS_END
 #endif
 
-PUGI__NS_BEGIN
+PUGI_IMPL_NS_BEGIN
 #ifdef PUGIXML_COMPACT
 	static const uintptr_t xml_memory_block_alignment = 4;
 #else
@@ -444,16 +480,16 @@ PUGI__NS_BEGIN
 	static const uintptr_t xml_memory_page_value_allocated_or_shared_mask = xml_memory_page_value_allocated_mask | xml_memory_page_contents_shared_mask;
 
 #ifdef PUGIXML_COMPACT
-	#define PUGI__GETHEADER_IMPL(object, page, flags) // unused
-	#define PUGI__GETPAGE_IMPL(header) (header).get_page()
+	#define PUGI_IMPL_GETHEADER_IMPL(object, page, flags) // unused
+	#define PUGI_IMPL_GETPAGE_IMPL(header) (header).get_page()
 #else
-	#define PUGI__GETHEADER_IMPL(object, page, flags) (((reinterpret_cast<char*>(object) - reinterpret_cast<char*>(page)) << 8) | (flags))
+	#define PUGI_IMPL_GETHEADER_IMPL(object, page, flags) (((reinterpret_cast<char*>(object) - reinterpret_cast<char*>(page)) << 8) | (flags))
 	// this macro casts pointers through void* to avoid 'cast increases required alignment of target type' warnings
-	#define PUGI__GETPAGE_IMPL(header) static_cast<impl::xml_memory_page*>(const_cast<void*>(static_cast<const void*>(reinterpret_cast<const char*>(&header) - (header >> 8))))
+	#define PUGI_IMPL_GETPAGE_IMPL(header) static_cast<impl::xml_memory_page*>(const_cast<void*>(static_cast<const void*>(reinterpret_cast<const char*>(&header) - (header >> 8))))
 #endif
 
-	#define PUGI__GETPAGE(n) PUGI__GETPAGE_IMPL((n)->header)
-	#define PUGI__NODETYPE(n) static_cast<xml_node_type>((n)->header & impl::xml_memory_page_type_mask)
+	#define PUGI_IMPL_GETPAGE(n) PUGI_IMPL_GETPAGE_IMPL((n)->header)
+	#define PUGI_IMPL_NODETYPE(n) static_cast<xml_node_type>((n)->header & impl::xml_memory_page_type_mask)
 
 	struct xml_allocator;
 
@@ -463,16 +499,16 @@ PUGI__NS_BEGIN
 		{
 			xml_memory_page* result = static_cast<xml_memory_page*>(memory);
 
-			result->allocator = 0;
-			result->prev = 0;
-			result->next = 0;
+			result->allocator = nullptr;
+			result->prev = nullptr;
+			result->next = nullptr;
 			result->busy_size = 0;
 			result->freed_size = 0;
 
 		#ifdef PUGIXML_COMPACT
-			result->compact_string_base = 0;
-			result->compact_shared_parent = 0;
-			result->compact_page_marker = 0;
+			result->compact_string_base = nullptr;
+			result->compact_shared_parent = nullptr;
+			result->compact_page_marker = nullptr;
 		#endif
 
 			return result;
@@ -512,7 +548,7 @@ PUGI__NS_BEGIN
 		xml_allocator(xml_memory_page* root): _root(root), _busy_size(root->busy_size)
 		{
 		#ifdef PUGIXML_COMPACT
-			_hash = 0;
+			_hash = nullptr;
 		#endif
 		}
 
@@ -522,7 +558,7 @@ PUGI__NS_BEGIN
 
 			// allocate block with some alignment, leaving memory for worst-case padding
 			void* memory = xml_memory::allocate(size);
-			if (!memory) return 0;
+			if (!memory) return nullptr;
 
 			// prepare page structure
 			xml_memory_page* page = xml_memory_page::construct(memory);
@@ -543,7 +579,7 @@ PUGI__NS_BEGIN
 
 		void* allocate_memory(size_t size, xml_memory_page*& out_page)
 		{
-			if (PUGI__UNLIKELY(_busy_size + size > xml_memory_page_size))
+			if (PUGI_IMPL_UNLIKELY(_busy_size + size > xml_memory_page_size))
 				return allocate_memory_oob(size, out_page);
 
 			void* buf = reinterpret_cast<char*>(_root) + sizeof(xml_memory_page) + _busy_size;
@@ -559,12 +595,12 @@ PUGI__NS_BEGIN
 		void* allocate_object(size_t size, xml_memory_page*& out_page)
 		{
 			void* result = allocate_memory(size + sizeof(uint32_t), out_page);
-			if (!result) return 0;
+			if (!result) return nullptr;
 
 			// adjust for marker
 			ptrdiff_t offset = static_cast<char*>(result) - reinterpret_cast<char*>(out_page->compact_page_marker);
 
-			if (PUGI__UNLIKELY(static_cast<uintptr_t>(offset) >= 256 * xml_memory_block_alignment))
+			if (PUGI_IMPL_UNLIKELY(static_cast<uintptr_t>(offset) >= 256 * xml_memory_block_alignment))
 			{
 				// insert new marker
 				uint32_t* marker = static_cast<uint32_t*>(result);
@@ -605,7 +641,7 @@ PUGI__NS_BEGIN
 
 			if (page->freed_size == page->busy_size)
 			{
-				if (page->next == 0)
+				if (page->next == nullptr)
 				{
 					assert(_root == page);
 
@@ -615,9 +651,9 @@ PUGI__NS_BEGIN
 
 				#ifdef PUGIXML_COMPACT
 					// reset compact state to maximize efficiency
-					page->compact_string_base = 0;
-					page->compact_shared_parent = 0;
-					page->compact_page_marker = 0;
+					page->compact_string_base = nullptr;
+					page->compact_shared_parent = nullptr;
+					page->compact_page_marker = nullptr;
 				#endif
 
 					_busy_size = 0;
@@ -641,7 +677,7 @@ PUGI__NS_BEGIN
 		{
 			static const size_t max_encoded_offset = (1 << 16) * xml_memory_block_alignment;
 
-			PUGI__STATIC_ASSERT(xml_memory_page_size <= max_encoded_offset);
+			PUGI_IMPL_STATIC_ASSERT(xml_memory_page_size <= max_encoded_offset);
 
 			// allocate memory for string and header block
 			size_t size = sizeof(xml_memory_string_header) + length * sizeof(char_t);
@@ -652,7 +688,7 @@ PUGI__NS_BEGIN
 			xml_memory_page* page;
 			xml_memory_string_header* header = static_cast<xml_memory_string_header*>(allocate_memory(full_size, page));
 
-			if (!header) return 0;
+			if (!header) return nullptr;
 
 			// setup header
 			ptrdiff_t page_offset = reinterpret_cast<char*>(header) - reinterpret_cast<char*>(page) - sizeof(xml_memory_page);
@@ -707,14 +743,14 @@ PUGI__NS_BEGIN
 	#endif
 	};
 
-	PUGI__FN_NO_INLINE void* xml_allocator::allocate_memory_oob(size_t size, xml_memory_page*& out_page)
+	PUGI_IMPL_FN_NO_INLINE void* xml_allocator::allocate_memory_oob(size_t size, xml_memory_page*& out_page)
 	{
 		const size_t large_allocation_threshold = xml_memory_page_size / 4;
 
 		xml_memory_page* page = allocate_page(size <= large_allocation_threshold ? xml_memory_page_size : size);
 		out_page = page;
 
-		if (!page) return 0;
+		if (!page) return nullptr;
 
 		if (size <= large_allocation_threshold)
 		{
@@ -744,10 +780,10 @@ PUGI__NS_BEGIN
 
 		return reinterpret_cast<char*>(page) + sizeof(xml_memory_page);
 	}
-PUGI__NS_END
+PUGI_IMPL_NS_END
 
 #ifdef PUGIXML_COMPACT
-PUGI__NS_BEGIN
+PUGI_IMPL_NS_BEGIN
 	static const uintptr_t compact_alignment_log2 = 2;
 	static const uintptr_t compact_alignment = 1 << compact_alignment_log2;
 
@@ -756,7 +792,7 @@ PUGI__NS_BEGIN
 	public:
 		compact_header(xml_memory_page* page, unsigned int flags)
 		{
-			PUGI__STATIC_ASSERT(xml_memory_block_alignment == compact_alignment);
+			PUGI_IMPL_STATIC_ASSERT(xml_memory_block_alignment == compact_alignment);
 
 			ptrdiff_t offset = (reinterpret_cast<char*>(this) - reinterpret_cast<char*>(page->compact_page_marker));
 			assert(offset % compact_alignment == 0 && static_cast<uintptr_t>(offset) < 256 * compact_alignment);
@@ -794,19 +830,19 @@ PUGI__NS_BEGIN
 		unsigned char _flags;
 	};
 
-	PUGI__FN xml_memory_page* compact_get_page(const void* object, int header_offset)
+	PUGI_IMPL_FN xml_memory_page* compact_get_page(const void* object, int header_offset)
 	{
 		const compact_header* header = reinterpret_cast<const compact_header*>(static_cast<const char*>(object) - header_offset);
 
 		return header->get_page();
 	}
 
-	template <int header_offset, typename T> PUGI__FN_NO_INLINE T* compact_get_value(const void* object)
+	template <int header_offset, typename T> PUGI_IMPL_FN_NO_INLINE T* compact_get_value(const void* object)
 	{
 		return static_cast<T*>(compact_get_page(object, header_offset)->allocator->_hash->find(object));
 	}
 
-	template <int header_offset, typename T> PUGI__FN_NO_INLINE void compact_set_value(const void* object, T* value)
+	template <int header_offset, typename T> PUGI_IMPL_FN_NO_INLINE void compact_set_value(const void* object, T* value)
 	{
 		compact_get_page(object, header_offset)->allocator->_hash->insert(object, value);
 	}
@@ -861,7 +897,7 @@ PUGI__NS_BEGIN
 					return compact_get_value<header_offset, T>(this);
 			}
 			else
-				return 0;
+				return nullptr;
 		}
 
 		T* operator->() const
@@ -904,7 +940,7 @@ PUGI__NS_BEGIN
 				{
 					xml_memory_page* page = compact_get_page(this, header_offset);
 
-					if (PUGI__UNLIKELY(page->compact_shared_parent == 0))
+					if (PUGI_IMPL_UNLIKELY(page->compact_shared_parent == nullptr))
 						page->compact_shared_parent = value;
 
 					if (page->compact_shared_parent == value)
@@ -941,7 +977,7 @@ PUGI__NS_BEGIN
 					return compact_get_value<header_offset, T>(this);
 			}
 			else
-				return 0;
+				return nullptr;
 		}
 
 		T* operator->() const
@@ -971,7 +1007,7 @@ PUGI__NS_BEGIN
 			{
 				xml_memory_page* page = compact_get_page(this, header_offset);
 
-				if (PUGI__UNLIKELY(page->compact_string_base == 0))
+				if (PUGI_IMPL_UNLIKELY(page->compact_string_base == nullptr))
 					page->compact_string_base = value;
 
 				ptrdiff_t offset = value - page->compact_string_base;
@@ -1037,13 +1073,13 @@ PUGI__NS_BEGIN
 				}
 			}
 			else
-				return 0;
+				return nullptr;
 		}
 
 	private:
 		unsigned char _data;
 	};
-PUGI__NS_END
+PUGI_IMPL_NS_END
 #endif
 
 #ifdef PUGIXML_COMPACT
@@ -1053,7 +1089,7 @@ namespace pugi
 	{
 		xml_attribute_struct(impl::xml_memory_page* page): header(page, 0), namevalue_base(0)
 		{
-			PUGI__STATIC_ASSERT(sizeof(xml_attribute_struct) == 8);
+			PUGI_IMPL_STATIC_ASSERT(sizeof(xml_attribute_struct) == 8);
 		}
 
 		impl::compact_header header;
@@ -1071,7 +1107,7 @@ namespace pugi
 	{
 		xml_node_struct(impl::xml_memory_page* page, xml_node_type type): header(page, type), namevalue_base(0)
 		{
-			PUGI__STATIC_ASSERT(sizeof(xml_node_struct) == 12);
+			PUGI_IMPL_STATIC_ASSERT(sizeof(xml_node_struct) == 12);
 		}
 
 		impl::compact_header header;
@@ -1096,9 +1132,9 @@ namespace pugi
 {
 	struct xml_attribute_struct
 	{
-		xml_attribute_struct(impl::xml_memory_page* page): name(0), value(0), prev_attribute_c(0), next_attribute(0)
+		xml_attribute_struct(impl::xml_memory_page* page): name(nullptr), value(nullptr), prev_attribute_c(nullptr), next_attribute(nullptr)
 		{
-			header = PUGI__GETHEADER_IMPL(this, page, 0);
+			header = PUGI_IMPL_GETHEADER_IMPL(this, page, 0);
 		}
 
 		uintptr_t header;
@@ -1112,9 +1148,9 @@ namespace pugi
 
 	struct xml_node_struct
 	{
-		xml_node_struct(impl::xml_memory_page* page, xml_node_type type): name(0), value(0), parent(0), first_child(0), prev_sibling_c(0), next_sibling(0), first_attribute(0)
+		xml_node_struct(impl::xml_memory_page* page, xml_node_type type): name(nullptr), value(nullptr), parent(nullptr), first_child(nullptr), prev_sibling_c(nullptr), next_sibling(nullptr), first_attribute(nullptr)
 		{
-			header = PUGI__GETHEADER_IMPL(this, page, type);
+			header = PUGI_IMPL_GETHEADER_IMPL(this, page, type);
 		}
 
 		uintptr_t header;
@@ -1134,7 +1170,7 @@ namespace pugi
 }
 #endif
 
-PUGI__NS_BEGIN
+PUGI_IMPL_NS_BEGIN
 	struct xml_extra_buffer
 	{
 		char_t* buffer;
@@ -1143,7 +1179,7 @@ PUGI__NS_BEGIN
 
 	struct xml_document_struct: public xml_node_struct, public xml_allocator
 	{
-		xml_document_struct(xml_memory_page* page): xml_node_struct(page, node_document), xml_allocator(page), buffer(0), extra_buffers(0)
+		xml_document_struct(xml_memory_page* page): xml_node_struct(page, node_document), xml_allocator(page), buffer(nullptr), extra_buffers(nullptr)
 		{
 		}
 
@@ -1160,24 +1196,24 @@ PUGI__NS_BEGIN
 	{
 		assert(object);
 
-		return *PUGI__GETPAGE(object)->allocator;
+		return *PUGI_IMPL_GETPAGE(object)->allocator;
 	}
 
 	template <typename Object> inline xml_document_struct& get_document(const Object* object)
 	{
 		assert(object);
 
-		return *static_cast<xml_document_struct*>(PUGI__GETPAGE(object)->allocator);
+		return *static_cast<xml_document_struct*>(PUGI_IMPL_GETPAGE(object)->allocator);
 	}
-PUGI__NS_END
+PUGI_IMPL_NS_END
 
 // Low-level DOM operations
-PUGI__NS_BEGIN
+PUGI_IMPL_NS_BEGIN
 	inline xml_attribute_struct* allocate_attribute(xml_allocator& alloc)
 	{
 		xml_memory_page* page;
 		void* memory = alloc.allocate_object(sizeof(xml_attribute_struct), page);
-		if (!memory) return 0;
+		if (!memory) return nullptr;
 
 		return new (memory) xml_attribute_struct(page);
 	}
@@ -1186,7 +1222,7 @@ PUGI__NS_BEGIN
 	{
 		xml_memory_page* page;
 		void* memory = alloc.allocate_object(sizeof(xml_node_struct), page);
-		if (!memory) return 0;
+		if (!memory) return nullptr;
 
 		return new (memory) xml_node_struct(page, type);
 	}
@@ -1199,7 +1235,7 @@ PUGI__NS_BEGIN
 		if (a->header & impl::xml_memory_page_value_allocated_mask)
 			alloc.deallocate_string(a->value);
 
-		alloc.deallocate_memory(a, sizeof(xml_attribute_struct), PUGI__GETPAGE(a));
+		alloc.deallocate_memory(a, sizeof(xml_attribute_struct), PUGI_IMPL_GETPAGE(a));
 	}
 
 	inline void destroy_node(xml_node_struct* n, xml_allocator& alloc)
@@ -1228,7 +1264,7 @@ PUGI__NS_BEGIN
 			child = next;
 		}
 
-		alloc.deallocate_memory(n, sizeof(xml_node_struct), PUGI__GETPAGE(n));
+		alloc.deallocate_memory(n, sizeof(xml_node_struct), PUGI_IMPL_GETPAGE(n));
 	}
 
 	inline void append_node(xml_node_struct* child, xml_node_struct* node)
@@ -1325,9 +1361,9 @@ PUGI__NS_BEGIN
 		else
 			parent->first_child = next;
 
-		node->parent = 0;
-		node->prev_sibling_c = 0;
-		node->next_sibling = 0;
+		node->parent = nullptr;
+		node->prev_sibling_c = nullptr;
+		node->next_sibling = nullptr;
 	}
 
 	inline void append_attribute(xml_attribute_struct* attr, xml_node_struct* node)
@@ -1408,37 +1444,37 @@ PUGI__NS_BEGIN
 		else
 			node->first_attribute = next;
 
-		attr->prev_attribute_c = 0;
-		attr->next_attribute = 0;
+		attr->prev_attribute_c = nullptr;
+		attr->next_attribute = nullptr;
 	}
 
-	PUGI__FN_NO_INLINE xml_node_struct* append_new_node(xml_node_struct* node, xml_allocator& alloc, xml_node_type type = node_element)
+	PUGI_IMPL_FN_NO_INLINE xml_node_struct* append_new_node(xml_node_struct* node, xml_allocator& alloc, xml_node_type type = node_element)
 	{
-		if (!alloc.reserve()) return 0;
+		if (!alloc.reserve()) return nullptr;
 
 		xml_node_struct* child = allocate_node(alloc, type);
-		if (!child) return 0;
+		if (!child) return nullptr;
 
 		append_node(child, node);
 
 		return child;
 	}
 
-	PUGI__FN_NO_INLINE xml_attribute_struct* append_new_attribute(xml_node_struct* node, xml_allocator& alloc)
+	PUGI_IMPL_FN_NO_INLINE xml_attribute_struct* append_new_attribute(xml_node_struct* node, xml_allocator& alloc)
 	{
-		if (!alloc.reserve()) return 0;
+		if (!alloc.reserve()) return nullptr;
 
 		xml_attribute_struct* attr = allocate_attribute(alloc);
-		if (!attr) return 0;
+		if (!attr) return nullptr;
 
 		append_attribute(attr, node);
 
 		return attr;
 	}
-PUGI__NS_END
+PUGI_IMPL_NS_END
 
 // Helper classes for code generation
-PUGI__NS_BEGIN
+PUGI_IMPL_NS_BEGIN
 	struct opt_false
 	{
 		enum { value = 0 };
@@ -1448,10 +1484,10 @@ PUGI__NS_BEGIN
 	{
 		enum { value = 1 };
 	};
-PUGI__NS_END
+PUGI_IMPL_NS_END
 
 // Unicode utilities
-PUGI__NS_BEGIN
+PUGI_IMPL_NS_BEGIN
 	inline uint16_t endian_swap(uint16_t value)
 	{
 		return static_cast<uint16_t>(((value & 0xff) << 8) | (value >> 8));
@@ -1556,8 +1592,8 @@ PUGI__NS_BEGIN
 
 		static value_type high(value_type result, uint32_t ch)
 		{
-			uint32_t msh = static_cast<uint32_t>(ch - 0x10000) >> 10;
-			uint32_t lsh = static_cast<uint32_t>(ch - 0x10000) & 0x3ff;
+			uint32_t msh = (ch - 0x10000U) >> 10;
+			uint32_t lsh = (ch - 0x10000U) & 0x3ff;
 
 			result[0] = static_cast<uint16_t>(0xD800 + msh);
 			result[1] = static_cast<uint16_t>(0xDC00 + lsh);
@@ -1833,15 +1869,15 @@ PUGI__NS_BEGIN
 	};
 
 #ifdef PUGIXML_WCHAR_MODE
-	PUGI__FN void convert_wchar_endian_swap(wchar_t* result, const wchar_t* data, size_t length)
+	PUGI_IMPL_FN void convert_wchar_endian_swap(wchar_t* result, const wchar_t* data, size_t length)
 	{
 		for (size_t i = 0; i < length; ++i)
 			result[i] = static_cast<wchar_t>(endian_swap(static_cast<wchar_selector<sizeof(wchar_t)>::type>(data[i])));
 	}
 #endif
-PUGI__NS_END
+PUGI_IMPL_NS_END
 
-PUGI__NS_BEGIN
+PUGI_IMPL_NS_BEGIN
 	enum chartype_t
 	{
 		ct_parse_pcdata = 1,	// \0, &, \r, <
@@ -1854,7 +1890,7 @@ PUGI__NS_BEGIN
 		ct_start_symbol = 128	// Any symbol > 127, a-z, A-Z, _, :
 	};
 
-	static const unsigned char chartype_table[256] =
+	static constexpr unsigned char chartype_table[256] =
 	{
 		55,  0,   0,   0,   0,   0,   0,   0,      0,   12,  12,  0,   0,   63,  0,   0,   // 0-15
 		0,   0,   0,   0,   0,   0,   0,   0,      0,   0,   0,   0,   0,   0,   0,   0,   // 16-31
@@ -1884,7 +1920,7 @@ PUGI__NS_BEGIN
 		ctx_symbol = 16			  // Any symbol > 127, a-z, A-Z, 0-9, _, -, .
 	};
 
-	static const unsigned char chartypex_table[256] =
+	static constexpr unsigned char chartypex_table[256] =
 	{
 		3,  3,  3,  3,  3,  3,  3,  3,     3,  2,  2,  3,  3,  2,  3,  3,     // 0-15
 		3,  3,  3,  3,  3,  3,  3,  3,     3,  3,  3,  3,  3,  3,  3,  3,     // 16-31
@@ -1907,24 +1943,24 @@ PUGI__NS_BEGIN
 	};
 
 #ifdef PUGIXML_WCHAR_MODE
-	#define PUGI__IS_CHARTYPE_IMPL(c, ct, table) ((static_cast<unsigned int>(c) < 128 ? table[static_cast<unsigned int>(c)] : table[128]) & (ct))
+	#define PUGI_IMPL_IS_CHARTYPE_IMPL(c, ct, table) ((static_cast<unsigned int>(c) < 128 ? table[static_cast<unsigned int>(c)] : table[128]) & (ct))
 #else
-	#define PUGI__IS_CHARTYPE_IMPL(c, ct, table) (table[static_cast<unsigned char>(c)] & (ct))
+	#define PUGI_IMPL_IS_CHARTYPE_IMPL(c, ct, table) (table[static_cast<unsigned char>(c)] & (ct))
 #endif
 
-	#define PUGI__IS_CHARTYPE(c, ct) PUGI__IS_CHARTYPE_IMPL(c, ct, chartype_table)
-	#define PUGI__IS_CHARTYPEX(c, ct) PUGI__IS_CHARTYPE_IMPL(c, ct, chartypex_table)
+	#define PUGI_IMPL_IS_CHARTYPE(c, ct) PUGI_IMPL_IS_CHARTYPE_IMPL(c, ct, chartype_table)
+	#define PUGI_IMPL_IS_CHARTYPEX(c, ct) PUGI_IMPL_IS_CHARTYPE_IMPL(c, ct, chartypex_table)
 
-	PUGI__FN bool is_little_endian()
+	PUGI_IMPL_FN bool is_little_endian()
 	{
 		unsigned int ui = 1;
 
 		return *reinterpret_cast<unsigned char*>(&ui) == 1;
 	}
 
-	PUGI__FN xml_encoding get_wchar_encoding()
+	PUGI_IMPL_FN xml_encoding get_wchar_encoding()
 	{
-		PUGI__STATIC_ASSERT(sizeof(wchar_t) == 2 || sizeof(wchar_t) == 4);
+		PUGI_IMPL_STATIC_ASSERT(sizeof(wchar_t) == 2 || sizeof(wchar_t) == 4);
 
 		if (sizeof(wchar_t) == 2)
 			return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
@@ -1932,13 +1968,13 @@ PUGI__NS_BEGIN
 			return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
 	}
 
-	PUGI__FN bool parse_declaration_encoding(const uint8_t* data, size_t size, const uint8_t*& out_encoding, size_t& out_length)
+	PUGI_IMPL_FN bool parse_declaration_encoding(const uint8_t* data, size_t size, const uint8_t*& out_encoding, size_t& out_length)
 	{
-	#define PUGI__SCANCHAR(ch) { if (offset >= size || data[offset] != ch) return false; offset++; }
-	#define PUGI__SCANCHARTYPE(ct) { while (offset < size && PUGI__IS_CHARTYPE(data[offset], ct)) offset++; }
+	#define PUGI_IMPL_SCANCHAR(ch) { if (offset >= size || data[offset] != ch) return false; offset++; }
+	#define PUGI_IMPL_SCANCHARTYPE(ct) { while (offset < size && PUGI_IMPL_IS_CHARTYPE(data[offset], ct)) offset++; }
 
 		// check if we have a non-empty XML declaration
-		if (size < 6 || !((data[0] == '<') & (data[1] == '?') & (data[2] == 'x') & (data[3] == 'm') & (data[4] == 'l') && PUGI__IS_CHARTYPE(data[5], ct_space)))
+		if (size < 6 || !((data[0] == '<') & (data[1] == '?') & (data[2] == 'x') & (data[3] == 'm') & (data[4] == 'l') && PUGI_IMPL_IS_CHARTYPE(data[5], ct_space)))
 			return false;
 
 		// scan XML declaration until the encoding field
@@ -1953,28 +1989,28 @@ PUGI__NS_BEGIN
 				size_t offset = i;
 
 				// encoding follows the version field which can't contain 'en' so this has to be the encoding if XML is well formed
-				PUGI__SCANCHAR('e'); PUGI__SCANCHAR('n'); PUGI__SCANCHAR('c'); PUGI__SCANCHAR('o');
-				PUGI__SCANCHAR('d'); PUGI__SCANCHAR('i'); PUGI__SCANCHAR('n'); PUGI__SCANCHAR('g');
+				PUGI_IMPL_SCANCHAR('e'); PUGI_IMPL_SCANCHAR('n'); PUGI_IMPL_SCANCHAR('c'); PUGI_IMPL_SCANCHAR('o');
+				PUGI_IMPL_SCANCHAR('d'); PUGI_IMPL_SCANCHAR('i'); PUGI_IMPL_SCANCHAR('n'); PUGI_IMPL_SCANCHAR('g');
 
 				// S? = S?
-				PUGI__SCANCHARTYPE(ct_space);
-				PUGI__SCANCHAR('=');
-				PUGI__SCANCHARTYPE(ct_space);
+				PUGI_IMPL_SCANCHARTYPE(ct_space);
+				PUGI_IMPL_SCANCHAR('=');
+				PUGI_IMPL_SCANCHARTYPE(ct_space);
 
 				// the only two valid delimiters are ' and "
 				uint8_t delimiter = (offset < size && data[offset] == '"') ? '"' : '\'';
 
-				PUGI__SCANCHAR(delimiter);
+				PUGI_IMPL_SCANCHAR(delimiter);
 
 				size_t start = offset;
 
 				out_encoding = data + offset;
 
-				PUGI__SCANCHARTYPE(ct_symbol);
+				PUGI_IMPL_SCANCHARTYPE(ct_symbol);
 
 				out_length = offset - start;
 
-				PUGI__SCANCHAR(delimiter);
+				PUGI_IMPL_SCANCHAR(delimiter);
 
 				return true;
 			}
@@ -1982,11 +2018,11 @@ PUGI__NS_BEGIN
 
 		return false;
 
-	#undef PUGI__SCANCHAR
-	#undef PUGI__SCANCHARTYPE
+	#undef PUGI_IMPL_SCANCHAR
+	#undef PUGI_IMPL_SCANCHARTYPE
 	}
 
-	PUGI__FN xml_encoding guess_buffer_encoding(const uint8_t* data, size_t size)
+	PUGI_IMPL_FN xml_encoding guess_buffer_encoding(const uint8_t* data, size_t size)
 	{
 		// skip encoding autodetection if input buffer is too small
 		if (size < 4) return encoding_utf8;
@@ -2011,7 +2047,7 @@ PUGI__NS_BEGIN
 		if (d0 == 0x3c && d1 == 0) return encoding_utf16_le;
 
 		// no known BOM detected; parse declaration
-		const uint8_t* enc = 0;
+		const uint8_t* enc = nullptr;
 		size_t enc_length = 0;
 
 		if (d0 == 0x3c && d1 == 0x3f && d2 == 0x78 && d3 == 0x6d && parse_declaration_encoding(data, size, enc, enc_length))
@@ -2034,7 +2070,7 @@ PUGI__NS_BEGIN
 		return encoding_utf8;
 	}
 
-	PUGI__FN xml_encoding get_buffer_encoding(xml_encoding encoding, const void* contents, size_t size)
+	PUGI_IMPL_FN xml_encoding get_buffer_encoding(xml_encoding encoding, const void* contents, size_t size)
 	{
 		// replace wchar encoding with utf implementation
 		if (encoding == encoding_wchar) return get_wchar_encoding();
@@ -2054,7 +2090,7 @@ PUGI__NS_BEGIN
 		return guess_buffer_encoding(data, size);
 	}
 
-	PUGI__FN bool get_mutable_buffer(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+	PUGI_IMPL_FN bool get_mutable_buffer(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
 	{
 		size_t length = size / sizeof(char_t);
 
@@ -2083,13 +2119,13 @@ PUGI__NS_BEGIN
 	}
 
 #ifdef PUGIXML_WCHAR_MODE
-	PUGI__FN bool need_endian_swap_utf(xml_encoding le, xml_encoding re)
+	PUGI_IMPL_FN bool need_endian_swap_utf(xml_encoding le, xml_encoding re)
 	{
 		return (le == encoding_utf16_be && re == encoding_utf16_le) || (le == encoding_utf16_le && re == encoding_utf16_be) ||
 			   (le == encoding_utf32_be && re == encoding_utf32_le) || (le == encoding_utf32_le && re == encoding_utf32_be);
 	}
 
-	PUGI__FN bool convert_buffer_endian_swap(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+	PUGI_IMPL_FN bool convert_buffer_endian_swap(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
 	{
 		const char_t* data = static_cast<const char_t*>(contents);
 		size_t length = size / sizeof(char_t);
@@ -2118,7 +2154,7 @@ PUGI__NS_BEGIN
 		return true;
 	}
 
-	template <typename D> PUGI__FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
+	template <typename D> PUGI_IMPL_FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
 	{
 		const typename D::type* data = static_cast<const typename D::type*>(contents);
 		size_t data_length = size / sizeof(typename D::type);
@@ -2143,7 +2179,7 @@ PUGI__NS_BEGIN
 		return true;
 	}
 
-	PUGI__FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
+	PUGI_IMPL_FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
 	{
 		// get native encoding
 		xml_encoding wchar_encoding = get_wchar_encoding();
@@ -2188,7 +2224,7 @@ PUGI__NS_BEGIN
 		return false;
 	}
 #else
-	template <typename D> PUGI__FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
+	template <typename D> PUGI_IMPL_FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
 	{
 		const typename D::type* data = static_cast<const typename D::type*>(contents);
 		size_t data_length = size / sizeof(typename D::type);
@@ -2213,7 +2249,7 @@ PUGI__NS_BEGIN
 		return true;
 	}
 
-	PUGI__FN size_t get_latin1_7bit_prefix_length(const uint8_t* data, size_t size)
+	PUGI_IMPL_FN size_t get_latin1_7bit_prefix_length(const uint8_t* data, size_t size)
 	{
 		for (size_t i = 0; i < size; ++i)
 			if (data[i] > 127)
@@ -2222,7 +2258,7 @@ PUGI__NS_BEGIN
 		return size;
 	}
 
-	PUGI__FN bool convert_buffer_latin1(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+	PUGI_IMPL_FN bool convert_buffer_latin1(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
 	{
 		const uint8_t* data = static_cast<const uint8_t*>(contents);
 		size_t data_length = size;
@@ -2259,7 +2295,7 @@ PUGI__NS_BEGIN
 		return true;
 	}
 
-	PUGI__FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
+	PUGI_IMPL_FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
 	{
 		// fast path: no conversion required
 		if (encoding == encoding_utf8)
@@ -2294,13 +2330,13 @@ PUGI__NS_BEGIN
 	}
 #endif
 
-	PUGI__FN size_t as_utf8_begin(const wchar_t* str, size_t length)
+	PUGI_IMPL_FN size_t as_utf8_begin(const wchar_t* str, size_t length)
 	{
 		// get length in utf8 characters
 		return wchar_decoder::process(str, length, 0, utf8_counter());
 	}
 
-	PUGI__FN void as_utf8_end(char* buffer, size_t size, const wchar_t* str, size_t length)
+	PUGI_IMPL_FN void as_utf8_end(char* buffer, size_t size, const wchar_t* str, size_t length)
 	{
 		// convert to utf8
 		uint8_t* begin = reinterpret_cast<uint8_t*>(buffer);
@@ -2312,7 +2348,7 @@ PUGI__NS_BEGIN
 	}
 
 #ifndef PUGIXML_NO_STL
-	PUGI__FN std::string as_utf8_impl(const wchar_t* str, size_t length)
+	PUGI_IMPL_FN std::string as_utf8_impl(const wchar_t* str, size_t length)
 	{
 		// first pass: get length in utf8 characters
 		size_t size = as_utf8_begin(str, length);
@@ -2327,7 +2363,7 @@ PUGI__NS_BEGIN
 		return result;
 	}
 
-	PUGI__FN std::basic_string<wchar_t> as_wide_impl(const char* str, size_t size)
+	PUGI_IMPL_FN std::basic_string<wchar_t> as_wide_impl(const char* str, size_t size)
 	{
 		const uint8_t* data = reinterpret_cast<const uint8_t*>(str);
 
@@ -2370,17 +2406,19 @@ PUGI__NS_BEGIN
 	}
 
 	template <typename String, typename Header>
-	PUGI__FN bool strcpy_insitu(String& dest, Header& header, uintptr_t header_mask, const char_t* source, size_t source_length)
+	PUGI_IMPL_FN bool strcpy_insitu(String& dest, Header& header, uintptr_t header_mask, const char_t* source, size_t source_length)
 	{
+		assert((header & header_mask) == 0 || dest); // header bit indicates whether dest was previously allocated
+
 		if (source_length == 0)
 		{
 			// empty string and null pointer are equivalent, so just deallocate old memory
-			xml_allocator* alloc = PUGI__GETPAGE_IMPL(header)->allocator;
+			xml_allocator* alloc = PUGI_IMPL_GETPAGE_IMPL(header)->allocator;
 
 			if (header & header_mask) alloc->deallocate_string(dest);
 
 			// mark the string as not allocated
-			dest = 0;
+			dest = nullptr;
 			header &= ~header_mask;
 
 			return true;
@@ -2395,7 +2433,7 @@ PUGI__NS_BEGIN
 		}
 		else
 		{
-			xml_allocator* alloc = PUGI__GETPAGE_IMPL(header)->allocator;
+			xml_allocator* alloc = PUGI_IMPL_GETPAGE_IMPL(header)->allocator;
 
 			if (!alloc->reserve()) return false;
 
@@ -2423,7 +2461,7 @@ PUGI__NS_BEGIN
 		char_t* end;
 		size_t size;
 
-		gap(): end(0), size(0)
+		gap(): end(nullptr), size(0)
 		{
 		}
 
@@ -2435,7 +2473,7 @@ PUGI__NS_BEGIN
 			{
 				// Move [old_gap_end, new_gap_start) to [old_gap_start, ...)
 				assert(s >= end);
-				memmove(end - size, end, reinterpret_cast<char*>(s) - reinterpret_cast<char*>(end));
+				memmove(end - size, end, (s - end) * sizeof(char_t));
 			}
 
 			s += count; // end of current gap
@@ -2452,7 +2490,7 @@ PUGI__NS_BEGIN
 			{
 				// Move [old_gap_end, current_pos) to [old_gap_start, ...)
 				assert(s >= end);
-				memmove(end - size, end, reinterpret_cast<char*>(s) - reinterpret_cast<char*>(end));
+				memmove(end - size, end, (s - end) * sizeof(char_t));
 
 				return s - size;
 			}
@@ -2460,7 +2498,7 @@ PUGI__NS_BEGIN
 		}
 	};
 
-	PUGI__FN char_t* strconv_escape(char_t* s, gap& g)
+	PUGI_IMPL_FN char_t* strconv_escape(char_t* s, gap& g)
 	{
 		char_t* stre = s + 1;
 
@@ -2601,25 +2639,25 @@ PUGI__NS_BEGIN
 	}
 
 	// Parser utilities
-	#define PUGI__ENDSWITH(c, e)        ((c) == (e) || ((c) == 0 && endch == (e)))
-	#define PUGI__SKIPWS()              { while (PUGI__IS_CHARTYPE(*s, ct_space)) ++s; }
-	#define PUGI__OPTSET(OPT)           ( optmsk & (OPT) )
-	#define PUGI__PUSHNODE(TYPE)        { cursor = append_new_node(cursor, *alloc, TYPE); if (!cursor) PUGI__THROW_ERROR(status_out_of_memory, s); }
-	#define PUGI__POPNODE()             { cursor = cursor->parent; }
-	#define PUGI__SCANFOR(X)            { while (*s != 0 && !(X)) ++s; }
-	#define PUGI__SCANWHILE(X)          { while (X) ++s; }
-	#define PUGI__SCANWHILE_UNROLL(X)   { for (;;) { char_t ss = s[0]; if (PUGI__UNLIKELY(!(X))) { break; } ss = s[1]; if (PUGI__UNLIKELY(!(X))) { s += 1; break; } ss = s[2]; if (PUGI__UNLIKELY(!(X))) { s += 2; break; } ss = s[3]; if (PUGI__UNLIKELY(!(X))) { s += 3; break; } s += 4; } }
-	#define PUGI__ENDSEG()              { ch = *s; *s = 0; ++s; }
-	#define PUGI__THROW_ERROR(err, m)   return error_offset = m, error_status = err, static_cast<char_t*>(0)
-	#define PUGI__CHECK_ERROR(err, m)   { if (*s == 0) PUGI__THROW_ERROR(err, m); }
+	#define PUGI_IMPL_ENDSWITH(c, e)        ((c) == (e) || ((c) == 0 && endch == (e)))
+	#define PUGI_IMPL_SKIPWS()              { while (PUGI_IMPL_IS_CHARTYPE(*s, ct_space)) ++s; }
+	#define PUGI_IMPL_OPTSET(OPT)           ( optmsk & (OPT) )
+	#define PUGI_IMPL_PUSHNODE(TYPE)        { cursor = append_new_node(cursor, *alloc, TYPE); if (!cursor) PUGI_IMPL_THROW_ERROR(status_out_of_memory, s); }
+	#define PUGI_IMPL_POPNODE()             { cursor = cursor->parent; }
+	#define PUGI_IMPL_SCANFOR(X)            { while (*s != 0 && !(X)) ++s; }
+	#define PUGI_IMPL_SCANWHILE(X)          { while (X) ++s; }
+	#define PUGI_IMPL_SCANWHILE_UNROLL(X)   { for (;;) { char_t ss = s[0]; if (PUGI_IMPL_UNLIKELY(!(X))) { break; } ss = s[1]; if (PUGI_IMPL_UNLIKELY(!(X))) { s += 1; break; } ss = s[2]; if (PUGI_IMPL_UNLIKELY(!(X))) { s += 2; break; } ss = s[3]; if (PUGI_IMPL_UNLIKELY(!(X))) { s += 3; break; } s += 4; } }
+	#define PUGI_IMPL_ENDSEG()              { ch = *s; *s = 0; ++s; }
+	#define PUGI_IMPL_THROW_ERROR(err, m)   return error_offset = m, error_status = err, static_cast<char_t*>(nullptr)
+	#define PUGI_IMPL_CHECK_ERROR(err, m)   { if (*s == 0) PUGI_IMPL_THROW_ERROR(err, m); }
 
-	PUGI__FN char_t* strconv_comment(char_t* s, char_t endch)
+	PUGI_IMPL_FN char_t* strconv_comment(char_t* s, char_t endch)
 	{
 		gap g;
 
 		while (true)
 		{
-			PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_comment));
+			PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_comment));
 
 			if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
 			{
@@ -2627,7 +2665,7 @@ PUGI__NS_BEGIN
 
 				if (*s == '\n') g.push(s, 1);
 			}
-			else if (s[0] == '-' && s[1] == '-' && PUGI__ENDSWITH(s[2], '>')) // comment ends here
+			else if (s[0] == '-' && s[1] == '-' && PUGI_IMPL_ENDSWITH(s[2], '>')) // comment ends here
 			{
 				*g.flush(s) = 0;
 
@@ -2635,19 +2673,19 @@ PUGI__NS_BEGIN
 			}
 			else if (*s == 0)
 			{
-				return 0;
+				return nullptr;
 			}
 			else ++s;
 		}
 	}
 
-	PUGI__FN char_t* strconv_cdata(char_t* s, char_t endch)
+	PUGI_IMPL_FN char_t* strconv_cdata(char_t* s, char_t endch)
 	{
 		gap g;
 
 		while (true)
 		{
-			PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_cdata));
+			PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_cdata));
 
 			if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
 			{
@@ -2655,7 +2693,7 @@ PUGI__NS_BEGIN
 
 				if (*s == '\n') g.push(s, 1);
 			}
-			else if (s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>')) // CDATA ends here
+			else if (s[0] == ']' && s[1] == ']' && PUGI_IMPL_ENDSWITH(s[2], '>')) // CDATA ends here
 			{
 				*g.flush(s) = 0;
 
@@ -2663,7 +2701,7 @@ PUGI__NS_BEGIN
 			}
 			else if (*s == 0)
 			{
-				return 0;
+				return nullptr;
 			}
 			else ++s;
 		}
@@ -2681,14 +2719,14 @@ PUGI__NS_BEGIN
 
 			while (true)
 			{
-				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_pcdata));
+				PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_pcdata));
 
 				if (*s == '<') // PCDATA ends here
 				{
 					char_t* end = g.flush(s);
 
 					if (opt_trim::value)
-						while (end > begin && PUGI__IS_CHARTYPE(end[-1], ct_space))
+						while (end > begin && PUGI_IMPL_IS_CHARTYPE(end[-1], ct_space))
 							--end;
 
 					*end = 0;
@@ -2710,7 +2748,7 @@ PUGI__NS_BEGIN
 					char_t* end = g.flush(s);
 
 					if (opt_trim::value)
-						while (end > begin && PUGI__IS_CHARTYPE(end[-1], ct_space))
+						while (end > begin && PUGI_IMPL_IS_CHARTYPE(end[-1], ct_space))
 							--end;
 
 					*end = 0;
@@ -2722,9 +2760,9 @@ PUGI__NS_BEGIN
 		}
 	};
 
-	PUGI__FN strconv_pcdata_t get_strconv_pcdata(unsigned int optmask)
+	PUGI_IMPL_FN strconv_pcdata_t get_strconv_pcdata(unsigned int optmask)
 	{
-		PUGI__STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_trim_pcdata == 0x0800);
+		PUGI_IMPL_STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_trim_pcdata == 0x0800);
 
 		switch (((optmask >> 4) & 3) | ((optmask >> 9) & 4)) // get bitmask for flags (trim eol escapes); this simultaneously checks 3 options from assertion above
 		{
@@ -2736,7 +2774,7 @@ PUGI__NS_BEGIN
 		case 5: return strconv_pcdata_impl<opt_true, opt_false, opt_true>::parse;
 		case 6: return strconv_pcdata_impl<opt_true, opt_true, opt_false>::parse;
 		case 7: return strconv_pcdata_impl<opt_true, opt_true, opt_true>::parse;
-		default: assert(false); return 0; // unreachable
+		default: assert(false); return nullptr; // unreachable
 		}
 	}
 
@@ -2749,37 +2787,37 @@ PUGI__NS_BEGIN
 			gap g;
 
 			// trim leading whitespaces
-			if (PUGI__IS_CHARTYPE(*s, ct_space))
+			if (PUGI_IMPL_IS_CHARTYPE(*s, ct_space))
 			{
 				char_t* str = s;
 
 				do ++str;
-				while (PUGI__IS_CHARTYPE(*str, ct_space));
+				while (PUGI_IMPL_IS_CHARTYPE(*str, ct_space));
 
 				g.push(s, str - s);
 			}
 
 			while (true)
 			{
-				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr_ws | ct_space));
+				PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_attr_ws | ct_space));
 
 				if (*s == end_quote)
 				{
 					char_t* str = g.flush(s);
 
 					do *str-- = 0;
-					while (PUGI__IS_CHARTYPE(*str, ct_space));
+					while (PUGI_IMPL_IS_CHARTYPE(*str, ct_space));
 
 					return s + 1;
 				}
-				else if (PUGI__IS_CHARTYPE(*s, ct_space))
+				else if (PUGI_IMPL_IS_CHARTYPE(*s, ct_space))
 				{
 					*s++ = ' ';
 
-					if (PUGI__IS_CHARTYPE(*s, ct_space))
+					if (PUGI_IMPL_IS_CHARTYPE(*s, ct_space))
 					{
 						char_t* str = s + 1;
-						while (PUGI__IS_CHARTYPE(*str, ct_space)) ++str;
+						while (PUGI_IMPL_IS_CHARTYPE(*str, ct_space)) ++str;
 
 						g.push(s, str - s);
 					}
@@ -2790,7 +2828,7 @@ PUGI__NS_BEGIN
 				}
 				else if (!*s)
 				{
-					return 0;
+					return nullptr;
 				}
 				else ++s;
 			}
@@ -2802,7 +2840,7 @@ PUGI__NS_BEGIN
 
 			while (true)
 			{
-				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr_ws));
+				PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_attr_ws));
 
 				if (*s == end_quote)
 				{
@@ -2810,7 +2848,7 @@ PUGI__NS_BEGIN
 
 					return s + 1;
 				}
-				else if (PUGI__IS_CHARTYPE(*s, ct_space))
+				else if (PUGI_IMPL_IS_CHARTYPE(*s, ct_space))
 				{
 					if (*s == '\r')
 					{
@@ -2826,7 +2864,7 @@ PUGI__NS_BEGIN
 				}
 				else if (!*s)
 				{
-					return 0;
+					return nullptr;
 				}
 				else ++s;
 			}
@@ -2838,7 +2876,7 @@ PUGI__NS_BEGIN
 
 			while (true)
 			{
-				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr));
+				PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_attr));
 
 				if (*s == end_quote)
 				{
@@ -2858,7 +2896,7 @@ PUGI__NS_BEGIN
 				}
 				else if (!*s)
 				{
-					return 0;
+					return nullptr;
 				}
 				else ++s;
 			}
@@ -2870,7 +2908,7 @@ PUGI__NS_BEGIN
 
 			while (true)
 			{
-				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr));
+				PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_attr));
 
 				if (*s == end_quote)
 				{
@@ -2884,16 +2922,16 @@ PUGI__NS_BEGIN
 				}
 				else if (!*s)
 				{
-					return 0;
+					return nullptr;
 				}
 				else ++s;
 			}
 		}
 	};
 
-	PUGI__FN strconv_attribute_t get_strconv_attribute(unsigned int optmask)
+	PUGI_IMPL_FN strconv_attribute_t get_strconv_attribute(unsigned int optmask)
 	{
-		PUGI__STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_wconv_attribute == 0x40 && parse_wnorm_attribute == 0x80);
+		PUGI_IMPL_STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_wconv_attribute == 0x40 && parse_wnorm_attribute == 0x80);
 
 		switch ((optmask >> 4) & 15) // get bitmask for flags (wnorm wconv eol escapes); this simultaneously checks 4 options from assertion above
 		{
@@ -2913,7 +2951,7 @@ PUGI__NS_BEGIN
 		case 13: return strconv_attribute_impl<opt_true>::parse_wnorm;
 		case 14: return strconv_attribute_impl<opt_false>::parse_wnorm;
 		case 15: return strconv_attribute_impl<opt_true>::parse_wnorm;
-		default: assert(false); return 0; // unreachable
+		default: assert(false); return nullptr; // unreachable
 		}
 	}
 
@@ -2932,7 +2970,7 @@ PUGI__NS_BEGIN
 		char_t* error_offset;
 		xml_parse_status error_status;
 
-		xml_parser(xml_allocator* alloc_): alloc(alloc_), error_offset(0), error_status(status_ok)
+		xml_parser(xml_allocator* alloc_): alloc(alloc_), error_offset(nullptr), error_status(status_ok)
 		{
 		}
 
@@ -2949,8 +2987,8 @@ PUGI__NS_BEGIN
 			{
 				// quoted string
 				char_t ch = *s++;
-				PUGI__SCANFOR(*s == ch);
-				if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s);
+				PUGI_IMPL_SCANFOR(*s == ch);
+				if (!*s) PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
 
 				s++;
 			}
@@ -2958,20 +2996,20 @@ PUGI__NS_BEGIN
 			{
 				// <? ... ?>
 				s += 2;
-				PUGI__SCANFOR(s[0] == '?' && s[1] == '>'); // no need for ENDSWITH because ?> can't terminate proper doctype
-				if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s);
+				PUGI_IMPL_SCANFOR(s[0] == '?' && s[1] == '>'); // no need for ENDSWITH because ?> can't terminate proper doctype
+				if (!*s) PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
 
 				s += 2;
 			}
 			else if (s[0] == '<' && s[1] == '!' && s[2] == '-' && s[3] == '-')
 			{
 				s += 4;
-				PUGI__SCANFOR(s[0] == '-' && s[1] == '-' && s[2] == '>'); // no need for ENDSWITH because --> can't terminate proper doctype
-				if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s);
+				PUGI_IMPL_SCANFOR(s[0] == '-' && s[1] == '-' && s[2] == '>'); // no need for ENDSWITH because --> can't terminate proper doctype
+				if (!*s) PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
 
 				s += 3;
 			}
-			else PUGI__THROW_ERROR(status_bad_doctype, s);
+			else PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
 
 			return s;
 		}
@@ -3004,7 +3042,7 @@ PUGI__NS_BEGIN
 				else s++;
 			}
 
-			PUGI__THROW_ERROR(status_bad_doctype, s);
+			PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
 		}
 
 		char_t* parse_doctype_group(char_t* s, char_t endch)
@@ -3048,7 +3086,7 @@ PUGI__NS_BEGIN
 				else s++;
 			}
 
-			if (depth != 0 || endch != '>') PUGI__THROW_ERROR(status_bad_doctype, s);
+			if (depth != 0 || endch != '>') PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
 
 			return s;
 		}
@@ -3066,31 +3104,31 @@ PUGI__NS_BEGIN
 				{
 					++s;
 
-					if (PUGI__OPTSET(parse_comments))
+					if (PUGI_IMPL_OPTSET(parse_comments))
 					{
-						PUGI__PUSHNODE(node_comment); // Append a new node on the tree.
+						PUGI_IMPL_PUSHNODE(node_comment); // Append a new node on the tree.
 						cursor->value = s; // Save the offset.
 					}
 
-					if (PUGI__OPTSET(parse_eol) && PUGI__OPTSET(parse_comments))
+					if (PUGI_IMPL_OPTSET(parse_eol) && PUGI_IMPL_OPTSET(parse_comments))
 					{
 						s = strconv_comment(s, endch);
 
-						if (!s) PUGI__THROW_ERROR(status_bad_comment, cursor->value);
+						if (!s) PUGI_IMPL_THROW_ERROR(status_bad_comment, cursor->value);
 					}
 					else
 					{
 						// Scan for terminating '-->'.
-						PUGI__SCANFOR(s[0] == '-' && s[1] == '-' && PUGI__ENDSWITH(s[2], '>'));
-						PUGI__CHECK_ERROR(status_bad_comment, s);
+						PUGI_IMPL_SCANFOR(s[0] == '-' && s[1] == '-' && PUGI_IMPL_ENDSWITH(s[2], '>'));
+						PUGI_IMPL_CHECK_ERROR(status_bad_comment, s);
 
-						if (PUGI__OPTSET(parse_comments))
+						if (PUGI_IMPL_OPTSET(parse_comments))
 							*s = 0; // Zero-terminate this segment at the first terminating '-'.
 
 						s += (s[2] == '>' ? 3 : 2); // Step over the '\0->'.
 					}
 				}
-				else PUGI__THROW_ERROR(status_bad_comment, s);
+				else PUGI_IMPL_THROW_ERROR(status_bad_comment, s);
 			}
 			else if (*s == '[')
 			{
@@ -3099,22 +3137,22 @@ PUGI__NS_BEGIN
 				{
 					++s;
 
-					if (PUGI__OPTSET(parse_cdata))
+					if (PUGI_IMPL_OPTSET(parse_cdata))
 					{
-						PUGI__PUSHNODE(node_cdata); // Append a new node on the tree.
+						PUGI_IMPL_PUSHNODE(node_cdata); // Append a new node on the tree.
 						cursor->value = s; // Save the offset.
 
-						if (PUGI__OPTSET(parse_eol))
+						if (PUGI_IMPL_OPTSET(parse_eol))
 						{
 							s = strconv_cdata(s, endch);
 
-							if (!s) PUGI__THROW_ERROR(status_bad_cdata, cursor->value);
+							if (!s) PUGI_IMPL_THROW_ERROR(status_bad_cdata, cursor->value);
 						}
 						else
 						{
 							// Scan for terminating ']]>'.
-							PUGI__SCANFOR(s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>'));
-							PUGI__CHECK_ERROR(status_bad_cdata, s);
+							PUGI_IMPL_SCANFOR(s[0] == ']' && s[1] == ']' && PUGI_IMPL_ENDSWITH(s[2], '>'));
+							PUGI_IMPL_CHECK_ERROR(status_bad_cdata, s);
 
 							*s++ = 0; // Zero-terminate this segment.
 						}
@@ -3122,21 +3160,21 @@ PUGI__NS_BEGIN
 					else // Flagged for discard, but we still have to scan for the terminator.
 					{
 						// Scan for terminating ']]>'.
-						PUGI__SCANFOR(s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>'));
-						PUGI__CHECK_ERROR(status_bad_cdata, s);
+						PUGI_IMPL_SCANFOR(s[0] == ']' && s[1] == ']' && PUGI_IMPL_ENDSWITH(s[2], '>'));
+						PUGI_IMPL_CHECK_ERROR(status_bad_cdata, s);
 
 						++s;
 					}
 
 					s += (s[1] == '>' ? 2 : 1); // Step over the last ']>'.
 				}
-				else PUGI__THROW_ERROR(status_bad_cdata, s);
+				else PUGI_IMPL_THROW_ERROR(status_bad_cdata, s);
 			}
-			else if (s[0] == 'D' && s[1] == 'O' && s[2] == 'C' && s[3] == 'T' && s[4] == 'Y' && s[5] == 'P' && PUGI__ENDSWITH(s[6], 'E'))
+			else if (s[0] == 'D' && s[1] == 'O' && s[2] == 'C' && s[3] == 'T' && s[4] == 'Y' && s[5] == 'P' && PUGI_IMPL_ENDSWITH(s[6], 'E'))
 			{
 				s -= 2;
 
-				if (cursor->parent) PUGI__THROW_ERROR(status_bad_doctype, s);
+				if (cursor->parent) PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
 
 				char_t* mark = s + 9;
 
@@ -3146,18 +3184,18 @@ PUGI__NS_BEGIN
 				assert((*s == 0 && endch == '>') || *s == '>');
 				if (*s) *s++ = 0;
 
-				if (PUGI__OPTSET(parse_doctype))
+				if (PUGI_IMPL_OPTSET(parse_doctype))
 				{
-					while (PUGI__IS_CHARTYPE(*mark, ct_space)) ++mark;
+					while (PUGI_IMPL_IS_CHARTYPE(*mark, ct_space)) ++mark;
 
-					PUGI__PUSHNODE(node_doctype);
+					PUGI_IMPL_PUSHNODE(node_doctype);
 
 					cursor->value = mark;
 				}
 			}
-			else if (*s == 0 && endch == '-') PUGI__THROW_ERROR(status_bad_comment, s);
-			else if (*s == 0 && endch == '[') PUGI__THROW_ERROR(status_bad_cdata, s);
-			else PUGI__THROW_ERROR(status_unrecognized_tag, s);
+			else if (*s == 0 && endch == '-') PUGI_IMPL_THROW_ERROR(status_bad_comment, s);
+			else if (*s == 0 && endch == '[') PUGI_IMPL_THROW_ERROR(status_bad_cdata, s);
+			else PUGI_IMPL_THROW_ERROR(status_unrecognized_tag, s);
 
 			return s;
 		}
@@ -3174,50 +3212,50 @@ PUGI__NS_BEGIN
 			// read PI target
 			char_t* target = s;
 
-			if (!PUGI__IS_CHARTYPE(*s, ct_start_symbol)) PUGI__THROW_ERROR(status_bad_pi, s);
+			if (!PUGI_IMPL_IS_CHARTYPE(*s, ct_start_symbol)) PUGI_IMPL_THROW_ERROR(status_bad_pi, s);
 
-			PUGI__SCANWHILE(PUGI__IS_CHARTYPE(*s, ct_symbol));
-			PUGI__CHECK_ERROR(status_bad_pi, s);
+			PUGI_IMPL_SCANWHILE(PUGI_IMPL_IS_CHARTYPE(*s, ct_symbol));
+			PUGI_IMPL_CHECK_ERROR(status_bad_pi, s);
 
 			// determine node type; stricmp / strcasecmp is not portable
 			bool declaration = (target[0] | ' ') == 'x' && (target[1] | ' ') == 'm' && (target[2] | ' ') == 'l' && target + 3 == s;
 
-			if (declaration ? PUGI__OPTSET(parse_declaration) : PUGI__OPTSET(parse_pi))
+			if (declaration ? PUGI_IMPL_OPTSET(parse_declaration) : PUGI_IMPL_OPTSET(parse_pi))
 			{
 				if (declaration)
 				{
 					// disallow non top-level declarations
-					if (cursor->parent) PUGI__THROW_ERROR(status_bad_pi, s);
+					if (cursor->parent) PUGI_IMPL_THROW_ERROR(status_bad_pi, s);
 
-					PUGI__PUSHNODE(node_declaration);
+					PUGI_IMPL_PUSHNODE(node_declaration);
 				}
 				else
 				{
-					PUGI__PUSHNODE(node_pi);
+					PUGI_IMPL_PUSHNODE(node_pi);
 				}
 
 				cursor->name = target;
 
-				PUGI__ENDSEG();
+				PUGI_IMPL_ENDSEG();
 
 				// parse value/attributes
 				if (ch == '?')
 				{
 					// empty node
-					if (!PUGI__ENDSWITH(*s, '>')) PUGI__THROW_ERROR(status_bad_pi, s);
+					if (!PUGI_IMPL_ENDSWITH(*s, '>')) PUGI_IMPL_THROW_ERROR(status_bad_pi, s);
 					s += (*s == '>');
 
-					PUGI__POPNODE();
+					PUGI_IMPL_POPNODE();
 				}
-				else if (PUGI__IS_CHARTYPE(ch, ct_space))
+				else if (PUGI_IMPL_IS_CHARTYPE(ch, ct_space))
 				{
-					PUGI__SKIPWS();
+					PUGI_IMPL_SKIPWS();
 
 					// scan for tag end
 					char_t* value = s;
 
-					PUGI__SCANFOR(s[0] == '?' && PUGI__ENDSWITH(s[1], '>'));
-					PUGI__CHECK_ERROR(status_bad_pi, s);
+					PUGI_IMPL_SCANFOR(s[0] == '?' && PUGI_IMPL_ENDSWITH(s[1], '>'));
+					PUGI_IMPL_CHECK_ERROR(status_bad_pi, s);
 
 					if (declaration)
 					{
@@ -3232,20 +3270,20 @@ PUGI__NS_BEGIN
 						// store value and step over >
 						cursor->value = value;
 
-						PUGI__POPNODE();
+						PUGI_IMPL_POPNODE();
 
-						PUGI__ENDSEG();
+						PUGI_IMPL_ENDSEG();
 
 						s += (*s == '>');
 					}
 				}
-				else PUGI__THROW_ERROR(status_bad_pi, s);
+				else PUGI_IMPL_THROW_ERROR(status_bad_pi, s);
 			}
 			else
 			{
 				// scan for tag end
-				PUGI__SCANFOR(s[0] == '?' && PUGI__ENDSWITH(s[1], '>'));
-				PUGI__CHECK_ERROR(status_bad_pi, s);
+				PUGI_IMPL_SCANFOR(s[0] == '?' && PUGI_IMPL_ENDSWITH(s[1], '>'));
+				PUGI_IMPL_CHECK_ERROR(status_bad_pi, s);
 
 				s += (s[1] == '>' ? 2 : 1);
 			}
@@ -3264,6 +3302,7 @@ PUGI__NS_BEGIN
 			char_t ch = 0;
 			xml_node_struct* cursor = root;
 			char_t* mark = s;
+			char_t* merged_pcdata = s;
 
 			while (*s != 0)
 			{
@@ -3272,39 +3311,39 @@ PUGI__NS_BEGIN
 					++s;
 
 				LOC_TAG:
-					if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) // '<#...'
+					if (PUGI_IMPL_IS_CHARTYPE(*s, ct_start_symbol)) // '<#...'
 					{
-						PUGI__PUSHNODE(node_element); // Append a new node to the tree.
+						PUGI_IMPL_PUSHNODE(node_element); // Append a new node to the tree.
 
 						cursor->name = s;
 
-						PUGI__SCANWHILE_UNROLL(PUGI__IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
-						PUGI__ENDSEG(); // Save char in 'ch', terminate & step over.
+						PUGI_IMPL_SCANWHILE_UNROLL(PUGI_IMPL_IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
+						PUGI_IMPL_ENDSEG(); // Save char in 'ch', terminate & step over.
 
 						if (ch == '>')
 						{
 							// end of tag
 						}
-						else if (PUGI__IS_CHARTYPE(ch, ct_space))
+						else if (PUGI_IMPL_IS_CHARTYPE(ch, ct_space))
 						{
 						LOC_ATTRIBUTES:
 							while (true)
 							{
-								PUGI__SKIPWS(); // Eat any whitespace.
+								PUGI_IMPL_SKIPWS(); // Eat any whitespace.
 
-								if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) // <... #...
+								if (PUGI_IMPL_IS_CHARTYPE(*s, ct_start_symbol)) // <... #...
 								{
 									xml_attribute_struct* a = append_new_attribute(cursor, *alloc); // Make space for this attribute.
-									if (!a) PUGI__THROW_ERROR(status_out_of_memory, s);
+									if (!a) PUGI_IMPL_THROW_ERROR(status_out_of_memory, s);
 
 									a->name = s; // Save the offset.
 
-									PUGI__SCANWHILE_UNROLL(PUGI__IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
-									PUGI__ENDSEG(); // Save char in 'ch', terminate & step over.
+									PUGI_IMPL_SCANWHILE_UNROLL(PUGI_IMPL_IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
+									PUGI_IMPL_ENDSEG(); // Save char in 'ch', terminate & step over.
 
-									if (PUGI__IS_CHARTYPE(ch, ct_space))
+									if (PUGI_IMPL_IS_CHARTYPE(ch, ct_space))
 									{
-										PUGI__SKIPWS(); // Eat any whitespace.
+										PUGI_IMPL_SKIPWS(); // Eat any whitespace.
 
 										ch = *s;
 										++s;
@@ -3312,7 +3351,7 @@ PUGI__NS_BEGIN
 
 									if (ch == '=') // '<... #=...'
 									{
-										PUGI__SKIPWS(); // Eat any whitespace.
+										PUGI_IMPL_SKIPWS(); // Eat any whitespace.
 
 										if (*s == '"' || *s == '\'') // '<... #="...'
 										{
@@ -3322,16 +3361,16 @@ PUGI__NS_BEGIN
 
 											s = strconv_attribute(s, ch);
 
-											if (!s) PUGI__THROW_ERROR(status_bad_attribute, a->value);
+											if (!s) PUGI_IMPL_THROW_ERROR(status_bad_attribute, a->value);
 
 											// After this line the loop continues from the start;
 											// Whitespaces, / and > are ok, symbols and EOF are wrong,
 											// everything else will be detected
-											if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) PUGI__THROW_ERROR(status_bad_attribute, s);
+											if (PUGI_IMPL_IS_CHARTYPE(*s, ct_start_symbol)) PUGI_IMPL_THROW_ERROR(status_bad_attribute, s);
 										}
-										else PUGI__THROW_ERROR(status_bad_attribute, s);
+										else PUGI_IMPL_THROW_ERROR(status_bad_attribute, s);
 									}
-									else PUGI__THROW_ERROR(status_bad_attribute, s);
+									else PUGI_IMPL_THROW_ERROR(status_bad_attribute, s);
 								}
 								else if (*s == '/')
 								{
@@ -3339,16 +3378,16 @@ PUGI__NS_BEGIN
 
 									if (*s == '>')
 									{
-										PUGI__POPNODE();
+										PUGI_IMPL_POPNODE();
 										s++;
 										break;
 									}
 									else if (*s == 0 && endch == '>')
 									{
-										PUGI__POPNODE();
+										PUGI_IMPL_POPNODE();
 										break;
 									}
-									else PUGI__THROW_ERROR(status_bad_start_element, s);
+									else PUGI_IMPL_THROW_ERROR(status_bad_start_element, s);
 								}
 								else if (*s == '>')
 								{
@@ -3360,16 +3399,16 @@ PUGI__NS_BEGIN
 								{
 									break;
 								}
-								else PUGI__THROW_ERROR(status_bad_start_element, s);
+								else PUGI_IMPL_THROW_ERROR(status_bad_start_element, s);
 							}
 
 							// !!!
 						}
 						else if (ch == '/') // '<#.../'
 						{
-							if (!PUGI__ENDSWITH(*s, '>')) PUGI__THROW_ERROR(status_bad_start_element, s);
+							if (!PUGI_IMPL_ENDSWITH(*s, '>')) PUGI_IMPL_THROW_ERROR(status_bad_start_element, s);
 
-							PUGI__POPNODE(); // Pop.
+							PUGI_IMPL_POPNODE(); // Pop.
 
 							s += (*s == '>');
 						}
@@ -3378,9 +3417,9 @@ PUGI__NS_BEGIN
 							// we stepped over null terminator, backtrack & handle closing tag
 							--s;
 
-							if (endch != '>') PUGI__THROW_ERROR(status_bad_start_element, s);
+							if (endch != '>') PUGI_IMPL_THROW_ERROR(status_bad_start_element, s);
 						}
-						else PUGI__THROW_ERROR(status_bad_start_element, s);
+						else PUGI_IMPL_THROW_ERROR(status_bad_start_element, s);
 					}
 					else if (*s == '/')
 					{
@@ -3389,30 +3428,30 @@ PUGI__NS_BEGIN
 						mark = s;
 
 						char_t* name = cursor->name;
-						if (!name) PUGI__THROW_ERROR(status_end_element_mismatch, mark);
+						if (!name) PUGI_IMPL_THROW_ERROR(status_end_element_mismatch, mark);
 
-						while (PUGI__IS_CHARTYPE(*s, ct_symbol))
+						while (PUGI_IMPL_IS_CHARTYPE(*s, ct_symbol))
 						{
-							if (*s++ != *name++) PUGI__THROW_ERROR(status_end_element_mismatch, mark);
+							if (*s++ != *name++) PUGI_IMPL_THROW_ERROR(status_end_element_mismatch, mark);
 						}
 
 						if (*name)
 						{
-							if (*s == 0 && name[0] == endch && name[1] == 0) PUGI__THROW_ERROR(status_bad_end_element, s);
-							else PUGI__THROW_ERROR(status_end_element_mismatch, mark);
+							if (*s == 0 && name[0] == endch && name[1] == 0) PUGI_IMPL_THROW_ERROR(status_bad_end_element, s);
+							else PUGI_IMPL_THROW_ERROR(status_end_element_mismatch, mark);
 						}
 
-						PUGI__POPNODE(); // Pop.
+						PUGI_IMPL_POPNODE(); // Pop.
 
-						PUGI__SKIPWS();
+						PUGI_IMPL_SKIPWS();
 
 						if (*s == 0)
 						{
-							if (endch != '>') PUGI__THROW_ERROR(status_bad_end_element, s);
+							if (endch != '>') PUGI_IMPL_THROW_ERROR(status_bad_end_element, s);
 						}
 						else
 						{
-							if (*s != '>') PUGI__THROW_ERROR(status_bad_end_element, s);
+							if (*s != '>') PUGI_IMPL_THROW_ERROR(status_bad_end_element, s);
 							++s;
 						}
 					}
@@ -3422,62 +3461,79 @@ PUGI__NS_BEGIN
 						if (!s) return s;
 
 						assert(cursor);
-						if (PUGI__NODETYPE(cursor) == node_declaration) goto LOC_ATTRIBUTES;
+						if (PUGI_IMPL_NODETYPE(cursor) == node_declaration) goto LOC_ATTRIBUTES;
 					}
 					else if (*s == '!') // '<!...'
 					{
 						s = parse_exclamation(s, cursor, optmsk, endch);
 						if (!s) return s;
 					}
-					else if (*s == 0 && endch == '?') PUGI__THROW_ERROR(status_bad_pi, s);
-					else PUGI__THROW_ERROR(status_unrecognized_tag, s);
+					else if (*s == 0 && endch == '?') PUGI_IMPL_THROW_ERROR(status_bad_pi, s);
+					else PUGI_IMPL_THROW_ERROR(status_unrecognized_tag, s);
 				}
 				else
 				{
 					mark = s; // Save this offset while searching for a terminator.
 
-					PUGI__SKIPWS(); // Eat whitespace if no genuine PCDATA here.
+					PUGI_IMPL_SKIPWS(); // Eat whitespace if no genuine PCDATA here.
 
 					if (*s == '<' || !*s)
 					{
 						// We skipped some whitespace characters because otherwise we would take the tag branch instead of PCDATA one
 						assert(mark != s);
 
-						if (!PUGI__OPTSET(parse_ws_pcdata | parse_ws_pcdata_single) || PUGI__OPTSET(parse_trim_pcdata))
+						if (!PUGI_IMPL_OPTSET(parse_ws_pcdata | parse_ws_pcdata_single) || PUGI_IMPL_OPTSET(parse_trim_pcdata))
 						{
 							continue;
 						}
-						else if (PUGI__OPTSET(parse_ws_pcdata_single))
+						else if (PUGI_IMPL_OPTSET(parse_ws_pcdata_single))
 						{
 							if (s[0] != '<' || s[1] != '/' || cursor->first_child) continue;
 						}
 					}
 
-					if (!PUGI__OPTSET(parse_trim_pcdata))
+					if (!PUGI_IMPL_OPTSET(parse_trim_pcdata))
 						s = mark;
 
-					if (cursor->parent || PUGI__OPTSET(parse_fragment))
+					if (cursor->parent || PUGI_IMPL_OPTSET(parse_fragment))
 					{
-						if (PUGI__OPTSET(parse_embed_pcdata) && cursor->parent && !cursor->first_child && !cursor->value)
+						char_t* parsed_pcdata = s;
+
+						s = strconv_pcdata(s);
+
+						if (PUGI_IMPL_OPTSET(parse_embed_pcdata) && cursor->parent && !cursor->first_child && !cursor->value)
 						{
-							cursor->value = s; // Save the offset.
+							cursor->value = parsed_pcdata; // Save the offset.
+						}
+						else if (PUGI_IMPL_OPTSET(parse_merge_pcdata) && cursor->first_child && PUGI_IMPL_NODETYPE(cursor->first_child->prev_sibling_c) == node_pcdata)
+						{
+							assert(merged_pcdata >= cursor->first_child->prev_sibling_c->value);
+
+							// Catch up to the end of last parsed value; only needed for the first fragment.
+							merged_pcdata += strlength(merged_pcdata);
+
+							size_t length = strlength(parsed_pcdata);
+
+							// Must use memmove instead of memcpy as this move may overlap
+							memmove(merged_pcdata, parsed_pcdata, (length + 1) * sizeof(char_t));
+							merged_pcdata += length;
 						}
 						else
 						{
-							PUGI__PUSHNODE(node_pcdata); // Append a new node on the tree.
+							xml_node_struct* prev_cursor = cursor;
+							PUGI_IMPL_PUSHNODE(node_pcdata); // Append a new node on the tree.
 
-							cursor->value = s; // Save the offset.
+							cursor->value = parsed_pcdata; // Save the offset.
+							merged_pcdata = parsed_pcdata; // Used for parse_merge_pcdata above, cheaper to save unconditionally
 
-							PUGI__POPNODE(); // Pop since this is a standalone.
+							cursor = prev_cursor; // Pop since this is a standalone.
 						}
 
-						s = strconv_pcdata(s);
-
 						if (!*s) break;
 					}
 					else
 					{
-						PUGI__SCANFOR(*s == '<'); // '...<'
+						PUGI_IMPL_SCANFOR(*s == '<'); // '...<'
 						if (!*s) break;
 
 						++s;
@@ -3489,7 +3545,7 @@ PUGI__NS_BEGIN
 			}
 
 			// check that last tag is closed
-			if (cursor != root) PUGI__THROW_ERROR(status_end_element_mismatch, s);
+			if (cursor != root) PUGI_IMPL_THROW_ERROR(status_end_element_mismatch, s);
 
 			return s;
 		}
@@ -3511,7 +3567,7 @@ PUGI__NS_BEGIN
 		{
 			while (node)
 			{
-				if (PUGI__NODETYPE(node) == node_element) return true;
+				if (PUGI_IMPL_NODETYPE(node) == node_element) return true;
 
 				node = node->next_sibling;
 			}
@@ -3523,10 +3579,10 @@ PUGI__NS_BEGIN
 		{
 			// early-out for empty documents
 			if (length == 0)
-				return make_parse_result(PUGI__OPTSET(parse_fragment) ? status_ok : status_no_document_element);
+				return make_parse_result(PUGI_IMPL_OPTSET(parse_fragment) ? status_ok : status_no_document_element);
 
 			// get last child of the root before parsing
-			xml_node_struct* last_root_child = root->first_child ? root->first_child->prev_sibling_c + 0 : 0;
+			xml_node_struct* last_root_child = root->first_child ? root->first_child->prev_sibling_c + 0 : nullptr;
 
 			// create parser on stack
 			xml_parser parser(static_cast<xml_allocator*>(xmldoc));
@@ -3551,9 +3607,9 @@ PUGI__NS_BEGIN
 					return make_parse_result(status_unrecognized_tag, length - 1);
 
 				// check if there are any element nodes parsed
-				xml_node_struct* first_root_child_parsed = last_root_child ? last_root_child->next_sibling + 0 : root->first_child+ 0;
+				xml_node_struct* first_root_child_parsed = last_root_child ? last_root_child->next_sibling + 0 : root->first_child + 0;
 
-				if (!PUGI__OPTSET(parse_fragment) && !has_element_node_siblings(first_root_child_parsed))
+				if (!PUGI_IMPL_OPTSET(parse_fragment) && !has_element_node_siblings(first_root_child_parsed))
 					return make_parse_result(status_no_document_element, length - 1);
 			}
 			else
@@ -3568,7 +3624,7 @@ PUGI__NS_BEGIN
 	};
 
 	// Output facilities
-	PUGI__FN xml_encoding get_write_native_encoding()
+	PUGI_IMPL_FN xml_encoding get_write_native_encoding()
 	{
 	#ifdef PUGIXML_WCHAR_MODE
 		return get_wchar_encoding();
@@ -3577,7 +3633,7 @@ PUGI__NS_BEGIN
 	#endif
 	}
 
-	PUGI__FN xml_encoding get_write_encoding(xml_encoding encoding)
+	PUGI_IMPL_FN xml_encoding get_write_encoding(xml_encoding encoding)
 	{
 		// replace wchar encoding with utf implementation
 		if (encoding == encoding_wchar) return get_wchar_encoding();
@@ -3595,18 +3651,18 @@ PUGI__NS_BEGIN
 		return encoding_utf8;
 	}
 
-	template <typename D, typename T> PUGI__FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T)
+	template <typename D, typename T> PUGI_IMPL_FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T)
 	{
-		PUGI__STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
+		PUGI_IMPL_STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
 
 		typename T::value_type end = D::process(reinterpret_cast<const typename D::type*>(data), length, dest, T());
 
 		return static_cast<size_t>(end - dest) * sizeof(*dest);
 	}
 
-	template <typename D, typename T> PUGI__FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T, bool opt_swap)
+	template <typename D, typename T> PUGI_IMPL_FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T, bool opt_swap)
 	{
-		PUGI__STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
+		PUGI_IMPL_STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
 
 		typename T::value_type end = D::process(reinterpret_cast<const typename D::type*>(data), length, dest, T());
 
@@ -3620,7 +3676,7 @@ PUGI__NS_BEGIN
 	}
 
 #ifdef PUGIXML_WCHAR_MODE
-	PUGI__FN size_t get_valid_length(const char_t* data, size_t length)
+	PUGI_IMPL_FN size_t get_valid_length(const char_t* data, size_t length)
 	{
 		if (length < 1) return 0;
 
@@ -3628,7 +3684,7 @@ PUGI__NS_BEGIN
 		return (sizeof(wchar_t) == 2 && static_cast<unsigned int>(static_cast<uint16_t>(data[length - 1]) - 0xD800) < 0x400) ? length - 1 : length;
 	}
 
-	PUGI__FN size_t convert_buffer_output(char_t* r_char, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
+	PUGI_IMPL_FN size_t convert_buffer_output(char_t* r_char, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
 	{
 		// only endian-swapping is required
 		if (need_endian_swap_utf(encoding, get_wchar_encoding()))
@@ -3666,7 +3722,7 @@ PUGI__NS_BEGIN
 		return 0;
 	}
 #else
-	PUGI__FN size_t get_valid_length(const char_t* data, size_t length)
+	PUGI_IMPL_FN size_t get_valid_length(const char_t* data, size_t length)
 	{
 		if (length < 5) return 0;
 
@@ -3682,7 +3738,7 @@ PUGI__NS_BEGIN
 		return length;
 	}
 
-	PUGI__FN size_t convert_buffer_output(char_t* /* r_char */, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
+	PUGI_IMPL_FN size_t convert_buffer_output(char_t* /* r_char */, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
 	{
 		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
 		{
@@ -3714,7 +3770,7 @@ PUGI__NS_BEGIN
 	public:
 		xml_buffered_writer(xml_writer& writer_, xml_encoding user_encoding): writer(writer_), bufsize(0), encoding(get_write_encoding(user_encoding))
 		{
-			PUGI__STATIC_ASSERT(bufcapacity >= 8);
+			PUGI_IMPL_STATIC_ASSERT(bufcapacity >= 8);
 		}
 
 		size_t flush()
@@ -3920,14 +3976,14 @@ PUGI__NS_BEGIN
 		xml_encoding encoding;
 	};
 
-	PUGI__FN void text_output_escaped(xml_buffered_writer& writer, const char_t* s, chartypex_t type, unsigned int flags)
+	PUGI_IMPL_FN void text_output_escaped(xml_buffered_writer& writer, const char_t* s, chartypex_t type, unsigned int flags)
 	{
 		while (*s)
 		{
 			const char_t* prev = s;
 
 			// While *s is a usual symbol
-			PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPEX(ss, type));
+			PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPEX(ss, type));
 
 			writer.write_buffer(prev, static_cast<size_t>(s - prev));
 
@@ -3972,7 +4028,7 @@ PUGI__NS_BEGIN
 		}
 	}
 
-	PUGI__FN void text_output(xml_buffered_writer& writer, const char_t* s, chartypex_t type, unsigned int flags)
+	PUGI_IMPL_FN void text_output(xml_buffered_writer& writer, const char_t* s, chartypex_t type, unsigned int flags)
 	{
 		if (flags & format_no_escapes)
 			writer.write_string(s);
@@ -3980,7 +4036,7 @@ PUGI__NS_BEGIN
 			text_output_escaped(writer, s, type, flags);
 	}
 
-	PUGI__FN void text_output_cdata(xml_buffered_writer& writer, const char_t* s)
+	PUGI_IMPL_FN void text_output_cdata(xml_buffered_writer& writer, const char_t* s)
 	{
 		do
 		{
@@ -4002,7 +4058,7 @@ PUGI__NS_BEGIN
 		while (*s);
 	}
 
-	PUGI__FN void text_output_indent(xml_buffered_writer& writer, const char_t* indent, size_t indent_length, unsigned int depth)
+	PUGI_IMPL_FN void text_output_indent(xml_buffered_writer& writer, const char_t* indent, size_t indent_length, unsigned int depth)
 	{
 		switch (indent_length)
 		{
@@ -4042,7 +4098,7 @@ PUGI__NS_BEGIN
 		}
 	}
 
-	PUGI__FN void node_output_comment(xml_buffered_writer& writer, const char_t* s)
+	PUGI_IMPL_FN void node_output_comment(xml_buffered_writer& writer, const char_t* s)
 	{
 		writer.write('<', '!', '-', '-');
 
@@ -4067,7 +4123,7 @@ PUGI__NS_BEGIN
 		writer.write('-', '-', '>');
 	}
 
-	PUGI__FN void node_output_pi_value(xml_buffered_writer& writer, const char_t* s)
+	PUGI_IMPL_FN void node_output_pi_value(xml_buffered_writer& writer, const char_t* s)
 	{
 		while (*s)
 		{
@@ -4088,7 +4144,7 @@ PUGI__NS_BEGIN
 		}
 	}
 
-	PUGI__FN void node_output_attributes(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
+	PUGI_IMPL_FN void node_output_attributes(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
 	{
 		const char_t* default_name = PUGIXML_TEXT(":anonymous");
 		const char_t enquotation_char = (flags & format_attribute_single_quote) ? '\'' : '"';
@@ -4116,7 +4172,7 @@ PUGI__NS_BEGIN
 		}
 	}
 
-	PUGI__FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
+	PUGI_IMPL_FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
 	{
 		const char_t* default_name = PUGIXML_TEXT(":anonymous");
 		const char_t* name = node->name ? node->name + 0 : default_name;
@@ -4178,7 +4234,7 @@ PUGI__NS_BEGIN
 		}
 	}
 
-	PUGI__FN void node_output_end(xml_buffered_writer& writer, xml_node_struct* node)
+	PUGI_IMPL_FN void node_output_end(xml_buffered_writer& writer, xml_node_struct* node)
 	{
 		const char_t* default_name = PUGIXML_TEXT(":anonymous");
 		const char_t* name = node->name ? node->name + 0 : default_name;
@@ -4188,11 +4244,11 @@ PUGI__NS_BEGIN
 		writer.write('>');
 	}
 
-	PUGI__FN void node_output_simple(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags)
+	PUGI_IMPL_FN void node_output_simple(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags)
 	{
 		const char_t* default_name = PUGIXML_TEXT(":anonymous");
 
-		switch (PUGI__NODETYPE(node))
+		switch (PUGI_IMPL_NODETYPE(node))
 		{
 			case node_pcdata:
 				text_output(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""), ctx_special_pcdata, flags);
@@ -4250,7 +4306,7 @@ PUGI__NS_BEGIN
 		indent_indent = 2
 	};
 
-	PUGI__FN void node_output(xml_buffered_writer& writer, xml_node_struct* root, const char_t* indent, unsigned int flags, unsigned int depth)
+	PUGI_IMPL_FN void node_output(xml_buffered_writer& writer, xml_node_struct* root, const char_t* indent, unsigned int flags, unsigned int depth)
 	{
 		size_t indent_length = ((flags & (format_indent | format_indent_attributes)) && (flags & format_raw) == 0) ? strlength(indent) : 0;
 		unsigned int indent_flags = indent_indent;
@@ -4262,7 +4318,7 @@ PUGI__NS_BEGIN
 			assert(node);
 
 			// begin writing current node
-			if (PUGI__NODETYPE(node) == node_pcdata || PUGI__NODETYPE(node) == node_cdata)
+			if (PUGI_IMPL_NODETYPE(node) == node_pcdata || PUGI_IMPL_NODETYPE(node) == node_cdata)
 			{
 				node_output_simple(writer, node, flags);
 
@@ -4276,7 +4332,7 @@ PUGI__NS_BEGIN
 				if ((indent_flags & indent_indent) && indent_length)
 					text_output_indent(writer, indent, indent_length, depth);
 
-				if (PUGI__NODETYPE(node) == node_element)
+				if (PUGI_IMPL_NODETYPE(node) == node_element)
 				{
 					indent_flags = indent_newline | indent_indent;
 
@@ -4291,7 +4347,7 @@ PUGI__NS_BEGIN
 						continue;
 					}
 				}
-				else if (PUGI__NODETYPE(node) == node_document)
+				else if (PUGI_IMPL_NODETYPE(node) == node_document)
 				{
 					indent_flags = indent_indent;
 
@@ -4321,7 +4377,7 @@ PUGI__NS_BEGIN
 				node = node->parent;
 
 				// write closing node
-				if (PUGI__NODETYPE(node) == node_element)
+				if (PUGI_IMPL_NODETYPE(node) == node_element)
 				{
 					depth--;
 
@@ -4343,11 +4399,11 @@ PUGI__NS_BEGIN
 			writer.write('\n');
 	}
 
-	PUGI__FN bool has_declaration(xml_node_struct* node)
+	PUGI_IMPL_FN bool has_declaration(xml_node_struct* node)
 	{
 		for (xml_node_struct* child = node->first_child; child; child = child->next_sibling)
 		{
-			xml_node_type type = PUGI__NODETYPE(child);
+			xml_node_type type = PUGI_IMPL_NODETYPE(child);
 
 			if (type == node_declaration) return true;
 			if (type == node_element) return false;
@@ -4356,7 +4412,7 @@ PUGI__NS_BEGIN
 		return false;
 	}
 
-	PUGI__FN bool is_attribute_of(xml_attribute_struct* attr, xml_node_struct* node)
+	PUGI_IMPL_FN bool is_attribute_of(xml_attribute_struct* attr, xml_node_struct* node)
 	{
 		for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute)
 			if (a == attr)
@@ -4365,12 +4421,12 @@ PUGI__NS_BEGIN
 		return false;
 	}
 
-	PUGI__FN bool allow_insert_attribute(xml_node_type parent)
+	PUGI_IMPL_FN bool allow_insert_attribute(xml_node_type parent)
 	{
 		return parent == node_element || parent == node_declaration;
 	}
 
-	PUGI__FN bool allow_insert_child(xml_node_type parent, xml_node_type child)
+	PUGI_IMPL_FN bool allow_insert_child(xml_node_type parent, xml_node_type child)
 	{
 		if (parent != node_document && parent != node_element) return false;
 		if (child == node_document || child == node_null) return false;
@@ -4379,7 +4435,7 @@ PUGI__NS_BEGIN
 		return true;
 	}
 
-	PUGI__FN bool allow_move(xml_node parent, xml_node child)
+	PUGI_IMPL_FN bool allow_move(xml_node parent, xml_node child)
 	{
 		// check that child can be a child of parent
 		if (!allow_insert_child(parent.type(), child.type()))
@@ -4404,9 +4460,9 @@ PUGI__NS_BEGIN
 	}
 
 	template <typename String, typename Header>
-	PUGI__FN void node_copy_string(String& dest, Header& header, uintptr_t header_mask, char_t* source, Header& source_header, xml_allocator* alloc)
+	PUGI_IMPL_FN void node_copy_string(String& dest, Header& header, uintptr_t header_mask, char_t* source, Header& source_header, xml_allocator* alloc)
 	{
-		assert(!dest && (header & header_mask) == 0);
+		assert(!dest && (header & header_mask) == 0); // copies are performed into fresh nodes
 
 		if (source)
 		{
@@ -4423,7 +4479,7 @@ PUGI__NS_BEGIN
 		}
 	}
 
-	PUGI__FN void node_copy_contents(xml_node_struct* dn, xml_node_struct* sn, xml_allocator* shared_alloc)
+	PUGI_IMPL_FN void node_copy_contents(xml_node_struct* dn, xml_node_struct* sn, xml_allocator* shared_alloc)
 	{
 		node_copy_string(dn->name, dn->header, xml_memory_page_name_allocated_mask, sn->name, sn->header, shared_alloc);
 		node_copy_string(dn->value, dn->header, xml_memory_page_value_allocated_mask, sn->value, sn->header, shared_alloc);
@@ -4440,10 +4496,10 @@ PUGI__NS_BEGIN
 		}
 	}
 
-	PUGI__FN void node_copy_tree(xml_node_struct* dn, xml_node_struct* sn)
+	PUGI_IMPL_FN void node_copy_tree(xml_node_struct* dn, xml_node_struct* sn)
 	{
 		xml_allocator& alloc = get_allocator(dn);
-		xml_allocator* shared_alloc = (&alloc == &get_allocator(sn)) ? &alloc : 0;
+		xml_allocator* shared_alloc = (&alloc == &get_allocator(sn)) ? &alloc : nullptr;
 
 		node_copy_contents(dn, sn, shared_alloc);
 
@@ -4458,7 +4514,7 @@ PUGI__NS_BEGIN
 			// when a tree is copied into one of the descendants, we need to skip that subtree to avoid an infinite loop
 			if (sit != dn)
 			{
-				xml_node_struct* copy = append_new_node(dit, alloc, PUGI__NODETYPE(sit));
+				xml_node_struct* copy = append_new_node(dit, alloc, PUGI_IMPL_NODETYPE(sit));
 
 				if (copy)
 				{
@@ -4494,10 +4550,10 @@ PUGI__NS_BEGIN
 		assert(!sit || dit == dn->parent);
 	}
 
-	PUGI__FN void node_copy_attribute(xml_attribute_struct* da, xml_attribute_struct* sa)
+	PUGI_IMPL_FN void node_copy_attribute(xml_attribute_struct* da, xml_attribute_struct* sa)
 	{
 		xml_allocator& alloc = get_allocator(da);
-		xml_allocator* shared_alloc = (&alloc == &get_allocator(sa)) ? &alloc : 0;
+		xml_allocator* shared_alloc = (&alloc == &get_allocator(sa)) ? &alloc : nullptr;
 
 		node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc);
 		node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc);
@@ -4505,18 +4561,18 @@ PUGI__NS_BEGIN
 
 	inline bool is_text_node(xml_node_struct* node)
 	{
-		xml_node_type type = PUGI__NODETYPE(node);
+		xml_node_type type = PUGI_IMPL_NODETYPE(node);
 
 		return type == node_pcdata || type == node_cdata;
 	}
 
 	// get value with conversion functions
-	template <typename U> PUGI__FN PUGI__UNSIGNED_OVERFLOW U string_to_integer(const char_t* value, U minv, U maxv)
+	template <typename U> PUGI_IMPL_FN PUGI_IMPL_UNSIGNED_OVERFLOW U string_to_integer(const char_t* value, U minv, U maxv)
 	{
 		U result = 0;
 		const char_t* s = value;
 
-		while (PUGI__IS_CHARTYPE(*s, ct_space))
+		while (PUGI_IMPL_IS_CHARTYPE(*s, ct_space))
 			s++;
 
 		bool negative = (*s == '-');
@@ -4571,7 +4627,7 @@ PUGI__NS_BEGIN
 
 			size_t digits = static_cast<size_t>(s - start);
 
-			PUGI__STATIC_ASSERT(sizeof(U) == 8 || sizeof(U) == 4 || sizeof(U) == 2);
+			PUGI_IMPL_STATIC_ASSERT(sizeof(U) == 8 || sizeof(U) == 4 || sizeof(U) == 2);
 
 			const size_t max_digits10 = sizeof(U) == 8 ? 20 : sizeof(U) == 4 ? 10 : 5;
 			const char_t max_lead = sizeof(U) == 8 ? '1' : sizeof(U) == 4 ? '4' : '6';
@@ -4593,35 +4649,35 @@ PUGI__NS_BEGIN
 			return (overflow || result > maxv) ? maxv : result;
 	}
 
-	PUGI__FN int get_value_int(const char_t* value)
+	PUGI_IMPL_FN int get_value_int(const char_t* value)
 	{
 		return string_to_integer<unsigned int>(value, static_cast<unsigned int>(INT_MIN), INT_MAX);
 	}
 
-	PUGI__FN unsigned int get_value_uint(const char_t* value)
+	PUGI_IMPL_FN unsigned int get_value_uint(const char_t* value)
 	{
 		return string_to_integer<unsigned int>(value, 0, UINT_MAX);
 	}
 
-	PUGI__FN double get_value_double(const char_t* value)
+	PUGI_IMPL_FN double get_value_double(const char_t* value)
 	{
 	#ifdef PUGIXML_WCHAR_MODE
-		return wcstod(value, 0);
+		return wcstod(value, nullptr);
 	#else
-		return strtod(value, 0);
+		return strtod(value, nullptr);
 	#endif
 	}
 
-	PUGI__FN float get_value_float(const char_t* value)
+	PUGI_IMPL_FN float get_value_float(const char_t* value)
 	{
 	#ifdef PUGIXML_WCHAR_MODE
-		return static_cast<float>(wcstod(value, 0));
+		return static_cast<float>(wcstod(value, nullptr));
 	#else
-		return static_cast<float>(strtod(value, 0));
+		return static_cast<float>(strtod(value, nullptr));
 	#endif
 	}
 
-	PUGI__FN bool get_value_bool(const char_t* value)
+	PUGI_IMPL_FN bool get_value_bool(const char_t* value)
 	{
 		// only look at first char
 		char_t first = *value;
@@ -4631,18 +4687,18 @@ PUGI__NS_BEGIN
 	}
 
 #ifdef PUGIXML_HAS_LONG_LONG
-	PUGI__FN long long get_value_llong(const char_t* value)
+	PUGI_IMPL_FN long long get_value_llong(const char_t* value)
 	{
 		return string_to_integer<unsigned long long>(value, static_cast<unsigned long long>(LLONG_MIN), LLONG_MAX);
 	}
 
-	PUGI__FN unsigned long long get_value_ullong(const char_t* value)
+	PUGI_IMPL_FN unsigned long long get_value_ullong(const char_t* value)
 	{
 		return string_to_integer<unsigned long long>(value, 0, ULLONG_MAX);
 	}
 #endif
 
-	template <typename U> PUGI__FN PUGI__UNSIGNED_OVERFLOW char_t* integer_to_string(char_t* begin, char_t* end, U value, bool negative)
+	template <typename U> PUGI_IMPL_FN PUGI_IMPL_UNSIGNED_OVERFLOW char_t* integer_to_string(char_t* begin, char_t* end, U value, bool negative)
 	{
 		char_t* result = end - 1;
 		U rest = negative ? 0 - value : value;
@@ -4664,7 +4720,7 @@ PUGI__NS_BEGIN
 
 	// set value with conversion functions
 	template <typename String, typename Header>
-	PUGI__FN bool set_value_ascii(String& dest, Header& header, uintptr_t header_mask, char* buf)
+	PUGI_IMPL_FN bool set_value_ascii(String& dest, Header& header, uintptr_t header_mask, char* buf)
 	{
 	#ifdef PUGIXML_WCHAR_MODE
 		char_t wbuf[128];
@@ -4680,7 +4736,7 @@ PUGI__NS_BEGIN
 	}
 
 	template <typename U, typename String, typename Header>
-	PUGI__FN bool set_value_integer(String& dest, Header& header, uintptr_t header_mask, U value, bool negative)
+	PUGI_IMPL_FN bool set_value_integer(String& dest, Header& header, uintptr_t header_mask, U value, bool negative)
 	{
 		char_t buf[64];
 		char_t* end = buf + sizeof(buf) / sizeof(buf[0]);
@@ -4690,30 +4746,30 @@ PUGI__NS_BEGIN
 	}
 
 	template <typename String, typename Header>
-	PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, float value, int precision)
+	PUGI_IMPL_FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, float value, int precision)
 	{
 		char buf[128];
-		PUGI__SNPRINTF(buf, "%.*g", precision, double(value));
+		PUGI_IMPL_SNPRINTF(buf, "%.*g", precision, double(value));
 
 		return set_value_ascii(dest, header, header_mask, buf);
 	}
 
 	template <typename String, typename Header>
-	PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, double value, int precision)
+	PUGI_IMPL_FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, double value, int precision)
 	{
 		char buf[128];
-		PUGI__SNPRINTF(buf, "%.*g", precision, value);
+		PUGI_IMPL_SNPRINTF(buf, "%.*g", precision, value);
 
 		return set_value_ascii(dest, header, header_mask, buf);
 	}
 
 	template <typename String, typename Header>
-	PUGI__FN bool set_value_bool(String& dest, Header& header, uintptr_t header_mask, bool value)
+	PUGI_IMPL_FN bool set_value_bool(String& dest, Header& header, uintptr_t header_mask, bool value)
 	{
 		return strcpy_insitu(dest, header, header_mask, value ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"), value ? 4 : 5);
 	}
 
-	PUGI__FN xml_parse_result load_buffer_impl(xml_document_struct* doc, xml_node_struct* root, void* contents, size_t size, unsigned int options, xml_encoding encoding, bool is_mutable, bool own, char_t** out_buffer)
+	PUGI_IMPL_FN xml_parse_result load_buffer_impl(xml_document_struct* doc, xml_node_struct* root, void* contents, size_t size, unsigned int options, xml_encoding encoding, bool is_mutable, bool own, char_t** out_buffer)
 	{
 		// check input buffer
 		if (!contents && size) return make_parse_result(status_io_error);
@@ -4722,10 +4778,10 @@ PUGI__NS_BEGIN
 		xml_encoding buffer_encoding = impl::get_buffer_encoding(encoding, contents, size);
 
 		// if convert_buffer below throws bad_alloc, we still need to deallocate contents if we own it
-		auto_deleter<void> contents_guard(own ? contents : 0, xml_memory::deallocate);
+		auto_deleter<void> contents_guard(own ? contents : nullptr, xml_memory::deallocate);
 
 		// get private buffer
-		char_t* buffer = 0;
+		char_t* buffer = nullptr;
 		size_t length = 0;
 
 		// coverity[var_deref_model]
@@ -4752,48 +4808,60 @@ PUGI__NS_BEGIN
 		return res;
 	}
 
-	// we need to get length of entire file to load it in memory; the only (relatively) sane way to do it is via seek/tell trick
-	PUGI__FN xml_parse_status get_file_size(FILE* file, size_t& out_result)
+	template <typename T> PUGI_IMPL_FN xml_parse_status convert_file_size(T length, size_t& out_result)
 	{
-	#if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400
-		// there are 64-bit versions of fseek/ftell, let's use them
-		typedef __int64 length_type;
-
-		_fseeki64(file, 0, SEEK_END);
-		length_type length = _ftelli64(file);
-		_fseeki64(file, 0, SEEK_SET);
-	#elif defined(__MINGW32__) && !defined(__NO_MINGW_LFS) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR))
-		// there are 64-bit versions of fseek/ftell, let's use them
-		typedef off64_t length_type;
-
-		fseeko64(file, 0, SEEK_END);
-		length_type length = ftello64(file);
-		fseeko64(file, 0, SEEK_SET);
-	#else
-		// if this is a 32-bit OS, long is enough; if this is a unix system, long is 64-bit, which is enough; otherwise we can't do anything anyway.
-		typedef long length_type;
-
-		fseek(file, 0, SEEK_END);
-		length_type length = ftell(file);
-		fseek(file, 0, SEEK_SET);
-	#endif
-
 		// check for I/O errors
 		if (length < 0) return status_io_error;
 
 		// check for overflow
 		size_t result = static_cast<size_t>(length);
 
-		if (static_cast<length_type>(result) != length) return status_out_of_memory;
+		if (static_cast<T>(result) != length) return status_out_of_memory;
 
-		// finalize
 		out_result = result;
-
 		return status_ok;
 	}
 
+	// we need to get length of entire file to load it in memory; the only (relatively) sane way to do it is via seek/tell trick
+	PUGI_IMPL_FN xml_parse_status get_file_size(FILE* file, size_t& out_result)
+	{
+	#if defined(__linux__) || defined(__APPLE__)
+		// this simultaneously retrieves the file size and file mode (to guard against loading non-files)
+		struct stat st;
+		if (fstat(fileno(file), &st) != 0) return status_io_error;
+
+		// anything that's not a regular file doesn't have a coherent length
+		if (!S_ISREG(st.st_mode)) return status_io_error;
+
+		xml_parse_status status = convert_file_size(st.st_size, out_result);
+	#elif defined(PUGI_IMPL_MSVC_CRT_VERSION) && PUGI_IMPL_MSVC_CRT_VERSION >= 1400
+		// there are 64-bit versions of fseek/ftell, let's use them
+		_fseeki64(file, 0, SEEK_END);
+		__int64 length = _ftelli64(file);
+		_fseeki64(file, 0, SEEK_SET);
+
+		xml_parse_status status = convert_file_size(length, out_result);
+	#elif defined(__MINGW32__) && !defined(__NO_MINGW_LFS) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR))
+		// there are 64-bit versions of fseek/ftell, let's use them
+		fseeko64(file, 0, SEEK_END);
+		off64_t length = ftello64(file);
+		fseeko64(file, 0, SEEK_SET);
+
+		xml_parse_status status = convert_file_size(length, out_result);
+	#else
+		// if this is a 32-bit OS, long is enough; if this is a unix system, long is 64-bit, which is enough; otherwise we can't do anything anyway.
+		fseek(file, 0, SEEK_END);
+		long length = ftell(file);
+		fseek(file, 0, SEEK_SET);
+
+		xml_parse_status status = convert_file_size(length, out_result);
+	#endif
+
+		return status;
+	}
+
 	// This function assumes that buffer has extra sizeof(char_t) writable bytes after size
-	PUGI__FN size_t zero_terminate_buffer(void* buffer, size_t size, xml_encoding encoding)
+	PUGI_IMPL_FN size_t zero_terminate_buffer(void* buffer, size_t size, xml_encoding encoding)
 	{
 		// We only need to zero-terminate if encoding conversion does not do it for us
 	#ifdef PUGIXML_WCHAR_MODE
@@ -4817,7 +4885,7 @@ PUGI__NS_BEGIN
 		return size;
 	}
 
-	PUGI__FN xml_parse_result load_file_impl(xml_document_struct* doc, FILE* file, unsigned int options, xml_encoding encoding, char_t** out_buffer)
+	PUGI_IMPL_FN xml_parse_result load_file_impl(xml_document_struct* doc, FILE* file, unsigned int options, xml_encoding encoding, char_t** out_buffer)
 	{
 		if (!file) return make_parse_result(status_file_not_found);
 
@@ -4846,7 +4914,7 @@ PUGI__NS_BEGIN
 		return load_buffer_impl(doc, doc, contents, zero_terminate_buffer(contents, size, real_encoding), options, real_encoding, true, true, out_buffer);
 	}
 
-	PUGI__FN void close_file(FILE* file)
+	PUGI_IMPL_FN void close_file(FILE* file)
 	{
 		fclose(file);
 	}
@@ -4857,7 +4925,7 @@ PUGI__NS_BEGIN
 		static xml_stream_chunk* create()
 		{
 			void* memory = xml_memory::allocate(sizeof(xml_stream_chunk));
-			if (!memory) return 0;
+			if (!memory) return nullptr;
 
 			return new (memory) xml_stream_chunk();
 		}
@@ -4875,7 +4943,7 @@ PUGI__NS_BEGIN
 			}
 		}
 
-		xml_stream_chunk(): next(0), size(0)
+		xml_stream_chunk(): next(nullptr), size(0)
 		{
 		}
 
@@ -4885,13 +4953,13 @@ PUGI__NS_BEGIN
 		T data[xml_memory_page_size / sizeof(T)];
 	};
 
-	template <typename T> PUGI__FN xml_parse_status load_stream_data_noseek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
+	template <typename T> PUGI_IMPL_FN xml_parse_status load_stream_data_noseek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
 	{
-		auto_deleter<xml_stream_chunk<T> > chunks(0, xml_stream_chunk<T>::destroy);
+		auto_deleter<xml_stream_chunk<T> > chunks(nullptr, xml_stream_chunk<T>::destroy);
 
 		// read file to a chunk list
 		size_t total = 0;
-		xml_stream_chunk<T>* last = 0;
+		xml_stream_chunk<T>* last = nullptr;
 
 		while (!stream.eof())
 		{
@@ -4939,7 +5007,7 @@ PUGI__NS_BEGIN
 		return status_ok;
 	}
 
-	template <typename T> PUGI__FN xml_parse_status load_stream_data_seek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
+	template <typename T> PUGI_IMPL_FN xml_parse_status load_stream_data_seek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
 	{
 		// get length of remaining data in stream
 		typename std::basic_istream<T>::pos_type pos = stream.tellg();
@@ -4975,9 +5043,9 @@ PUGI__NS_BEGIN
 		return status_ok;
 	}
 
-	template <typename T> PUGI__FN xml_parse_result load_stream_impl(xml_document_struct* doc, std::basic_istream<T>& stream, unsigned int options, xml_encoding encoding, char_t** out_buffer)
+	template <typename T> PUGI_IMPL_FN xml_parse_result load_stream_impl(xml_document_struct* doc, std::basic_istream<T>& stream, unsigned int options, xml_encoding encoding, char_t** out_buffer)
 	{
-		void* buffer = 0;
+		void* buffer = nullptr;
 		size_t size = 0;
 		xml_parse_status status = status_ok;
 
@@ -5001,18 +5069,26 @@ PUGI__NS_BEGIN
 	}
 #endif
 
-#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__) || (defined(__MINGW32__) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR)))
-	PUGI__FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
+#if defined(PUGI_IMPL_MSVC_CRT_VERSION) || defined(__BORLANDC__) || (defined(__MINGW32__) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR)))
+	PUGI_IMPL_FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
 	{
-#if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400
-		FILE* file = 0;
-		return _wfopen_s(&file, path, mode) == 0 ? file : 0;
+#ifdef PUGIXML_NO_STL
+		// ensure these symbols are consistently referenced to avoid 'unreferenced function' warnings
+		// note that generally these functions are used in STL builds, but PUGIXML_NO_STL leaves the only usage in convert_path_heap
+		(void)&as_utf8_begin;
+		(void)&as_utf8_end;
+		(void)&strlength_wide;
+#endif
+
+#if defined(PUGI_IMPL_MSVC_CRT_VERSION) && PUGI_IMPL_MSVC_CRT_VERSION >= 1400
+		FILE* file = nullptr;
+		return _wfopen_s(&file, path, mode) == 0 ? file : nullptr;
 #else
 		return _wfopen(path, mode);
 #endif
 	}
 #else
-	PUGI__FN char* convert_path_heap(const wchar_t* str)
+	PUGI_IMPL_FN char* convert_path_heap(const wchar_t* str)
 	{
 		assert(str);
 
@@ -5022,7 +5098,7 @@ PUGI__NS_BEGIN
 
 		// allocate resulting string
 		char* result = static_cast<char*>(xml_memory::allocate(size + 1));
-		if (!result) return 0;
+		if (!result) return nullptr;
 
 		// second pass: convert to utf8
 		as_utf8_end(result, size, str, length);
@@ -5033,11 +5109,11 @@ PUGI__NS_BEGIN
 		return result;
 	}
 
-	PUGI__FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
+	PUGI_IMPL_FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
 	{
 		// there is no standard function to open wide paths, so our best bet is to try utf8 path
 		char* path_utf8 = convert_path_heap(path);
-		if (!path_utf8) return 0;
+		if (!path_utf8) return nullptr;
 
 		// convert mode to ASCII (we mirror _wfopen interface)
 		char mode_ascii[4] = {0};
@@ -5053,17 +5129,17 @@ PUGI__NS_BEGIN
 	}
 #endif
 
-	PUGI__FN FILE* open_file(const char* path, const char* mode)
+	PUGI_IMPL_FN FILE* open_file(const char* path, const char* mode)
 	{
-#if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400
-		FILE* file = 0;
-		return fopen_s(&file, path, mode) == 0 ? file : 0;
+#if defined(PUGI_IMPL_MSVC_CRT_VERSION) && PUGI_IMPL_MSVC_CRT_VERSION >= 1400
+		FILE* file = nullptr;
+		return fopen_s(&file, path, mode) == 0 ? file : nullptr;
 #else
 		return fopen(path, mode);
 #endif
 	}
 
-	PUGI__FN bool save_file_impl(const xml_document& doc, FILE* file, const char_t* indent, unsigned int flags, xml_encoding encoding)
+	PUGI_IMPL_FN bool save_file_impl(const xml_document& doc, FILE* file, const char_t* indent, unsigned int flags, xml_encoding encoding)
 	{
 		if (!file) return false;
 
@@ -5080,7 +5156,7 @@ PUGI__NS_BEGIN
 
 		name_null_sentry(xml_node_struct* node_): node(node_), name(node_->name)
 		{
-			node->name = 0;
+			node->name = nullptr;
 		}
 
 		~name_null_sentry()
@@ -5088,30 +5164,34 @@ PUGI__NS_BEGIN
 			node->name = name;
 		}
 	};
-PUGI__NS_END
+PUGI_IMPL_NS_END
 
 namespace pugi
 {
-	PUGI__FN xml_writer_file::xml_writer_file(void* file_): file(file_)
+	PUGI_IMPL_FN xml_writer::~xml_writer()
 	{
 	}
 
-	PUGI__FN void xml_writer_file::write(const void* data, size_t size)
+	PUGI_IMPL_FN xml_writer_file::xml_writer_file(void* file_): file(file_)
+	{
+	}
+
+	PUGI_IMPL_FN void xml_writer_file::write(const void* data, size_t size)
 	{
 		size_t result = fwrite(data, 1, size, static_cast<FILE*>(file));
 		(void)!result; // unfortunately we can't do proper error handling here
 	}
 
 #ifndef PUGIXML_NO_STL
-	PUGI__FN xml_writer_stream::xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream): narrow_stream(&stream), wide_stream(0)
+	PUGI_IMPL_FN xml_writer_stream::xml_writer_stream(std::basic_ostream<char>& stream): narrow_stream(&stream), wide_stream(nullptr)
 	{
 	}
 
-	PUGI__FN xml_writer_stream::xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream): narrow_stream(0), wide_stream(&stream)
+	PUGI_IMPL_FN xml_writer_stream::xml_writer_stream(std::basic_ostream<wchar_t>& stream): narrow_stream(nullptr), wide_stream(&stream)
 	{
 	}
 
-	PUGI__FN void xml_writer_stream::write(const void* data, size_t size)
+	PUGI_IMPL_FN void xml_writer_stream::write(const void* data, size_t size)
 	{
 		if (narrow_stream)
 		{
@@ -5128,130 +5208,130 @@ namespace pugi
 	}
 #endif
 
-	PUGI__FN xml_tree_walker::xml_tree_walker(): _depth(0)
+	PUGI_IMPL_FN xml_tree_walker::xml_tree_walker(): _depth(0)
 	{
 	}
 
-	PUGI__FN xml_tree_walker::~xml_tree_walker()
+	PUGI_IMPL_FN xml_tree_walker::~xml_tree_walker()
 	{
 	}
 
-	PUGI__FN int xml_tree_walker::depth() const
+	PUGI_IMPL_FN int xml_tree_walker::depth() const
 	{
 		return _depth;
 	}
 
-	PUGI__FN bool xml_tree_walker::begin(xml_node&)
+	PUGI_IMPL_FN bool xml_tree_walker::begin(xml_node&)
 	{
 		return true;
 	}
 
-	PUGI__FN bool xml_tree_walker::end(xml_node&)
+	PUGI_IMPL_FN bool xml_tree_walker::end(xml_node&)
 	{
 		return true;
 	}
 
-	PUGI__FN xml_attribute::xml_attribute(): _attr(0)
+	PUGI_IMPL_FN xml_attribute::xml_attribute(): _attr(nullptr)
 	{
 	}
 
-	PUGI__FN xml_attribute::xml_attribute(xml_attribute_struct* attr): _attr(attr)
+	PUGI_IMPL_FN xml_attribute::xml_attribute(xml_attribute_struct* attr): _attr(attr)
 	{
 	}
 
-	PUGI__FN static void unspecified_bool_xml_attribute(xml_attribute***)
+	PUGI_IMPL_FN static void unspecified_bool_xml_attribute(xml_attribute***)
 	{
 	}
 
-	PUGI__FN xml_attribute::operator xml_attribute::unspecified_bool_type() const
+	PUGI_IMPL_FN xml_attribute::operator xml_attribute::unspecified_bool_type() const
 	{
-		return _attr ? unspecified_bool_xml_attribute : 0;
+		return _attr ? unspecified_bool_xml_attribute : nullptr;
 	}
 
-	PUGI__FN bool xml_attribute::operator!() const
+	PUGI_IMPL_FN bool xml_attribute::operator!() const
 	{
 		return !_attr;
 	}
 
-	PUGI__FN bool xml_attribute::operator==(const xml_attribute& r) const
+	PUGI_IMPL_FN bool xml_attribute::operator==(const xml_attribute& r) const
 	{
 		return (_attr == r._attr);
 	}
 
-	PUGI__FN bool xml_attribute::operator!=(const xml_attribute& r) const
+	PUGI_IMPL_FN bool xml_attribute::operator!=(const xml_attribute& r) const
 	{
 		return (_attr != r._attr);
 	}
 
-	PUGI__FN bool xml_attribute::operator<(const xml_attribute& r) const
+	PUGI_IMPL_FN bool xml_attribute::operator<(const xml_attribute& r) const
 	{
 		return (_attr < r._attr);
 	}
 
-	PUGI__FN bool xml_attribute::operator>(const xml_attribute& r) const
+	PUGI_IMPL_FN bool xml_attribute::operator>(const xml_attribute& r) const
 	{
 		return (_attr > r._attr);
 	}
 
-	PUGI__FN bool xml_attribute::operator<=(const xml_attribute& r) const
+	PUGI_IMPL_FN bool xml_attribute::operator<=(const xml_attribute& r) const
 	{
 		return (_attr <= r._attr);
 	}
 
-	PUGI__FN bool xml_attribute::operator>=(const xml_attribute& r) const
+	PUGI_IMPL_FN bool xml_attribute::operator>=(const xml_attribute& r) const
 	{
 		return (_attr >= r._attr);
 	}
 
-	PUGI__FN xml_attribute xml_attribute::next_attribute() const
+	PUGI_IMPL_FN xml_attribute xml_attribute::next_attribute() const
 	{
 		if (!_attr) return xml_attribute();
 		return xml_attribute(_attr->next_attribute);
 	}
 
-	PUGI__FN xml_attribute xml_attribute::previous_attribute() const
+	PUGI_IMPL_FN xml_attribute xml_attribute::previous_attribute() const
 	{
 		if (!_attr) return xml_attribute();
 		xml_attribute_struct* prev = _attr->prev_attribute_c;
 		return prev->next_attribute ? xml_attribute(prev) : xml_attribute();
 	}
 
-	PUGI__FN const char_t* xml_attribute::as_string(const char_t* def) const
+	PUGI_IMPL_FN const char_t* xml_attribute::as_string(const char_t* def) const
 	{
 		if (!_attr) return def;
 		const char_t* value = _attr->value;
 		return value ? value : def;
 	}
 
-	PUGI__FN int xml_attribute::as_int(int def) const
+	PUGI_IMPL_FN int xml_attribute::as_int(int def) const
 	{
 		if (!_attr) return def;
 		const char_t* value = _attr->value;
 		return value ? impl::get_value_int(value) : def;
 	}
 
-	PUGI__FN unsigned int xml_attribute::as_uint(unsigned int def) const
+	PUGI_IMPL_FN unsigned int xml_attribute::as_uint(unsigned int def) const
 	{
 		if (!_attr) return def;
 		const char_t* value = _attr->value;
 		return value ? impl::get_value_uint(value) : def;
 	}
 
-	PUGI__FN double xml_attribute::as_double(double def) const
+	PUGI_IMPL_FN double xml_attribute::as_double(double def) const
 	{
 		if (!_attr) return def;
 		const char_t* value = _attr->value;
 		return value ? impl::get_value_double(value) : def;
 	}
 
-	PUGI__FN float xml_attribute::as_float(float def) const
+	PUGI_IMPL_FN float xml_attribute::as_float(float def) const
 	{
 		if (!_attr) return def;
 		const char_t* value = _attr->value;
 		return value ? impl::get_value_float(value) : def;
 	}
 
-	PUGI__FN bool xml_attribute::as_bool(bool def) const
+	PUGI_IMPL_FN bool xml_attribute::as_bool(bool def) const
 	{
 		if (!_attr) return def;
 		const char_t* value = _attr->value;
@@ -5259,14 +5339,14 @@ namespace pugi
 	}
 
 #ifdef PUGIXML_HAS_LONG_LONG
-	PUGI__FN long long xml_attribute::as_llong(long long def) const
+	PUGI_IMPL_FN long long xml_attribute::as_llong(long long def) const
 	{
 		if (!_attr) return def;
 		const char_t* value = _attr->value;
 		return value ? impl::get_value_llong(value) : def;
 	}
 
-	PUGI__FN unsigned long long xml_attribute::as_ullong(unsigned long long def) const
+	PUGI_IMPL_FN unsigned long long xml_attribute::as_ullong(unsigned long long def) const
 	{
 		if (!_attr) return def;
 		const char_t* value = _attr->value;
@@ -5274,175 +5354,208 @@ namespace pugi
 	}
 #endif
 
-	PUGI__FN bool xml_attribute::empty() const
+	PUGI_IMPL_FN bool xml_attribute::empty() const
 	{
 		return !_attr;
 	}
 
-	PUGI__FN const char_t* xml_attribute::name() const
+	PUGI_IMPL_FN const char_t* xml_attribute::name() const
 	{
 		if (!_attr) return PUGIXML_TEXT("");
 		const char_t* name = _attr->name;
 		return name ? name : PUGIXML_TEXT("");
 	}
 
-	PUGI__FN const char_t* xml_attribute::value() const
+	PUGI_IMPL_FN const char_t* xml_attribute::value() const
 	{
 		if (!_attr) return PUGIXML_TEXT("");
 		const char_t* value = _attr->value;
 		return value ? value : PUGIXML_TEXT("");
 	}
 
-	PUGI__FN size_t xml_attribute::hash_value() const
+	PUGI_IMPL_FN size_t xml_attribute::hash_value() const
 	{
-		return static_cast<size_t>(reinterpret_cast<uintptr_t>(_attr) / sizeof(xml_attribute_struct));
+		return reinterpret_cast<uintptr_t>(_attr) / sizeof(xml_attribute_struct);
 	}
 
-	PUGI__FN xml_attribute_struct* xml_attribute::internal_object() const
+	PUGI_IMPL_FN xml_attribute_struct* xml_attribute::internal_object() const
 	{
 		return _attr;
 	}
 
-	PUGI__FN xml_attribute& xml_attribute::operator=(const char_t* rhs)
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(const char_t* rhs)
 	{
 		set_value(rhs);
 		return *this;
 	}
 
-	PUGI__FN xml_attribute& xml_attribute::operator=(int rhs)
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(int rhs)
 	{
 		set_value(rhs);
 		return *this;
 	}
 
-	PUGI__FN xml_attribute& xml_attribute::operator=(unsigned int rhs)
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(unsigned int rhs)
 	{
 		set_value(rhs);
 		return *this;
 	}
 
-	PUGI__FN xml_attribute& xml_attribute::operator=(long rhs)
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(long rhs)
 	{
 		set_value(rhs);
 		return *this;
 	}
 
-	PUGI__FN xml_attribute& xml_attribute::operator=(unsigned long rhs)
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(unsigned long rhs)
 	{
 		set_value(rhs);
 		return *this;
 	}
 
-	PUGI__FN xml_attribute& xml_attribute::operator=(double rhs)
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(double rhs)
 	{
 		set_value(rhs);
 		return *this;
 	}
 
-	PUGI__FN xml_attribute& xml_attribute::operator=(float rhs)
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(float rhs)
 	{
 		set_value(rhs);
 		return *this;
 	}
 
-	PUGI__FN xml_attribute& xml_attribute::operator=(bool rhs)
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(bool rhs)
 	{
 		set_value(rhs);
 		return *this;
 	}
 
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI__FN xml_attribute& xml_attribute::operator=(long long rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_attribute& xml_attribute::operator=(unsigned long long rhs)
+#ifdef PUGIXML_HAS_STRING_VIEW
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(string_view_t rhs)
 	{
 		set_value(rhs);
 		return *this;
 	}
 #endif
 
-	PUGI__FN bool xml_attribute::set_name(const char_t* rhs)
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(long long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(unsigned long long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+#endif
+
+	PUGI_IMPL_FN bool xml_attribute::set_name(const char_t* rhs)
 	{
 		if (!_attr) return false;
 
 		return impl::strcpy_insitu(_attr->name, _attr->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs));
 	}
 
-	PUGI__FN bool xml_attribute::set_value(const char_t* rhs, size_t sz)
+	PUGI_IMPL_FN bool xml_attribute::set_name(const char_t* rhs, size_t size)
 	{
 		if (!_attr) return false;
 
-		return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, sz);
+		return impl::strcpy_insitu(_attr->name, _attr->header, impl::xml_memory_page_name_allocated_mask, rhs, size);
 	}
 
-	PUGI__FN bool xml_attribute::set_value(const char_t* rhs)
+#ifdef PUGIXML_HAS_STRING_VIEW
+	PUGI_IMPL_FN bool xml_attribute::set_name(string_view_t rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::strcpy_insitu(_attr->name, _attr->header, impl::xml_memory_page_name_allocated_mask, rhs.data(), rhs.size());
+	}
+#endif
+
+	PUGI_IMPL_FN bool xml_attribute::set_value(const char_t* rhs)
 	{
 		if (!_attr) return false;
 
 		return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs));
 	}
 
-	PUGI__FN bool xml_attribute::set_value(int rhs)
+	PUGI_IMPL_FN bool xml_attribute::set_value(const char_t* rhs, size_t size)
+	{
+		if (!_attr) return false;
+
+		return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, size);
+	}
+
+#ifdef PUGIXML_HAS_STRING_VIEW
+	PUGI_IMPL_FN bool xml_attribute::set_value(string_view_t rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs.data(), rhs.size());
+	}
+#endif
+
+	PUGI_IMPL_FN bool xml_attribute::set_value(int rhs)
 	{
 		if (!_attr) return false;
 
 		return impl::set_value_integer<unsigned int>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
 	}
 
-	PUGI__FN bool xml_attribute::set_value(unsigned int rhs)
+	PUGI_IMPL_FN bool xml_attribute::set_value(unsigned int rhs)
 	{
 		if (!_attr) return false;
 
 		return impl::set_value_integer<unsigned int>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
 	}
 
-	PUGI__FN bool xml_attribute::set_value(long rhs)
+	PUGI_IMPL_FN bool xml_attribute::set_value(long rhs)
 	{
 		if (!_attr) return false;
 
 		return impl::set_value_integer<unsigned long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
 	}
 
-	PUGI__FN bool xml_attribute::set_value(unsigned long rhs)
+	PUGI_IMPL_FN bool xml_attribute::set_value(unsigned long rhs)
 	{
 		if (!_attr) return false;
 
 		return impl::set_value_integer<unsigned long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
 	}
 
-	PUGI__FN bool xml_attribute::set_value(double rhs)
+	PUGI_IMPL_FN bool xml_attribute::set_value(double rhs)
 	{
 		if (!_attr) return false;
 
 		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, default_double_precision);
 	}
 
-	PUGI__FN bool xml_attribute::set_value(double rhs, int precision)
+	PUGI_IMPL_FN bool xml_attribute::set_value(double rhs, int precision)
 	{
 		if (!_attr) return false;
 
 		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, precision);
 	}
 
-	PUGI__FN bool xml_attribute::set_value(float rhs)
+	PUGI_IMPL_FN bool xml_attribute::set_value(float rhs)
 	{
 		if (!_attr) return false;
 
 		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, default_float_precision);
 	}
 
-	PUGI__FN bool xml_attribute::set_value(float rhs, int precision)
+	PUGI_IMPL_FN bool xml_attribute::set_value(float rhs, int precision)
 	{
 		if (!_attr) return false;
 
 		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, precision);
 	}
 
-	PUGI__FN bool xml_attribute::set_value(bool rhs)
+	PUGI_IMPL_FN bool xml_attribute::set_value(bool rhs)
 	{
 		if (!_attr) return false;
 
@@ -5450,14 +5563,14 @@ namespace pugi
 	}
 
 #ifdef PUGIXML_HAS_LONG_LONG
-	PUGI__FN bool xml_attribute::set_value(long long rhs)
+	PUGI_IMPL_FN bool xml_attribute::set_value(long long rhs)
 	{
 		if (!_attr) return false;
 
 		return impl::set_value_integer<unsigned long long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
 	}
 
-	PUGI__FN bool xml_attribute::set_value(unsigned long long rhs)
+	PUGI_IMPL_FN bool xml_attribute::set_value(unsigned long long rhs)
 	{
 		if (!_attr) return false;
 
@@ -5466,129 +5579,129 @@ namespace pugi
 #endif
 
 #ifdef __BORLANDC__
-	PUGI__FN bool operator&&(const xml_attribute& lhs, bool rhs)
+	PUGI_IMPL_FN bool operator&&(const xml_attribute& lhs, bool rhs)
 	{
 		return (bool)lhs && rhs;
 	}
 
-	PUGI__FN bool operator||(const xml_attribute& lhs, bool rhs)
+	PUGI_IMPL_FN bool operator||(const xml_attribute& lhs, bool rhs)
 	{
 		return (bool)lhs || rhs;
 	}
 #endif
 
-	PUGI__FN xml_node::xml_node(): _root(0)
+	PUGI_IMPL_FN xml_node::xml_node(): _root(nullptr)
 	{
 	}
 
-	PUGI__FN xml_node::xml_node(xml_node_struct* p): _root(p)
+	PUGI_IMPL_FN xml_node::xml_node(xml_node_struct* p): _root(p)
 	{
 	}
 
-	PUGI__FN static void unspecified_bool_xml_node(xml_node***)
+	PUGI_IMPL_FN static void unspecified_bool_xml_node(xml_node***)
 	{
 	}
 
-	PUGI__FN xml_node::operator xml_node::unspecified_bool_type() const
+	PUGI_IMPL_FN xml_node::operator xml_node::unspecified_bool_type() const
 	{
-		return _root ? unspecified_bool_xml_node : 0;
+		return _root ? unspecified_bool_xml_node : nullptr;
 	}
 
-	PUGI__FN bool xml_node::operator!() const
+	PUGI_IMPL_FN bool xml_node::operator!() const
 	{
 		return !_root;
 	}
 
-	PUGI__FN xml_node::iterator xml_node::begin() const
+	PUGI_IMPL_FN xml_node::iterator xml_node::begin() const
 	{
-		return iterator(_root ? _root->first_child + 0 : 0, _root);
+		return iterator(_root ? _root->first_child + 0 : nullptr, _root);
 	}
 
-	PUGI__FN xml_node::iterator xml_node::end() const
+	PUGI_IMPL_FN xml_node::iterator xml_node::end() const
 	{
-		return iterator(0, _root);
+		return iterator(nullptr, _root);
 	}
 
-	PUGI__FN xml_node::attribute_iterator xml_node::attributes_begin() const
+	PUGI_IMPL_FN xml_node::attribute_iterator xml_node::attributes_begin() const
 	{
-		return attribute_iterator(_root ? _root->first_attribute + 0 : 0, _root);
+		return attribute_iterator(_root ? _root->first_attribute + 0 : nullptr, _root);
 	}
 
-	PUGI__FN xml_node::attribute_iterator xml_node::attributes_end() const
+	PUGI_IMPL_FN xml_node::attribute_iterator xml_node::attributes_end() const
 	{
-		return attribute_iterator(0, _root);
+		return attribute_iterator(nullptr, _root);
 	}
 
-	PUGI__FN xml_object_range<xml_node_iterator> xml_node::children() const
+	PUGI_IMPL_FN xml_object_range<xml_node_iterator> xml_node::children() const
 	{
 		return xml_object_range<xml_node_iterator>(begin(), end());
 	}
 
-	PUGI__FN xml_object_range<xml_named_node_iterator> xml_node::children(const char_t* name_) const
+	PUGI_IMPL_FN xml_object_range<xml_named_node_iterator> xml_node::children(const char_t* name_) const
 	{
-		return xml_object_range<xml_named_node_iterator>(xml_named_node_iterator(child(name_)._root, _root, name_), xml_named_node_iterator(0, _root, name_));
+		return xml_object_range<xml_named_node_iterator>(xml_named_node_iterator(child(name_)._root, _root, name_), xml_named_node_iterator(nullptr, _root, name_));
 	}
 
-	PUGI__FN xml_object_range<xml_attribute_iterator> xml_node::attributes() const
+	PUGI_IMPL_FN xml_object_range<xml_attribute_iterator> xml_node::attributes() const
 	{
 		return xml_object_range<xml_attribute_iterator>(attributes_begin(), attributes_end());
 	}
 
-	PUGI__FN bool xml_node::operator==(const xml_node& r) const
+	PUGI_IMPL_FN bool xml_node::operator==(const xml_node& r) const
 	{
 		return (_root == r._root);
 	}
 
-	PUGI__FN bool xml_node::operator!=(const xml_node& r) const
+	PUGI_IMPL_FN bool xml_node::operator!=(const xml_node& r) const
 	{
 		return (_root != r._root);
 	}
 
-	PUGI__FN bool xml_node::operator<(const xml_node& r) const
+	PUGI_IMPL_FN bool xml_node::operator<(const xml_node& r) const
 	{
 		return (_root < r._root);
 	}
 
-	PUGI__FN bool xml_node::operator>(const xml_node& r) const
+	PUGI_IMPL_FN bool xml_node::operator>(const xml_node& r) const
 	{
 		return (_root > r._root);
 	}
 
-	PUGI__FN bool xml_node::operator<=(const xml_node& r) const
+	PUGI_IMPL_FN bool xml_node::operator<=(const xml_node& r) const
 	{
 		return (_root <= r._root);
 	}
 
-	PUGI__FN bool xml_node::operator>=(const xml_node& r) const
+	PUGI_IMPL_FN bool xml_node::operator>=(const xml_node& r) const
 	{
 		return (_root >= r._root);
 	}
 
-	PUGI__FN bool xml_node::empty() const
+	PUGI_IMPL_FN bool xml_node::empty() const
 	{
 		return !_root;
 	}
 
-	PUGI__FN const char_t* xml_node::name() const
+	PUGI_IMPL_FN const char_t* xml_node::name() const
 	{
 		if (!_root) return PUGIXML_TEXT("");
 		const char_t* name = _root->name;
 		return name ? name : PUGIXML_TEXT("");
 	}
 
-	PUGI__FN xml_node_type xml_node::type() const
+	PUGI_IMPL_FN xml_node_type xml_node::type() const
 	{
-		return _root ? PUGI__NODETYPE(_root) : node_null;
+		return _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
 	}
 
-	PUGI__FN const char_t* xml_node::value() const
+	PUGI_IMPL_FN const char_t* xml_node::value() const
 	{
 		if (!_root) return PUGIXML_TEXT("");
 		const char_t* value = _root->value;
 		return value ? value : PUGIXML_TEXT("");
 	}
 
-	PUGI__FN xml_node xml_node::child(const char_t* name_) const
+	PUGI_IMPL_FN xml_node xml_node::child(const char_t* name_) const
 	{
 		if (!_root) return xml_node();
 
@@ -5602,7 +5715,7 @@ namespace pugi
 		return xml_node();
 	}
 
-	PUGI__FN xml_attribute xml_node::attribute(const char_t* name_) const
+	PUGI_IMPL_FN xml_attribute xml_node::attribute(const char_t* name_) const
 	{
 		if (!_root) return xml_attribute();
 
@@ -5616,7 +5729,7 @@ namespace pugi
 		return xml_attribute();
 	}
 
-	PUGI__FN xml_node xml_node::next_sibling(const char_t* name_) const
+	PUGI_IMPL_FN xml_node xml_node::next_sibling(const char_t* name_) const
 	{
 		if (!_root) return xml_node();
 
@@ -5630,12 +5743,12 @@ namespace pugi
 		return xml_node();
 	}
 
-	PUGI__FN xml_node xml_node::next_sibling() const
+	PUGI_IMPL_FN xml_node xml_node::next_sibling() const
 	{
 		return _root ? xml_node(_root->next_sibling) : xml_node();
 	}
 
-	PUGI__FN xml_node xml_node::previous_sibling(const char_t* name_) const
+	PUGI_IMPL_FN xml_node xml_node::previous_sibling(const char_t* name_) const
 	{
 		if (!_root) return xml_node();
 
@@ -5649,7 +5762,65 @@ namespace pugi
 		return xml_node();
 	}
 
-	PUGI__FN xml_attribute xml_node::attribute(const char_t* name_, xml_attribute& hint_) const
+#ifdef PUGIXML_HAS_STRING_VIEW
+	PUGI_IMPL_FN xml_node xml_node::child(string_view_t name_) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+		{
+			const char_t* iname = i->name;
+			if (iname && impl::stringview_equal(name_, iname))
+				return xml_node(i);
+		}
+
+		return xml_node();
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::attribute(string_view_t name_) const
+	{
+		if (!_root) return xml_attribute();
+
+		for (xml_attribute_struct* i = _root->first_attribute; i; i = i->next_attribute)
+		{
+			const char_t* iname = i->name;
+			if (iname && impl::stringview_equal(name_, iname))
+				return xml_attribute(i);
+		}
+
+		return xml_attribute();
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::next_sibling(string_view_t name_) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->next_sibling; i; i = i->next_sibling)
+		{
+			const char_t* iname = i->name;
+			if (iname && impl::stringview_equal(name_, iname))
+				return xml_node(i);
+		}
+
+		return xml_node();
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::previous_sibling(string_view_t name_) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->prev_sibling_c; i->next_sibling; i = i->prev_sibling_c)
+		{
+			const char_t* iname = i->name;
+			if (iname && impl::stringview_equal(name_, iname))
+				return xml_node(i);
+		}
+
+		return xml_node();
+	}
+#endif
+
+	PUGI_IMPL_FN xml_attribute xml_node::attribute(const char_t* name_, xml_attribute& hint_) const
 	{
 		xml_attribute_struct* hint = hint_._attr;
 
@@ -5688,34 +5859,75 @@ namespace pugi
 		return xml_attribute();
 	}
 
-	PUGI__FN xml_node xml_node::previous_sibling() const
+#ifdef PUGIXML_HAS_STRING_VIEW
+	PUGI_IMPL_FN xml_attribute xml_node::attribute(string_view_t name_, xml_attribute& hint_) const
+	{
+		xml_attribute_struct* hint = hint_._attr;
+
+		// if hint is not an attribute of node, behavior is not defined
+		assert(!hint || (_root && impl::is_attribute_of(hint, _root)));
+
+		if (!_root) return xml_attribute();
+
+		// optimistically search from hint up until the end
+		for (xml_attribute_struct* i = hint; i; i = i->next_attribute)
+		{
+			const char_t* iname = i->name;
+			if (iname && impl::stringview_equal(name_, iname))
+			{
+				// update hint to maximize efficiency of searching for consecutive attributes
+				hint_._attr = i->next_attribute;
+
+				return xml_attribute(i);
+			}
+		}
+
+		// wrap around and search from the first attribute until the hint
+		// 'j' null pointer check is technically redundant, but it prevents a crash in case the assertion above fails
+		for (xml_attribute_struct* j = _root->first_attribute; j && j != hint; j = j->next_attribute)
+		{
+			const char_t* jname = j->name;
+			if (jname && impl::stringview_equal(name_, jname))
+			{
+				// update hint to maximize efficiency of searching for consecutive attributes
+				hint_._attr = j->next_attribute;
+
+				return xml_attribute(j);
+			}
+		}
+
+		return xml_attribute();
+	}
+#endif
+
+	PUGI_IMPL_FN xml_node xml_node::previous_sibling() const
 	{
 		if (!_root) return xml_node();
 		xml_node_struct* prev = _root->prev_sibling_c;
 		return prev->next_sibling ? xml_node(prev) : xml_node();
 	}
 
-	PUGI__FN xml_node xml_node::parent() const
+	PUGI_IMPL_FN xml_node xml_node::parent() const
 	{
 		return _root ? xml_node(_root->parent) : xml_node();
 	}
 
-	PUGI__FN xml_node xml_node::root() const
+	PUGI_IMPL_FN xml_node xml_node::root() const
 	{
 		return _root ? xml_node(&impl::get_document(_root)) : xml_node();
 	}
 
-	PUGI__FN xml_text xml_node::text() const
+	PUGI_IMPL_FN xml_text xml_node::text() const
 	{
 		return xml_text(_root);
 	}
 
-	PUGI__FN const char_t* xml_node::child_value() const
+	PUGI_IMPL_FN const char_t* xml_node::child_value() const
 	{
 		if (!_root) return PUGIXML_TEXT("");
 
 		// element nodes can have value if parse_embed_pcdata was used
-		if (PUGI__NODETYPE(_root) == node_element && _root->value)
+		if (PUGI_IMPL_NODETYPE(_root) == node_element && _root->value)
 			return _root->value;
 
 		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
@@ -5728,40 +5940,40 @@ namespace pugi
 		return PUGIXML_TEXT("");
 	}
 
-	PUGI__FN const char_t* xml_node::child_value(const char_t* name_) const
+	PUGI_IMPL_FN const char_t* xml_node::child_value(const char_t* name_) const
 	{
 		return child(name_).child_value();
 	}
 
-	PUGI__FN xml_attribute xml_node::first_attribute() const
+	PUGI_IMPL_FN xml_attribute xml_node::first_attribute() const
 	{
 		if (!_root) return xml_attribute();
 		return xml_attribute(_root->first_attribute);
 	}
 
-	PUGI__FN xml_attribute xml_node::last_attribute() const
+	PUGI_IMPL_FN xml_attribute xml_node::last_attribute() const
 	{
 		if (!_root) return xml_attribute();
 		xml_attribute_struct* first = _root->first_attribute;
 		return first ? xml_attribute(first->prev_attribute_c) : xml_attribute();
 	}
 
-	PUGI__FN xml_node xml_node::first_child() const
+	PUGI_IMPL_FN xml_node xml_node::first_child() const
 	{
 		if (!_root) return xml_node();
 		return xml_node(_root->first_child);
 	}
 
-	PUGI__FN xml_node xml_node::last_child() const
+	PUGI_IMPL_FN xml_node xml_node::last_child() const
 	{
 		if (!_root) return xml_node();
 		xml_node_struct* first = _root->first_child;
 		return first ? xml_node(first->prev_sibling_c) : xml_node();
 	}
 
-	PUGI__FN bool xml_node::set_name(const char_t* rhs)
+	PUGI_IMPL_FN bool xml_node::set_name(const char_t* rhs)
 	{
-		xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null;
+		xml_node_type type_ = _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
 
 		if (type_ != node_element && type_ != node_pi && type_ != node_declaration)
 			return false;
@@ -5769,19 +5981,31 @@ namespace pugi
 		return impl::strcpy_insitu(_root->name, _root->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs));
 	}
 
-	PUGI__FN bool xml_node::set_value(const char_t* rhs, size_t sz)
+	PUGI_IMPL_FN bool xml_node::set_name(const char_t* rhs, size_t size)
 	{
-		xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null;
+		xml_node_type type_ = _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
 
-		if (type_ != node_pcdata && type_ != node_cdata && type_ != node_comment && type_ != node_pi && type_ != node_doctype)
+		if (type_ != node_element && type_ != node_pi && type_ != node_declaration)
 			return false;
 
-		return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs, sz);
+		return impl::strcpy_insitu(_root->name, _root->header, impl::xml_memory_page_name_allocated_mask, rhs, size);
 	}
 
-	PUGI__FN bool xml_node::set_value(const char_t* rhs)
+#ifdef PUGIXML_HAS_STRING_VIEW
+	PUGI_IMPL_FN bool xml_node::set_name(string_view_t rhs)
 	{
-		xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null;
+		xml_node_type type_ = _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
+
+		if (type_ != node_element && type_ != node_pi && type_ != node_declaration)
+			return false;
+
+		return impl::strcpy_insitu(_root->name, _root->header, impl::xml_memory_page_name_allocated_mask, rhs.data(), rhs.size());
+	}
+#endif
+
+	PUGI_IMPL_FN bool xml_node::set_value(const char_t* rhs)
+	{
+		xml_node_type type_ = _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
 
 		if (type_ != node_pcdata && type_ != node_cdata && type_ != node_comment && type_ != node_pi && type_ != node_doctype)
 			return false;
@@ -5789,7 +6013,29 @@ namespace pugi
 		return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs));
 	}
 
-	PUGI__FN xml_attribute xml_node::append_attribute(const char_t* name_)
+	PUGI_IMPL_FN bool xml_node::set_value(const char_t* rhs, size_t size)
+	{
+		xml_node_type type_ = _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
+
+		if (type_ != node_pcdata && type_ != node_cdata && type_ != node_comment && type_ != node_pi && type_ != node_doctype)
+			return false;
+
+		return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs, size);
+	}
+
+#ifdef PUGIXML_HAS_STRING_VIEW
+	PUGI_IMPL_FN bool xml_node::set_value(string_view_t rhs)
+	{
+		xml_node_type type_ = _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
+
+		if (type_ != node_pcdata && type_ != node_cdata && type_ != node_comment && type_ != node_pi && type_ != node_doctype)
+			return false;
+
+		return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs.data(), rhs.size());
+	}
+#endif
+
+	PUGI_IMPL_FN xml_attribute xml_node::append_attribute(const char_t* name_)
 	{
 		if (!impl::allow_insert_attribute(type())) return xml_attribute();
 
@@ -5806,7 +6052,7 @@ namespace pugi
 		return a;
 	}
 
-	PUGI__FN xml_attribute xml_node::prepend_attribute(const char_t* name_)
+	PUGI_IMPL_FN xml_attribute xml_node::prepend_attribute(const char_t* name_)
 	{
 		if (!impl::allow_insert_attribute(type())) return xml_attribute();
 
@@ -5823,7 +6069,7 @@ namespace pugi
 		return a;
 	}
 
-	PUGI__FN xml_attribute xml_node::insert_attribute_after(const char_t* name_, const xml_attribute& attr)
+	PUGI_IMPL_FN xml_attribute xml_node::insert_attribute_after(const char_t* name_, const xml_attribute& attr)
 	{
 		if (!impl::allow_insert_attribute(type())) return xml_attribute();
 		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
@@ -5841,7 +6087,7 @@ namespace pugi
 		return a;
 	}
 
-	PUGI__FN xml_attribute xml_node::insert_attribute_before(const char_t* name_, const xml_attribute& attr)
+	PUGI_IMPL_FN xml_attribute xml_node::insert_attribute_before(const char_t* name_, const xml_attribute& attr)
 	{
 		if (!impl::allow_insert_attribute(type())) return xml_attribute();
 		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
@@ -5859,7 +6105,79 @@ namespace pugi
 		return a;
 	}
 
-	PUGI__FN xml_attribute xml_node::append_copy(const xml_attribute& proto)
+#ifdef PUGIXML_HAS_STRING_VIEW
+	PUGI_IMPL_FN xml_attribute xml_node::append_attribute(string_view_t name_)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::append_attribute(a._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::prepend_attribute(string_view_t name_)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::prepend_attribute(a._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::insert_attribute_after(string_view_t name_, const xml_attribute& attr)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_after(a._attr, attr._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::insert_attribute_before(string_view_t name_, const xml_attribute& attr)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_before(a._attr, attr._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+#endif
+
+	PUGI_IMPL_FN xml_attribute xml_node::append_copy(const xml_attribute& proto)
 	{
 		if (!proto) return xml_attribute();
 		if (!impl::allow_insert_attribute(type())) return xml_attribute();
@@ -5876,7 +6194,7 @@ namespace pugi
 		return a;
 	}
 
-	PUGI__FN xml_attribute xml_node::prepend_copy(const xml_attribute& proto)
+	PUGI_IMPL_FN xml_attribute xml_node::prepend_copy(const xml_attribute& proto)
 	{
 		if (!proto) return xml_attribute();
 		if (!impl::allow_insert_attribute(type())) return xml_attribute();
@@ -5893,7 +6211,7 @@ namespace pugi
 		return a;
 	}
 
-	PUGI__FN xml_attribute xml_node::insert_copy_after(const xml_attribute& proto, const xml_attribute& attr)
+	PUGI_IMPL_FN xml_attribute xml_node::insert_copy_after(const xml_attribute& proto, const xml_attribute& attr)
 	{
 		if (!proto) return xml_attribute();
 		if (!impl::allow_insert_attribute(type())) return xml_attribute();
@@ -5911,7 +6229,7 @@ namespace pugi
 		return a;
 	}
 
-	PUGI__FN xml_attribute xml_node::insert_copy_before(const xml_attribute& proto, const xml_attribute& attr)
+	PUGI_IMPL_FN xml_attribute xml_node::insert_copy_before(const xml_attribute& proto, const xml_attribute& attr)
 	{
 		if (!proto) return xml_attribute();
 		if (!impl::allow_insert_attribute(type())) return xml_attribute();
@@ -5929,7 +6247,7 @@ namespace pugi
 		return a;
 	}
 
-	PUGI__FN xml_node xml_node::append_child(xml_node_type type_)
+	PUGI_IMPL_FN xml_node xml_node::append_child(xml_node_type type_)
 	{
 		if (!impl::allow_insert_child(type(), type_)) return xml_node();
 
@@ -5946,7 +6264,7 @@ namespace pugi
 		return n;
 	}
 
-	PUGI__FN xml_node xml_node::prepend_child(xml_node_type type_)
+	PUGI_IMPL_FN xml_node xml_node::prepend_child(xml_node_type type_)
 	{
 		if (!impl::allow_insert_child(type(), type_)) return xml_node();
 
@@ -5963,7 +6281,7 @@ namespace pugi
 		return n;
 	}
 
-	PUGI__FN xml_node xml_node::insert_child_before(xml_node_type type_, const xml_node& node)
+	PUGI_IMPL_FN xml_node xml_node::insert_child_before(xml_node_type type_, const xml_node& node)
 	{
 		if (!impl::allow_insert_child(type(), type_)) return xml_node();
 		if (!node._root || node._root->parent != _root) return xml_node();
@@ -5981,7 +6299,7 @@ namespace pugi
 		return n;
 	}
 
-	PUGI__FN xml_node xml_node::insert_child_after(xml_node_type type_, const xml_node& node)
+	PUGI_IMPL_FN xml_node xml_node::insert_child_after(xml_node_type type_, const xml_node& node)
 	{
 		if (!impl::allow_insert_child(type(), type_)) return xml_node();
 		if (!node._root || node._root->parent != _root) return xml_node();
@@ -5999,7 +6317,7 @@ namespace pugi
 		return n;
 	}
 
-	PUGI__FN xml_node xml_node::append_child(const char_t* name_)
+	PUGI_IMPL_FN xml_node xml_node::append_child(const char_t* name_)
 	{
 		xml_node result = append_child(node_element);
 
@@ -6008,7 +6326,7 @@ namespace pugi
 		return result;
 	}
 
-	PUGI__FN xml_node xml_node::prepend_child(const char_t* name_)
+	PUGI_IMPL_FN xml_node xml_node::prepend_child(const char_t* name_)
 	{
 		xml_node result = prepend_child(node_element);
 
@@ -6017,7 +6335,7 @@ namespace pugi
 		return result;
 	}
 
-	PUGI__FN xml_node xml_node::insert_child_after(const char_t* name_, const xml_node& node)
+	PUGI_IMPL_FN xml_node xml_node::insert_child_after(const char_t* name_, const xml_node& node)
 	{
 		xml_node result = insert_child_after(node_element, node);
 
@@ -6026,7 +6344,7 @@ namespace pugi
 		return result;
 	}
 
-	PUGI__FN xml_node xml_node::insert_child_before(const char_t* name_, const xml_node& node)
+	PUGI_IMPL_FN xml_node xml_node::insert_child_before(const char_t* name_, const xml_node& node)
 	{
 		xml_node result = insert_child_before(node_element, node);
 
@@ -6035,7 +6353,45 @@ namespace pugi
 		return result;
 	}
 
-	PUGI__FN xml_node xml_node::append_copy(const xml_node& proto)
+#ifdef PUGIXML_HAS_STRING_VIEW
+	PUGI_IMPL_FN xml_node xml_node::append_child(string_view_t name_)
+	{
+		xml_node result = append_child(node_element);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::prepend_child(string_view_t name_)
+	{
+		xml_node result = prepend_child(node_element);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::insert_child_after(string_view_t name_, const xml_node& node)
+	{
+		xml_node result = insert_child_after(node_element, node);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::insert_child_before(string_view_t name_, const xml_node& node)
+	{
+		xml_node result = insert_child_before(node_element, node);
+
+		result.set_name(name_);
+
+		return result;
+	}
+#endif
+
+	PUGI_IMPL_FN xml_node xml_node::append_copy(const xml_node& proto)
 	{
 		xml_node_type type_ = proto.type();
 		if (!impl::allow_insert_child(type(), type_)) return xml_node();
@@ -6052,7 +6408,7 @@ namespace pugi
 		return n;
 	}
 
-	PUGI__FN xml_node xml_node::prepend_copy(const xml_node& proto)
+	PUGI_IMPL_FN xml_node xml_node::prepend_copy(const xml_node& proto)
 	{
 		xml_node_type type_ = proto.type();
 		if (!impl::allow_insert_child(type(), type_)) return xml_node();
@@ -6069,7 +6425,7 @@ namespace pugi
 		return n;
 	}
 
-	PUGI__FN xml_node xml_node::insert_copy_after(const xml_node& proto, const xml_node& node)
+	PUGI_IMPL_FN xml_node xml_node::insert_copy_after(const xml_node& proto, const xml_node& node)
 	{
 		xml_node_type type_ = proto.type();
 		if (!impl::allow_insert_child(type(), type_)) return xml_node();
@@ -6087,7 +6443,7 @@ namespace pugi
 		return n;
 	}
 
-	PUGI__FN xml_node xml_node::insert_copy_before(const xml_node& proto, const xml_node& node)
+	PUGI_IMPL_FN xml_node xml_node::insert_copy_before(const xml_node& proto, const xml_node& node)
 	{
 		xml_node_type type_ = proto.type();
 		if (!impl::allow_insert_child(type(), type_)) return xml_node();
@@ -6105,7 +6461,7 @@ namespace pugi
 		return n;
 	}
 
-	PUGI__FN xml_node xml_node::append_move(const xml_node& moved)
+	PUGI_IMPL_FN xml_node xml_node::append_move(const xml_node& moved)
 	{
 		if (!impl::allow_move(*this, moved)) return xml_node();
 
@@ -6121,7 +6477,7 @@ namespace pugi
 		return moved;
 	}
 
-	PUGI__FN xml_node xml_node::prepend_move(const xml_node& moved)
+	PUGI_IMPL_FN xml_node xml_node::prepend_move(const xml_node& moved)
 	{
 		if (!impl::allow_move(*this, moved)) return xml_node();
 
@@ -6137,7 +6493,7 @@ namespace pugi
 		return moved;
 	}
 
-	PUGI__FN xml_node xml_node::insert_move_after(const xml_node& moved, const xml_node& node)
+	PUGI_IMPL_FN xml_node xml_node::insert_move_after(const xml_node& moved, const xml_node& node)
 	{
 		if (!impl::allow_move(*this, moved)) return xml_node();
 		if (!node._root || node._root->parent != _root) return xml_node();
@@ -6155,7 +6511,7 @@ namespace pugi
 		return moved;
 	}
 
-	PUGI__FN xml_node xml_node::insert_move_before(const xml_node& moved, const xml_node& node)
+	PUGI_IMPL_FN xml_node xml_node::insert_move_before(const xml_node& moved, const xml_node& node)
 	{
 		if (!impl::allow_move(*this, moved)) return xml_node();
 		if (!node._root || node._root->parent != _root) return xml_node();
@@ -6173,12 +6529,19 @@ namespace pugi
 		return moved;
 	}
 
-	PUGI__FN bool xml_node::remove_attribute(const char_t* name_)
+	PUGI_IMPL_FN bool xml_node::remove_attribute(const char_t* name_)
 	{
 		return remove_attribute(attribute(name_));
 	}
 
-	PUGI__FN bool xml_node::remove_attribute(const xml_attribute& a)
+#ifdef PUGIXML_HAS_STRING_VIEW
+	PUGI_IMPL_FN bool xml_node::remove_attribute(string_view_t name_)
+	{
+		return remove_attribute(attribute(name_));
+	}
+#endif
+
+	PUGI_IMPL_FN bool xml_node::remove_attribute(const xml_attribute& a)
 	{
 		if (!_root || !a._attr) return false;
 		if (!impl::is_attribute_of(a._attr, _root)) return false;
@@ -6192,7 +6555,7 @@ namespace pugi
 		return true;
 	}
 
-	PUGI__FN bool xml_node::remove_attributes()
+	PUGI_IMPL_FN bool xml_node::remove_attributes()
 	{
 		if (!_root) return false;
 
@@ -6208,17 +6571,24 @@ namespace pugi
 			attr = next;
 		}
 
-		_root->first_attribute = 0;
+		_root->first_attribute = nullptr;
 
 		return true;
 	}
 
-	PUGI__FN bool xml_node::remove_child(const char_t* name_)
+	PUGI_IMPL_FN bool xml_node::remove_child(const char_t* name_)
 	{
 		return remove_child(child(name_));
 	}
 
-	PUGI__FN bool xml_node::remove_child(const xml_node& n)
+#ifdef PUGIXML_HAS_STRING_VIEW
+	PUGI_IMPL_FN bool xml_node::remove_child(string_view_t name_)
+	{
+		return remove_child(child(name_));
+	}
+#endif
+
+	PUGI_IMPL_FN bool xml_node::remove_child(const xml_node& n)
 	{
 		if (!_root || !n._root || n._root->parent != _root) return false;
 
@@ -6231,7 +6601,7 @@ namespace pugi
 		return true;
 	}
 
-	PUGI__FN bool xml_node::remove_children()
+	PUGI_IMPL_FN bool xml_node::remove_children()
 	{
 		if (!_root) return false;
 
@@ -6247,16 +6617,19 @@ namespace pugi
 			cur = next;
 		}
 
-		_root->first_child = 0;
+		_root->first_child = nullptr;
 
 		return true;
 	}
 
-	PUGI__FN xml_parse_result xml_node::append_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	PUGI_IMPL_FN xml_parse_result xml_node::append_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
 	{
 		// append_buffer is only valid for elements/documents
 		if (!impl::allow_insert_child(type(), node_element)) return impl::make_parse_result(status_append_invalid_root);
 
+		// append buffer can not merge PCDATA into existing PCDATA nodes
+		if ((options & parse_merge_pcdata) != 0 && last_child().type() == node_pcdata) return impl::make_parse_result(status_append_invalid_root);
+
 		// get document node
 		impl::xml_document_struct* doc = &impl::get_document(_root);
 
@@ -6264,7 +6637,7 @@ namespace pugi
 		doc->header |= impl::xml_memory_page_contents_shared_mask;
 
 		// get extra buffer element (we'll store the document fragment buffer there so that we can deallocate it later)
-		impl::xml_memory_page* page = 0;
+		impl::xml_memory_page* page = nullptr;
 		impl::xml_extra_buffer* extra = static_cast<impl::xml_extra_buffer*>(doc->allocate_memory(sizeof(impl::xml_extra_buffer) + sizeof(void*), page));
 		(void)page;
 
@@ -6277,7 +6650,7 @@ namespace pugi
 	#endif
 
 		// add extra buffer to the list
-		extra->buffer = 0;
+		extra->buffer = nullptr;
 		extra->next = doc->extra_buffers;
 		doc->extra_buffers = extra;
 
@@ -6287,7 +6660,7 @@ namespace pugi
 		return impl::load_buffer_impl(doc, _root, const_cast<void*>(contents), size, options, encoding, false, false, &extra->buffer);
 	}
 
-	PUGI__FN xml_node xml_node::find_child_by_attribute(const char_t* name_, const char_t* attr_name, const char_t* attr_value) const
+	PUGI_IMPL_FN xml_node xml_node::find_child_by_attribute(const char_t* name_, const char_t* attr_name, const char_t* attr_value) const
 	{
 		if (!_root) return xml_node();
 
@@ -6312,7 +6685,7 @@ namespace pugi
 		return xml_node();
 	}
 
-	PUGI__FN xml_node xml_node::find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const
+	PUGI_IMPL_FN xml_node xml_node::find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const
 	{
 		if (!_root) return xml_node();
 
@@ -6332,7 +6705,7 @@ namespace pugi
 	}
 
 #ifndef PUGIXML_NO_STL
-	PUGI__FN string_t xml_node::path(char_t delimiter) const
+	PUGI_IMPL_FN string_t xml_node::path(char_t delimiter) const
 	{
 		if (!_root) return string_t();
 
@@ -6369,7 +6742,7 @@ namespace pugi
 	}
 #endif
 
-	PUGI__FN xml_node xml_node::first_element_by_path(const char_t* path_, char_t delimiter) const
+	PUGI_IMPL_FN xml_node xml_node::first_element_by_path(const char_t* path_, char_t delimiter) const
 	{
 		xml_node context = path_[0] == delimiter ? root() : *this;
 
@@ -6410,14 +6783,14 @@ namespace pugi
 		}
 	}
 
-	PUGI__FN bool xml_node::traverse(xml_tree_walker& walker)
+	PUGI_IMPL_FN bool xml_node::traverse(xml_tree_walker& walker)
 	{
 		walker._depth = -1;
 
 		xml_node arg_begin(_root);
 		if (!walker.begin(arg_begin)) return false;
 
-		xml_node_struct* cur = _root ? _root->first_child + 0 : 0;
+		xml_node_struct* cur = _root ? _root->first_child + 0 : nullptr;
 
 		if (cur)
 		{
@@ -6457,17 +6830,17 @@ namespace pugi
 		return walker.end(arg_end);
 	}
 
-	PUGI__FN size_t xml_node::hash_value() const
+	PUGI_IMPL_FN size_t xml_node::hash_value() const
 	{
-		return static_cast<size_t>(reinterpret_cast<uintptr_t>(_root) / sizeof(xml_node_struct));
+		return reinterpret_cast<uintptr_t>(_root) / sizeof(xml_node_struct);
 	}
 
-	PUGI__FN xml_node_struct* xml_node::internal_object() const
+	PUGI_IMPL_FN xml_node_struct* xml_node::internal_object() const
 	{
 		return _root;
 	}
 
-	PUGI__FN void xml_node::print(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
+	PUGI_IMPL_FN void xml_node::print(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
 	{
 		if (!_root) return;
 
@@ -6479,14 +6852,14 @@ namespace pugi
 	}
 
 #ifndef PUGIXML_NO_STL
-	PUGI__FN void xml_node::print(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
+	PUGI_IMPL_FN void xml_node::print(std::basic_ostream<char>& stream, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
 	{
 		xml_writer_stream writer(stream);
 
 		print(writer, indent, flags, encoding, depth);
 	}
 
-	PUGI__FN void xml_node::print(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent, unsigned int flags, unsigned int depth) const
+	PUGI_IMPL_FN void xml_node::print(std::basic_ostream<wchar_t>& stream, const char_t* indent, unsigned int flags, unsigned int depth) const
 	{
 		xml_writer_stream writer(stream);
 
@@ -6494,7 +6867,7 @@ namespace pugi
 	}
 #endif
 
-	PUGI__FN ptrdiff_t xml_node::offset_debug() const
+	PUGI_IMPL_FN ptrdiff_t xml_node::offset_debug() const
 	{
 		if (!_root) return -1;
 
@@ -6526,37 +6899,37 @@ namespace pugi
 	}
 
 #ifdef __BORLANDC__
-	PUGI__FN bool operator&&(const xml_node& lhs, bool rhs)
+	PUGI_IMPL_FN bool operator&&(const xml_node& lhs, bool rhs)
 	{
 		return (bool)lhs && rhs;
 	}
 
-	PUGI__FN bool operator||(const xml_node& lhs, bool rhs)
+	PUGI_IMPL_FN bool operator||(const xml_node& lhs, bool rhs)
 	{
 		return (bool)lhs || rhs;
 	}
 #endif
 
-	PUGI__FN xml_text::xml_text(xml_node_struct* root): _root(root)
+	PUGI_IMPL_FN xml_text::xml_text(xml_node_struct* root): _root(root)
 	{
 	}
 
-	PUGI__FN xml_node_struct* xml_text::_data() const
+	PUGI_IMPL_FN xml_node_struct* xml_text::_data() const
 	{
 		if (!_root || impl::is_text_node(_root)) return _root;
 
 		// element nodes can have value if parse_embed_pcdata was used
-		if (PUGI__NODETYPE(_root) == node_element && _root->value)
+		if (PUGI_IMPL_NODETYPE(_root) == node_element && _root->value)
 			return _root;
 
 		for (xml_node_struct* node = _root->first_child; node; node = node->next_sibling)
 			if (impl::is_text_node(node))
 				return node;
 
-		return 0;
+		return nullptr;
 	}
 
-	PUGI__FN xml_node_struct* xml_text::_data_new()
+	PUGI_IMPL_FN xml_node_struct* xml_text::_data_new()
 	{
 		xml_node_struct* d = _data();
 		if (d) return d;
@@ -6564,30 +6937,30 @@ namespace pugi
 		return xml_node(_root).append_child(node_pcdata).internal_object();
 	}
 
-	PUGI__FN xml_text::xml_text(): _root(0)
+	PUGI_IMPL_FN xml_text::xml_text(): _root()
 	{
 	}
 
-	PUGI__FN static void unspecified_bool_xml_text(xml_text***)
+	PUGI_IMPL_FN static void unspecified_bool_xml_text(xml_text***)
 	{
 	}
 
-	PUGI__FN xml_text::operator xml_text::unspecified_bool_type() const
+	PUGI_IMPL_FN xml_text::operator xml_text::unspecified_bool_type() const
 	{
-		return _data() ? unspecified_bool_xml_text : 0;
+		return _data() ? unspecified_bool_xml_text : nullptr;
 	}
 
-	PUGI__FN bool xml_text::operator!() const
+	PUGI_IMPL_FN bool xml_text::operator!() const
 	{
 		return !_data();
 	}
 
-	PUGI__FN bool xml_text::empty() const
+	PUGI_IMPL_FN bool xml_text::empty() const
 	{
-		return _data() == 0;
+		return _data() == nullptr;
 	}
 
-	PUGI__FN const char_t* xml_text::get() const
+	PUGI_IMPL_FN const char_t* xml_text::get() const
 	{
 		xml_node_struct* d = _data();
 		if (!d) return PUGIXML_TEXT("");
@@ -6595,7 +6968,7 @@ namespace pugi
 		return value ? value : PUGIXML_TEXT("");
 	}
 
-	PUGI__FN const char_t* xml_text::as_string(const char_t* def) const
+	PUGI_IMPL_FN const char_t* xml_text::as_string(const char_t* def) const
 	{
 		xml_node_struct* d = _data();
 		if (!d) return def;
@@ -6603,7 +6976,7 @@ namespace pugi
 		return value ? value : def;
 	}
 
-	PUGI__FN int xml_text::as_int(int def) const
+	PUGI_IMPL_FN int xml_text::as_int(int def) const
 	{
 		xml_node_struct* d = _data();
 		if (!d) return def;
@@ -6611,7 +6984,7 @@ namespace pugi
 		return value ? impl::get_value_int(value) : def;
 	}
 
-	PUGI__FN unsigned int xml_text::as_uint(unsigned int def) const
+	PUGI_IMPL_FN unsigned int xml_text::as_uint(unsigned int def) const
 	{
 		xml_node_struct* d = _data();
 		if (!d) return def;
@@ -6619,7 +6992,7 @@ namespace pugi
 		return value ? impl::get_value_uint(value) : def;
 	}
 
-	PUGI__FN double xml_text::as_double(double def) const
+	PUGI_IMPL_FN double xml_text::as_double(double def) const
 	{
 		xml_node_struct* d = _data();
 		if (!d) return def;
@@ -6627,7 +7000,7 @@ namespace pugi
 		return value ? impl::get_value_double(value) : def;
 	}
 
-	PUGI__FN float xml_text::as_float(float def) const
+	PUGI_IMPL_FN float xml_text::as_float(float def) const
 	{
 		xml_node_struct* d = _data();
 		if (!d) return def;
@@ -6635,7 +7008,7 @@ namespace pugi
 		return value ? impl::get_value_float(value) : def;
 	}
 
-	PUGI__FN bool xml_text::as_bool(bool def) const
+	PUGI_IMPL_FN bool xml_text::as_bool(bool def) const
 	{
 		xml_node_struct* d = _data();
 		if (!d) return def;
@@ -6644,7 +7017,7 @@ namespace pugi
 	}
 
 #ifdef PUGIXML_HAS_LONG_LONG
-	PUGI__FN long long xml_text::as_llong(long long def) const
+	PUGI_IMPL_FN long long xml_text::as_llong(long long def) const
 	{
 		xml_node_struct* d = _data();
 		if (!d) return def;
@@ -6652,7 +7025,7 @@ namespace pugi
 		return value ? impl::get_value_llong(value) : def;
 	}
 
-	PUGI__FN unsigned long long xml_text::as_ullong(unsigned long long def) const
+	PUGI_IMPL_FN unsigned long long xml_text::as_ullong(unsigned long long def) const
 	{
 		xml_node_struct* d = _data();
 		if (!d) return def;
@@ -6661,77 +7034,86 @@ namespace pugi
 	}
 #endif
 
-	PUGI__FN bool xml_text::set(const char_t* rhs, size_t sz)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, sz) : false;
-	}
-
-	PUGI__FN bool xml_text::set(const char_t* rhs)
+	PUGI_IMPL_FN bool xml_text::set(const char_t* rhs)
 	{
 		xml_node_struct* dn = _data_new();
 
 		return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs)) : false;
 	}
 
-	PUGI__FN bool xml_text::set(int rhs)
+	PUGI_IMPL_FN bool xml_text::set(const char_t* rhs, size_t size)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, size) : false;
+	}
+
+#ifdef PUGIXML_HAS_STRING_VIEW
+	PUGI_IMPL_FN bool xml_text::set(string_view_t rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs.data(), rhs.size()) : false;
+	}
+#endif
+
+	PUGI_IMPL_FN bool xml_text::set(int rhs)
 	{
 		xml_node_struct* dn = _data_new();
 
 		return dn ? impl::set_value_integer<unsigned int>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
 	}
 
-	PUGI__FN bool xml_text::set(unsigned int rhs)
+	PUGI_IMPL_FN bool xml_text::set(unsigned int rhs)
 	{
 		xml_node_struct* dn = _data_new();
 
 		return dn ? impl::set_value_integer<unsigned int>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
 	}
 
-	PUGI__FN bool xml_text::set(long rhs)
+	PUGI_IMPL_FN bool xml_text::set(long rhs)
 	{
 		xml_node_struct* dn = _data_new();
 
 		return dn ? impl::set_value_integer<unsigned long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
 	}
 
-	PUGI__FN bool xml_text::set(unsigned long rhs)
+	PUGI_IMPL_FN bool xml_text::set(unsigned long rhs)
 	{
 		xml_node_struct* dn = _data_new();
 
 		return dn ? impl::set_value_integer<unsigned long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
 	}
 
-	PUGI__FN bool xml_text::set(float rhs)
+	PUGI_IMPL_FN bool xml_text::set(float rhs)
 	{
 		xml_node_struct* dn = _data_new();
 
 		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, default_float_precision) : false;
 	}
 
-	PUGI__FN bool xml_text::set(float rhs, int precision)
+	PUGI_IMPL_FN bool xml_text::set(float rhs, int precision)
 	{
 		xml_node_struct* dn = _data_new();
 
 		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, precision) : false;
 	}
 
-	PUGI__FN bool xml_text::set(double rhs)
+	PUGI_IMPL_FN bool xml_text::set(double rhs)
 	{
 		xml_node_struct* dn = _data_new();
 
 		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, default_double_precision) : false;
 	}
 
-	PUGI__FN bool xml_text::set(double rhs, int precision)
+	PUGI_IMPL_FN bool xml_text::set(double rhs, int precision)
 	{
 		xml_node_struct* dn = _data_new();
 
 		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, precision) : false;
 	}
 
-	PUGI__FN bool xml_text::set(bool rhs)
+	PUGI_IMPL_FN bool xml_text::set(bool rhs)
 	{
 		xml_node_struct* dn = _data_new();
 
@@ -6739,14 +7121,14 @@ namespace pugi
 	}
 
 #ifdef PUGIXML_HAS_LONG_LONG
-	PUGI__FN bool xml_text::set(long long rhs)
+	PUGI_IMPL_FN bool xml_text::set(long long rhs)
 	{
 		xml_node_struct* dn = _data_new();
 
 		return dn ? impl::set_value_integer<unsigned long long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
 	}
 
-	PUGI__FN bool xml_text::set(unsigned long long rhs)
+	PUGI_IMPL_FN bool xml_text::set(unsigned long long rhs)
 	{
 		xml_node_struct* dn = _data_new();
 
@@ -6754,256 +7136,264 @@ namespace pugi
 	}
 #endif
 
-	PUGI__FN xml_text& xml_text::operator=(const char_t* rhs)
+	PUGI_IMPL_FN xml_text& xml_text::operator=(const char_t* rhs)
 	{
 		set(rhs);
 		return *this;
 	}
 
-	PUGI__FN xml_text& xml_text::operator=(int rhs)
+	PUGI_IMPL_FN xml_text& xml_text::operator=(int rhs)
 	{
 		set(rhs);
 		return *this;
 	}
 
-	PUGI__FN xml_text& xml_text::operator=(unsigned int rhs)
+	PUGI_IMPL_FN xml_text& xml_text::operator=(unsigned int rhs)
 	{
 		set(rhs);
 		return *this;
 	}
 
-	PUGI__FN xml_text& xml_text::operator=(long rhs)
+	PUGI_IMPL_FN xml_text& xml_text::operator=(long rhs)
 	{
 		set(rhs);
 		return *this;
 	}
 
-	PUGI__FN xml_text& xml_text::operator=(unsigned long rhs)
+	PUGI_IMPL_FN xml_text& xml_text::operator=(unsigned long rhs)
 	{
 		set(rhs);
 		return *this;
 	}
 
-	PUGI__FN xml_text& xml_text::operator=(double rhs)
+	PUGI_IMPL_FN xml_text& xml_text::operator=(double rhs)
 	{
 		set(rhs);
 		return *this;
 	}
 
-	PUGI__FN xml_text& xml_text::operator=(float rhs)
+	PUGI_IMPL_FN xml_text& xml_text::operator=(float rhs)
 	{
 		set(rhs);
 		return *this;
 	}
 
-	PUGI__FN xml_text& xml_text::operator=(bool rhs)
+	PUGI_IMPL_FN xml_text& xml_text::operator=(bool rhs)
 	{
 		set(rhs);
 		return *this;
 	}
 
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI__FN xml_text& xml_text::operator=(long long rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_text& xml_text::operator=(unsigned long long rhs)
+#ifdef PUGIXML_HAS_STRING_VIEW
+	PUGI_IMPL_FN xml_text& xml_text::operator=(string_view_t rhs)
 	{
 		set(rhs);
 		return *this;
 	}
 #endif
 
-	PUGI__FN xml_node xml_text::data() const
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI_IMPL_FN xml_text& xml_text::operator=(long long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_text& xml_text::operator=(unsigned long long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+#endif
+
+	PUGI_IMPL_FN xml_node xml_text::data() const
 	{
 		return xml_node(_data());
 	}
 
 #ifdef __BORLANDC__
-	PUGI__FN bool operator&&(const xml_text& lhs, bool rhs)
+	PUGI_IMPL_FN bool operator&&(const xml_text& lhs, bool rhs)
 	{
 		return (bool)lhs && rhs;
 	}
 
-	PUGI__FN bool operator||(const xml_text& lhs, bool rhs)
+	PUGI_IMPL_FN bool operator||(const xml_text& lhs, bool rhs)
 	{
 		return (bool)lhs || rhs;
 	}
 #endif
 
-	PUGI__FN xml_node_iterator::xml_node_iterator()
+	PUGI_IMPL_FN xml_node_iterator::xml_node_iterator()
 	{
 	}
 
-	PUGI__FN xml_node_iterator::xml_node_iterator(const xml_node& node): _wrap(node), _parent(node.parent())
+	PUGI_IMPL_FN xml_node_iterator::xml_node_iterator(const xml_node& node): _wrap(node), _parent(node.parent())
 	{
 	}
 
-	PUGI__FN xml_node_iterator::xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
+	PUGI_IMPL_FN xml_node_iterator::xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
 	{
 	}
 
-	PUGI__FN bool xml_node_iterator::operator==(const xml_node_iterator& rhs) const
+	PUGI_IMPL_FN bool xml_node_iterator::operator==(const xml_node_iterator& rhs) const
 	{
 		return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root;
 	}
 
-	PUGI__FN bool xml_node_iterator::operator!=(const xml_node_iterator& rhs) const
+	PUGI_IMPL_FN bool xml_node_iterator::operator!=(const xml_node_iterator& rhs) const
 	{
 		return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root;
 	}
 
-	PUGI__FN xml_node& xml_node_iterator::operator*() const
+	PUGI_IMPL_FN xml_node& xml_node_iterator::operator*() const
 	{
 		assert(_wrap._root);
 		return _wrap;
 	}
 
-	PUGI__FN xml_node* xml_node_iterator::operator->() const
+	PUGI_IMPL_FN xml_node* xml_node_iterator::operator->() const
 	{
 		assert(_wrap._root);
-		return const_cast<xml_node*>(&_wrap); // BCC5 workaround
+		return &_wrap;
 	}
 
-	PUGI__FN xml_node_iterator& xml_node_iterator::operator++()
+	PUGI_IMPL_FN xml_node_iterator& xml_node_iterator::operator++()
 	{
 		assert(_wrap._root);
 		_wrap._root = _wrap._root->next_sibling;
 		return *this;
 	}
 
-	PUGI__FN xml_node_iterator xml_node_iterator::operator++(int)
+	PUGI_IMPL_FN xml_node_iterator xml_node_iterator::operator++(int)
 	{
 		xml_node_iterator temp = *this;
 		++*this;
 		return temp;
 	}
 
-	PUGI__FN xml_node_iterator& xml_node_iterator::operator--()
+	PUGI_IMPL_FN xml_node_iterator& xml_node_iterator::operator--()
 	{
 		_wrap = _wrap._root ? _wrap.previous_sibling() : _parent.last_child();
 		return *this;
 	}
 
-	PUGI__FN xml_node_iterator xml_node_iterator::operator--(int)
+	PUGI_IMPL_FN xml_node_iterator xml_node_iterator::operator--(int)
 	{
 		xml_node_iterator temp = *this;
 		--*this;
 		return temp;
 	}
 
-	PUGI__FN xml_attribute_iterator::xml_attribute_iterator()
+	PUGI_IMPL_FN xml_attribute_iterator::xml_attribute_iterator()
 	{
 	}
 
-	PUGI__FN xml_attribute_iterator::xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent): _wrap(attr), _parent(parent)
+	PUGI_IMPL_FN xml_attribute_iterator::xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent): _wrap(attr), _parent(parent)
 	{
 	}
 
-	PUGI__FN xml_attribute_iterator::xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
+	PUGI_IMPL_FN xml_attribute_iterator::xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
 	{
 	}
 
-	PUGI__FN bool xml_attribute_iterator::operator==(const xml_attribute_iterator& rhs) const
+	PUGI_IMPL_FN bool xml_attribute_iterator::operator==(const xml_attribute_iterator& rhs) const
 	{
 		return _wrap._attr == rhs._wrap._attr && _parent._root == rhs._parent._root;
 	}
 
-	PUGI__FN bool xml_attribute_iterator::operator!=(const xml_attribute_iterator& rhs) const
+	PUGI_IMPL_FN bool xml_attribute_iterator::operator!=(const xml_attribute_iterator& rhs) const
 	{
 		return _wrap._attr != rhs._wrap._attr || _parent._root != rhs._parent._root;
 	}
 
-	PUGI__FN xml_attribute& xml_attribute_iterator::operator*() const
+	PUGI_IMPL_FN xml_attribute& xml_attribute_iterator::operator*() const
 	{
 		assert(_wrap._attr);
 		return _wrap;
 	}
 
-	PUGI__FN xml_attribute* xml_attribute_iterator::operator->() const
+	PUGI_IMPL_FN xml_attribute* xml_attribute_iterator::operator->() const
 	{
 		assert(_wrap._attr);
-		return const_cast<xml_attribute*>(&_wrap); // BCC5 workaround
+		return &_wrap;
 	}
 
-	PUGI__FN xml_attribute_iterator& xml_attribute_iterator::operator++()
+	PUGI_IMPL_FN xml_attribute_iterator& xml_attribute_iterator::operator++()
 	{
 		assert(_wrap._attr);
 		_wrap._attr = _wrap._attr->next_attribute;
 		return *this;
 	}
 
-	PUGI__FN xml_attribute_iterator xml_attribute_iterator::operator++(int)
+	PUGI_IMPL_FN xml_attribute_iterator xml_attribute_iterator::operator++(int)
 	{
 		xml_attribute_iterator temp = *this;
 		++*this;
 		return temp;
 	}
 
-	PUGI__FN xml_attribute_iterator& xml_attribute_iterator::operator--()
+	PUGI_IMPL_FN xml_attribute_iterator& xml_attribute_iterator::operator--()
 	{
 		_wrap = _wrap._attr ? _wrap.previous_attribute() : _parent.last_attribute();
 		return *this;
 	}
 
-	PUGI__FN xml_attribute_iterator xml_attribute_iterator::operator--(int)
+	PUGI_IMPL_FN xml_attribute_iterator xml_attribute_iterator::operator--(int)
 	{
 		xml_attribute_iterator temp = *this;
 		--*this;
 		return temp;
 	}
 
-	PUGI__FN xml_named_node_iterator::xml_named_node_iterator(): _name(0)
+	PUGI_IMPL_FN xml_named_node_iterator::xml_named_node_iterator(): _name(nullptr)
 	{
 	}
 
-	PUGI__FN xml_named_node_iterator::xml_named_node_iterator(const xml_node& node, const char_t* name): _wrap(node), _parent(node.parent()), _name(name)
+	PUGI_IMPL_FN xml_named_node_iterator::xml_named_node_iterator(const xml_node& node, const char_t* name): _wrap(node), _parent(node.parent()), _name(name)
 	{
 	}
 
-	PUGI__FN xml_named_node_iterator::xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name): _wrap(ref), _parent(parent), _name(name)
+	PUGI_IMPL_FN xml_named_node_iterator::xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name): _wrap(ref), _parent(parent), _name(name)
 	{
 	}
 
-	PUGI__FN bool xml_named_node_iterator::operator==(const xml_named_node_iterator& rhs) const
+	PUGI_IMPL_FN bool xml_named_node_iterator::operator==(const xml_named_node_iterator& rhs) const
 	{
 		return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root;
 	}
 
-	PUGI__FN bool xml_named_node_iterator::operator!=(const xml_named_node_iterator& rhs) const
+	PUGI_IMPL_FN bool xml_named_node_iterator::operator!=(const xml_named_node_iterator& rhs) const
 	{
 		return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root;
 	}
 
-	PUGI__FN xml_node& xml_named_node_iterator::operator*() const
+	PUGI_IMPL_FN xml_node& xml_named_node_iterator::operator*() const
 	{
 		assert(_wrap._root);
 		return _wrap;
 	}
 
-	PUGI__FN xml_node* xml_named_node_iterator::operator->() const
+	PUGI_IMPL_FN xml_node* xml_named_node_iterator::operator->() const
 	{
 		assert(_wrap._root);
-		return const_cast<xml_node*>(&_wrap); // BCC5 workaround
+		return &_wrap;
 	}
 
-	PUGI__FN xml_named_node_iterator& xml_named_node_iterator::operator++()
+	PUGI_IMPL_FN xml_named_node_iterator& xml_named_node_iterator::operator++()
 	{
 		assert(_wrap._root);
 		_wrap = _wrap.next_sibling(_name);
 		return *this;
 	}
 
-	PUGI__FN xml_named_node_iterator xml_named_node_iterator::operator++(int)
+	PUGI_IMPL_FN xml_named_node_iterator xml_named_node_iterator::operator++(int)
 	{
 		xml_named_node_iterator temp = *this;
 		++*this;
 		return temp;
 	}
 
-	PUGI__FN xml_named_node_iterator& xml_named_node_iterator::operator--()
+	PUGI_IMPL_FN xml_named_node_iterator& xml_named_node_iterator::operator--()
 	{
 		if (_wrap._root)
 			_wrap = _wrap.previous_sibling(_name);
@@ -7018,23 +7408,23 @@ namespace pugi
 		return *this;
 	}
 
-	PUGI__FN xml_named_node_iterator xml_named_node_iterator::operator--(int)
+	PUGI_IMPL_FN xml_named_node_iterator xml_named_node_iterator::operator--(int)
 	{
 		xml_named_node_iterator temp = *this;
 		--*this;
 		return temp;
 	}
 
-	PUGI__FN xml_parse_result::xml_parse_result(): status(status_internal_error), offset(0), encoding(encoding_auto)
+	PUGI_IMPL_FN xml_parse_result::xml_parse_result(): status(status_internal_error), offset(0), encoding(encoding_auto)
 	{
 	}
 
-	PUGI__FN xml_parse_result::operator bool() const
+	PUGI_IMPL_FN xml_parse_result::operator bool() const
 	{
 		return status == status_ok;
 	}
 
-	PUGI__FN const char* xml_parse_result::description() const
+	PUGI_IMPL_FN const char* xml_parse_result::description() const
 	{
 		switch (status)
 		{
@@ -7065,24 +7455,24 @@ namespace pugi
 		}
 	}
 
-	PUGI__FN xml_document::xml_document(): _buffer(0)
+	PUGI_IMPL_FN xml_document::xml_document(): _buffer(nullptr)
 	{
 		_create();
 	}
 
-	PUGI__FN xml_document::~xml_document()
+	PUGI_IMPL_FN xml_document::~xml_document()
 	{
 		_destroy();
 	}
 
 #ifdef PUGIXML_HAS_MOVE
-	PUGI__FN xml_document::xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT: _buffer(0)
+	PUGI_IMPL_FN xml_document::xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT: _buffer(nullptr)
 	{
 		_create();
 		_move(rhs);
 	}
 
-	PUGI__FN xml_document& xml_document::operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
+	PUGI_IMPL_FN xml_document& xml_document::operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
 	{
 		if (this == &rhs) return *this;
 
@@ -7094,20 +7484,20 @@ namespace pugi
 	}
 #endif
 
-	PUGI__FN void xml_document::reset()
+	PUGI_IMPL_FN void xml_document::reset()
 	{
 		_destroy();
 		_create();
 	}
 
-	PUGI__FN void xml_document::reset(const xml_document& proto)
+	PUGI_IMPL_FN void xml_document::reset(const xml_document& proto)
 	{
 		reset();
 
 		impl::node_copy_tree(_root, proto._root);
 	}
 
-	PUGI__FN void xml_document::_create()
+	PUGI_IMPL_FN void xml_document::_create()
 	{
 		assert(!_root);
 
@@ -7119,7 +7509,7 @@ namespace pugi
 	#endif
 
 		// initialize sentinel page
-		PUGI__STATIC_ASSERT(sizeof(impl::xml_memory_page) + sizeof(impl::xml_document_struct) + page_offset <= sizeof(_memory));
+		PUGI_IMPL_STATIC_ASSERT(sizeof(impl::xml_memory_page) + sizeof(impl::xml_document_struct) + page_offset <= sizeof(_memory));
 
 		// prepare page structure
 		impl::xml_memory_page* page = impl::xml_memory_page::construct(_memory);
@@ -7150,7 +7540,7 @@ namespace pugi
 		assert(reinterpret_cast<char*>(_root) + sizeof(impl::xml_document_struct) <= _memory + sizeof(_memory));
 	}
 
-	PUGI__FN void xml_document::_destroy()
+	PUGI_IMPL_FN void xml_document::_destroy()
 	{
 		assert(_root);
 
@@ -7158,7 +7548,7 @@ namespace pugi
 		if (_buffer)
 		{
 			impl::xml_memory::deallocate(_buffer);
-			_buffer = 0;
+			_buffer = nullptr;
 		}
 
 		// destroy extra buffers (note: no need to destroy linked list nodes, they're allocated using document allocator)
@@ -7168,7 +7558,7 @@ namespace pugi
 		}
 
 		// destroy dynamic storage, leave sentinel page (it's in static memory)
-		impl::xml_memory_page* root_page = PUGI__GETPAGE(_root);
+		impl::xml_memory_page* root_page = PUGI_IMPL_GETPAGE(_root);
 		assert(root_page && !root_page->prev);
 		assert(reinterpret_cast<char*>(root_page) >= _memory && reinterpret_cast<char*>(root_page) < _memory + sizeof(_memory));
 
@@ -7186,11 +7576,11 @@ namespace pugi
 		static_cast<impl::xml_document_struct*>(_root)->hash.clear();
 	#endif
 
-		_root = 0;
+		_root = nullptr;
 	}
 
 #ifdef PUGIXML_HAS_MOVE
-	PUGI__FN void xml_document::_move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
+	PUGI_IMPL_FN void xml_document::_move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
 	{
 		impl::xml_document_struct* doc = static_cast<impl::xml_document_struct*>(_root);
 		impl::xml_document_struct* other = static_cast<impl::xml_document_struct*>(rhs._root);
@@ -7224,7 +7614,7 @@ namespace pugi
 
 		// move allocation state
 		// note that other->_root may point to the embedded document page, in which case we should keep original (empty) state
-		if (other->_root != PUGI__GETPAGE(other))
+		if (other->_root != PUGI_IMPL_GETPAGE(other))
 		{
 			doc->_root = other->_root;
 			doc->_busy_size = other->_busy_size;
@@ -7241,14 +7631,14 @@ namespace pugi
 		doc->_hash = &doc->hash;
 
 		// make sure we don't access other hash up until the end when we reinitialize other document
-		other->_hash = 0;
+		other->_hash = nullptr;
 	#endif
 
 		// move page structure
-		impl::xml_memory_page* doc_page = PUGI__GETPAGE(doc);
+		impl::xml_memory_page* doc_page = PUGI_IMPL_GETPAGE(doc);
 		assert(doc_page && !doc_page->prev && !doc_page->next);
 
-		impl::xml_memory_page* other_page = PUGI__GETPAGE(other);
+		impl::xml_memory_page* other_page = PUGI_IMPL_GETPAGE(other);
 		assert(other_page && !other_page->prev);
 
 		// relink pages since root page is embedded into xml_document
@@ -7259,7 +7649,7 @@ namespace pugi
 			page->prev = doc_page;
 
 			doc_page->next = page;
-			other_page->next = 0;
+			other_page->next = nullptr;
 		}
 
 		// make sure pages point to the correct document state
@@ -7295,20 +7685,20 @@ namespace pugi
 		}
 
 		// reset other document
-		new (other) impl::xml_document_struct(PUGI__GETPAGE(other));
-		rhs._buffer = 0;
+		new (other) impl::xml_document_struct(PUGI_IMPL_GETPAGE(other));
+		rhs._buffer = nullptr;
 	}
 #endif
 
 #ifndef PUGIXML_NO_STL
-	PUGI__FN xml_parse_result xml_document::load(std::basic_istream<char, std::char_traits<char> >& stream, unsigned int options, xml_encoding encoding)
+	PUGI_IMPL_FN xml_parse_result xml_document::load(std::basic_istream<char>& stream, unsigned int options, xml_encoding encoding)
 	{
 		reset();
 
 		return impl::load_stream_impl(static_cast<impl::xml_document_struct*>(_root), stream, options, encoding, &_buffer);
 	}
 
-	PUGI__FN xml_parse_result xml_document::load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options)
+	PUGI_IMPL_FN xml_parse_result xml_document::load(std::basic_istream<wchar_t>& stream, unsigned int options)
 	{
 		reset();
 
@@ -7316,7 +7706,7 @@ namespace pugi
 	}
 #endif
 
-	PUGI__FN xml_parse_result xml_document::load_string(const char_t* contents, unsigned int options)
+	PUGI_IMPL_FN xml_parse_result xml_document::load_string(const char_t* contents, unsigned int options)
 	{
 		// Force native encoding (skip autodetection)
 	#ifdef PUGIXML_WCHAR_MODE
@@ -7328,12 +7718,12 @@ namespace pugi
 		return load_buffer(contents, impl::strlength(contents) * sizeof(char_t), options, encoding);
 	}
 
-	PUGI__FN xml_parse_result xml_document::load(const char_t* contents, unsigned int options)
+	PUGI_IMPL_FN xml_parse_result xml_document::load(const char_t* contents, unsigned int options)
 	{
 		return load_string(contents, options);
 	}
 
-	PUGI__FN xml_parse_result xml_document::load_file(const char* path_, unsigned int options, xml_encoding encoding)
+	PUGI_IMPL_FN xml_parse_result xml_document::load_file(const char* path_, unsigned int options, xml_encoding encoding)
 	{
 		reset();
 
@@ -7343,7 +7733,7 @@ namespace pugi
 		return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
 	}
 
-	PUGI__FN xml_parse_result xml_document::load_file(const wchar_t* path_, unsigned int options, xml_encoding encoding)
+	PUGI_IMPL_FN xml_parse_result xml_document::load_file(const wchar_t* path_, unsigned int options, xml_encoding encoding)
 	{
 		reset();
 
@@ -7353,32 +7743,32 @@ namespace pugi
 		return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
 	}
 
-	PUGI__FN xml_parse_result xml_document::load_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	PUGI_IMPL_FN xml_parse_result xml_document::load_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
 	{
 		reset();
 
 		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, const_cast<void*>(contents), size, options, encoding, false, false, &_buffer);
 	}
 
-	PUGI__FN xml_parse_result xml_document::load_buffer_inplace(void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	PUGI_IMPL_FN xml_parse_result xml_document::load_buffer_inplace(void* contents, size_t size, unsigned int options, xml_encoding encoding)
 	{
 		reset();
 
 		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, false, &_buffer);
 	}
 
-	PUGI__FN xml_parse_result xml_document::load_buffer_inplace_own(void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	PUGI_IMPL_FN xml_parse_result xml_document::load_buffer_inplace_own(void* contents, size_t size, unsigned int options, xml_encoding encoding)
 	{
 		reset();
 
 		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, true, &_buffer);
 	}
 
-	PUGI__FN void xml_document::save(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	PUGI_IMPL_FN void xml_document::save(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding) const
 	{
 		impl::xml_buffered_writer buffered_writer(writer, encoding);
 
-		if ((flags & format_write_bom) && encoding != encoding_latin1)
+		if ((flags & format_write_bom) && buffered_writer.encoding != encoding_latin1)
 		{
 			// BOM always represents the codepoint U+FEFF, so just write it in native encoding
 		#ifdef PUGIXML_WCHAR_MODE
@@ -7392,7 +7782,7 @@ namespace pugi
 		if (!(flags & format_no_declaration) && !impl::has_declaration(_root))
 		{
 			buffered_writer.write_string(PUGIXML_TEXT("<?xml version=\"1.0\""));
-			if (encoding == encoding_latin1) buffered_writer.write_string(PUGIXML_TEXT(" encoding=\"ISO-8859-1\""));
+			if (buffered_writer.encoding == encoding_latin1) buffered_writer.write_string(PUGIXML_TEXT(" encoding=\"ISO-8859-1\""));
 			buffered_writer.write('?', '>');
 			if (!(flags & format_raw)) buffered_writer.write('\n');
 		}
@@ -7403,14 +7793,14 @@ namespace pugi
 	}
 
 #ifndef PUGIXML_NO_STL
-	PUGI__FN void xml_document::save(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	PUGI_IMPL_FN void xml_document::save(std::basic_ostream<char>& stream, const char_t* indent, unsigned int flags, xml_encoding encoding) const
 	{
 		xml_writer_stream writer(stream);
 
 		save(writer, indent, flags, encoding);
 	}
 
-	PUGI__FN void xml_document::save(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent, unsigned int flags) const
+	PUGI_IMPL_FN void xml_document::save(std::basic_ostream<wchar_t>& stream, const char_t* indent, unsigned int flags) const
 	{
 		xml_writer_stream writer(stream);
 
@@ -7418,7 +7808,7 @@ namespace pugi
 	}
 #endif
 
-	PUGI__FN bool xml_document::save_file(const char* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	PUGI_IMPL_FN bool xml_document::save_file(const char* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
 	{
 		using impl::auto_deleter; // MSVC7 workaround
 		auto_deleter<FILE> file(impl::open_file(path_, (flags & format_save_file_text) ? "w" : "wb"), impl::close_file);
@@ -7426,7 +7816,7 @@ namespace pugi
 		return impl::save_file_impl(*this, file.data, indent, flags, encoding) && fclose(file.release()) == 0;
 	}
 
-	PUGI__FN bool xml_document::save_file(const wchar_t* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	PUGI_IMPL_FN bool xml_document::save_file(const wchar_t* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
 	{
 		using impl::auto_deleter; // MSVC7 workaround
 		auto_deleter<FILE> file(impl::open_file_wide(path_, (flags & format_save_file_text) ? L"w" : L"wb"), impl::close_file);
@@ -7434,55 +7824,55 @@ namespace pugi
 		return impl::save_file_impl(*this, file.data, indent, flags, encoding) && fclose(file.release()) == 0;
 	}
 
-	PUGI__FN xml_node xml_document::document_element() const
+	PUGI_IMPL_FN xml_node xml_document::document_element() const
 	{
 		assert(_root);
 
 		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
-			if (PUGI__NODETYPE(i) == node_element)
+			if (PUGI_IMPL_NODETYPE(i) == node_element)
 				return xml_node(i);
 
 		return xml_node();
 	}
 
 #ifndef PUGIXML_NO_STL
-	PUGI__FN std::string PUGIXML_FUNCTION as_utf8(const wchar_t* str)
+	PUGI_IMPL_FN std::string PUGIXML_FUNCTION as_utf8(const wchar_t* str)
 	{
 		assert(str);
 
 		return impl::as_utf8_impl(str, impl::strlength_wide(str));
 	}
 
-	PUGI__FN std::string PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t>& str)
+	PUGI_IMPL_FN std::string PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t>& str)
 	{
 		return impl::as_utf8_impl(str.c_str(), str.size());
 	}
 
-	PUGI__FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const char* str)
+	PUGI_IMPL_FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const char* str)
 	{
 		assert(str);
 
 		return impl::as_wide_impl(str, strlen(str));
 	}
 
-	PUGI__FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const std::string& str)
+	PUGI_IMPL_FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const std::string& str)
 	{
 		return impl::as_wide_impl(str.c_str(), str.size());
 	}
 #endif
 
-	PUGI__FN void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate)
+	PUGI_IMPL_FN void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate)
 	{
 		impl::xml_memory::allocate = allocate;
 		impl::xml_memory::deallocate = deallocate;
 	}
 
-	PUGI__FN allocation_function PUGIXML_FUNCTION get_memory_allocation_function()
+	PUGI_IMPL_FN allocation_function PUGIXML_FUNCTION get_memory_allocation_function()
 	{
 		return impl::xml_memory::allocate;
 	}
 
-	PUGI__FN deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function()
+	PUGI_IMPL_FN deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function()
 	{
 		return impl::xml_memory::deallocate;
 	}
@@ -7492,17 +7882,17 @@ namespace pugi
 namespace std
 {
 	// Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier)
-	PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_node_iterator&)
+	PUGI_IMPL_FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_node_iterator&)
 	{
 		return std::bidirectional_iterator_tag();
 	}
 
-	PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_attribute_iterator&)
+	PUGI_IMPL_FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_attribute_iterator&)
 	{
 		return std::bidirectional_iterator_tag();
 	}
 
-	PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_named_node_iterator&)
+	PUGI_IMPL_FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_named_node_iterator&)
 	{
 		return std::bidirectional_iterator_tag();
 	}
@@ -7513,17 +7903,17 @@ namespace std
 namespace std
 {
 	// Workarounds for (non-standard) iterator category detection
-	PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_node_iterator&)
+	PUGI_IMPL_FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_node_iterator&)
 	{
 		return std::bidirectional_iterator_tag();
 	}
 
-	PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_attribute_iterator&)
+	PUGI_IMPL_FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_attribute_iterator&)
 	{
 		return std::bidirectional_iterator_tag();
 	}
 
-	PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_named_node_iterator&)
+	PUGI_IMPL_FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_named_node_iterator&)
 	{
 		return std::bidirectional_iterator_tag();
 	}
@@ -7532,7 +7922,7 @@ namespace std
 
 #ifndef PUGIXML_NO_XPATH
 // STL replacements
-PUGI__NS_BEGIN
+PUGI_IMPL_NS_BEGIN
 	struct equal_to
 	{
 		template <typename T> bool operator()(const T& lhs, const T& rhs) const
@@ -7572,7 +7962,7 @@ PUGI__NS_BEGIN
 		rhs = temp;
 	}
 
-	template <typename I, typename Pred> PUGI__FN I min_element(I begin, I end, const Pred& pred)
+	template <typename I, typename Pred> PUGI_IMPL_FN I min_element(I begin, I end, const Pred& pred)
 	{
 		I result = begin;
 
@@ -7583,13 +7973,13 @@ PUGI__NS_BEGIN
 		return result;
 	}
 
-	template <typename I> PUGI__FN void reverse(I begin, I end)
+	template <typename I> PUGI_IMPL_FN void reverse(I begin, I end)
 	{
 		while (end - begin > 1)
 			swap(*begin++, *--end);
 	}
 
-	template <typename I> PUGI__FN I unique(I begin, I end)
+	template <typename I> PUGI_IMPL_FN I unique(I begin, I end)
 	{
 		// fast skip head
 		while (end - begin > 1 && *begin != *(begin + 1))
@@ -7614,7 +8004,7 @@ PUGI__NS_BEGIN
 		return write + 1;
 	}
 
-	template <typename T, typename Pred> PUGI__FN void insertion_sort(T* begin, T* end, const Pred& pred)
+	template <typename T, typename Pred> PUGI_IMPL_FN void insertion_sort(T* begin, T* end, const Pred& pred)
 	{
 		if (begin == end)
 			return;
@@ -7648,7 +8038,7 @@ PUGI__NS_BEGIN
 		return middle;
 	}
 
-	template <typename T, typename Pred> PUGI__FN void partition3(T* begin, T* end, T pivot, const Pred& pred, T** out_eqbeg, T** out_eqend)
+	template <typename T, typename Pred> PUGI_IMPL_FN void partition3(T* begin, T* end, T pivot, const Pred& pred, T** out_eqbeg, T** out_eqend)
 	{
 		// invariant: array is split into 4 groups: = < ? > (each variable denotes the boundary between the groups)
 		T* eq = begin;
@@ -7675,7 +8065,7 @@ PUGI__NS_BEGIN
 		*out_eqend = gt;
 	}
 
-	template <typename I, typename Pred> PUGI__FN void sort(I begin, I end, const Pred& pred)
+	template <typename I, typename Pred> PUGI_IMPL_FN void sort(I begin, I end, const Pred& pred)
 	{
 		// sort large chunks
 		while (end - begin > 16)
@@ -7705,7 +8095,7 @@ PUGI__NS_BEGIN
 		insertion_sort(begin, end, pred);
 	}
 
-	PUGI__FN bool hash_insert(const void** table, size_t size, const void* key)
+	PUGI_IMPL_FN bool hash_insert(const void** table, size_t size, const void* key)
 	{
 		assert(key);
 
@@ -7723,7 +8113,7 @@ PUGI__NS_BEGIN
 
 		for (size_t probe = 0; probe <= hashmod; ++probe)
 		{
-			if (table[bucket] == 0)
+			if (table[bucket] == nullptr)
 			{
 				table[bucket] = key;
 				return true;
@@ -7739,10 +8129,10 @@ PUGI__NS_BEGIN
 		assert(false && "Hash table is full"); // unreachable
 		return false;
 	}
-PUGI__NS_END
+PUGI_IMPL_NS_END
 
 // Allocator used for AST and evaluation stacks
-PUGI__NS_BEGIN
+PUGI_IMPL_NS_BEGIN
 	static const size_t xpath_memory_page_size =
 	#ifdef PUGIXML_MEMORY_XPATH_PAGE_SIZE
 		PUGIXML_MEMORY_XPATH_PAGE_SIZE
@@ -7771,7 +8161,7 @@ PUGI__NS_BEGIN
 		size_t _root_size;
 		bool* _error;
 
-		xpath_allocator(xpath_memory_block* root, bool* error = 0): _root(root), _root_size(0), _error(error)
+		xpath_allocator(xpath_memory_block* root, bool* error = nullptr): _root(root), _root_size(0), _error(error)
 		{
 		}
 
@@ -7799,7 +8189,7 @@ PUGI__NS_BEGIN
 				if (!block)
 				{
 					if (_error) *_error = true;
-					return 0;
+					return nullptr;
 				}
 
 				block->next = _root;
@@ -7819,7 +8209,7 @@ PUGI__NS_BEGIN
 			new_size = (new_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
 
 			// we can only reallocate the last object
-			assert(ptr == 0 || static_cast<char*>(ptr) + old_size == &_root->data[0] + _root_size);
+			assert(ptr == nullptr || static_cast<char*>(ptr) + old_size == &_root->data[0] + _root_size);
 
 			// try to reallocate the object inplace
 			if (ptr && _root_size - old_size + new_size <= _root->capacity)
@@ -7830,7 +8220,7 @@ PUGI__NS_BEGIN
 
 			// allocate a new block
 			void* result = allocate(new_size);
-			if (!result) return 0;
+			if (!result) return nullptr;
 
 			// we have a new block
 			if (ptr)
@@ -7925,7 +8315,7 @@ PUGI__NS_BEGIN
 
 		xpath_stack_data(): result(blocks + 0, &oom), temp(blocks + 1, &oom), oom(false)
 		{
-			blocks[0].next = blocks[1].next = 0;
+			blocks[0].next = blocks[1].next = nullptr;
 			blocks[0].capacity = blocks[1].capacity = sizeof(blocks[0].data);
 
 			stack.result = &result;
@@ -7938,10 +8328,10 @@ PUGI__NS_BEGIN
 			temp.release();
 		}
 	};
-PUGI__NS_END
+PUGI_IMPL_NS_END
 
 // String class
-PUGI__NS_BEGIN
+PUGI_IMPL_NS_BEGIN
 	class xpath_string
 	{
 		const char_t* _buffer;
@@ -7951,7 +8341,7 @@ PUGI__NS_BEGIN
 		static char_t* duplicate_string(const char_t* string, size_t length, xpath_allocator* alloc)
 		{
 			char_t* result = static_cast<char_t*>(alloc->allocate((length + 1) * sizeof(char_t)));
-			if (!result) return 0;
+			if (!result) return nullptr;
 
 			memcpy(result, string, length * sizeof(char_t));
 			result[length] = 0;
@@ -8011,7 +8401,7 @@ PUGI__NS_BEGIN
 				size_t result_length = target_length + source_length;
 
 				// allocate new buffer
-				char_t* result = static_cast<char_t*>(alloc->reallocate(_uses_heap ? const_cast<char_t*>(_buffer) : 0, (target_length + 1) * sizeof(char_t), (result_length + 1) * sizeof(char_t)));
+				char_t* result = static_cast<char_t*>(alloc->reallocate(_uses_heap ? const_cast<char_t*>(_buffer) : nullptr, (target_length + 1) * sizeof(char_t), (result_length + 1) * sizeof(char_t)));
 				if (!result) return;
 
 				// append first string to the new buffer in case there was no reallocation
@@ -8046,7 +8436,7 @@ PUGI__NS_BEGIN
 				size_t length_ = strlength(_buffer);
 				const char_t* data_ = duplicate_string(_buffer, length_, alloc);
 
-				if (!data_) return 0;
+				if (!data_) return nullptr;
 
 				_buffer = data_;
 				_uses_heap = true;
@@ -8076,10 +8466,10 @@ PUGI__NS_BEGIN
 			return _uses_heap;
 		}
 	};
-PUGI__NS_END
+PUGI_IMPL_NS_END
 
-PUGI__NS_BEGIN
-	PUGI__FN bool starts_with(const char_t* string, const char_t* pattern)
+PUGI_IMPL_NS_BEGIN
+	PUGI_IMPL_FN bool starts_with(const char_t* string, const char_t* pattern)
 	{
 		while (*pattern && *string == *pattern)
 		{
@@ -8090,7 +8480,7 @@ PUGI__NS_BEGIN
 		return *pattern == 0;
 	}
 
-	PUGI__FN const char_t* find_char(const char_t* s, char_t c)
+	PUGI_IMPL_FN const char_t* find_char(const char_t* s, char_t c)
 	{
 	#ifdef PUGIXML_WCHAR_MODE
 		return wcschr(s, c);
@@ -8099,7 +8489,7 @@ PUGI__NS_BEGIN
 	#endif
 	}
 
-	PUGI__FN const char_t* find_substring(const char_t* s, const char_t* p)
+	PUGI_IMPL_FN const char_t* find_substring(const char_t* s, const char_t* p)
 	{
 	#ifdef PUGIXML_WCHAR_MODE
 		// MSVC6 wcsstr bug workaround (if s is empty it always returns 0)
@@ -8110,12 +8500,12 @@ PUGI__NS_BEGIN
 	}
 
 	// Converts symbol to lower case, if it is an ASCII one
-	PUGI__FN char_t tolower_ascii(char_t ch)
+	PUGI_IMPL_FN char_t tolower_ascii(char_t ch)
 	{
 		return static_cast<unsigned int>(ch - 'A') < 26 ? static_cast<char_t>(ch | ' ') : ch;
 	}
 
-	PUGI__FN xpath_string string_value(const xpath_node& na, xpath_allocator* alloc)
+	PUGI_IMPL_FN xpath_string string_value(const xpath_node& na, xpath_allocator* alloc)
 	{
 		if (na.attribute())
 			return xpath_string::from_const(na.attribute().value());
@@ -8169,7 +8559,7 @@ PUGI__NS_BEGIN
 		}
 	}
 
-	PUGI__FN bool node_is_before_sibling(xml_node_struct* ln, xml_node_struct* rn)
+	PUGI_IMPL_FN bool node_is_before_sibling(xml_node_struct* ln, xml_node_struct* rn)
 	{
 		assert(ln->parent == rn->parent);
 
@@ -8193,7 +8583,7 @@ PUGI__NS_BEGIN
 		return !rs;
 	}
 
-	PUGI__FN bool node_is_before(xml_node_struct* ln, xml_node_struct* rn)
+	PUGI_IMPL_FN bool node_is_before(xml_node_struct* ln, xml_node_struct* rn)
 	{
 		// find common ancestor at the same depth, if any
 		xml_node_struct* lp = ln;
@@ -8236,14 +8626,14 @@ PUGI__NS_BEGIN
 		return node_is_before_sibling(ln, rn);
 	}
 
-	PUGI__FN bool node_is_ancestor(xml_node_struct* parent, xml_node_struct* node)
+	PUGI_IMPL_FN bool node_is_ancestor(xml_node_struct* parent, xml_node_struct* node)
 	{
 		while (node && node != parent) node = node->parent;
 
 		return parent && node == parent;
 	}
 
-	PUGI__FN const void* document_buffer_order(const xpath_node& xnode)
+	PUGI_IMPL_FN const void* document_buffer_order(const xpath_node& xnode)
 	{
 		xml_node_struct* node = xnode.node().internal_object();
 
@@ -8255,7 +8645,7 @@ PUGI__NS_BEGIN
 				if (node->value && (node->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return node->value;
 			}
 
-			return 0;
+			return nullptr;
 		}
 
 		xml_attribute_struct* attr = xnode.attribute().internal_object();
@@ -8268,10 +8658,10 @@ PUGI__NS_BEGIN
 				if ((attr->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return attr->value;
 			}
 
-			return 0;
+			return nullptr;
 		}
 
-		return 0;
+		return nullptr;
 	}
 
 	struct document_order_comparator
@@ -8328,10 +8718,10 @@ PUGI__NS_BEGIN
 		}
 	};
 
-	PUGI__FN double gen_nan()
+	PUGI_IMPL_FN double gen_nan()
 	{
 	#if defined(__STDC_IEC_559__) || ((FLT_RADIX - 0 == 2) && (FLT_MAX_EXP - 0 == 128) && (FLT_MANT_DIG - 0 == 24))
-		PUGI__STATIC_ASSERT(sizeof(float) == sizeof(uint32_t));
+		PUGI_IMPL_STATIC_ASSERT(sizeof(float) == sizeof(uint32_t));
 		typedef uint32_t UI; // BCC5 workaround
 		union { float f; UI i; } u;
 		u.i = 0x7fc00000;
@@ -8343,9 +8733,9 @@ PUGI__NS_BEGIN
 	#endif
 	}
 
-	PUGI__FN bool is_nan(double value)
+	PUGI_IMPL_FN bool is_nan(double value)
 	{
-	#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__)
+	#if defined(PUGI_IMPL_MSVC_CRT_VERSION) || defined(__BORLANDC__)
 		return !!_isnan(value);
 	#elif defined(fpclassify) && defined(FP_NAN)
 		return fpclassify(value) == FP_NAN;
@@ -8356,9 +8746,9 @@ PUGI__NS_BEGIN
 	#endif
 	}
 
-	PUGI__FN const char_t* convert_number_to_string_special(double value)
+	PUGI_IMPL_FN const char_t* convert_number_to_string_special(double value)
 	{
-	#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__)
+	#if defined(PUGI_IMPL_MSVC_CRT_VERSION) || defined(__BORLANDC__)
 		if (_finite(value)) return (value == 0) ? PUGIXML_TEXT("0") : 0;
 		if (_isnan(value)) return PUGIXML_TEXT("NaN");
 		return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
@@ -8384,16 +8774,16 @@ PUGI__NS_BEGIN
 		if (v == 0) return PUGIXML_TEXT("0");
 		if (v != v) return PUGIXML_TEXT("NaN");
 		if (v * 2 == v) return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
-		return 0;
+		return nullptr;
 	#endif
 	}
 
-	PUGI__FN bool convert_number_to_boolean(double value)
+	PUGI_IMPL_FN bool convert_number_to_boolean(double value)
 	{
 		return (value != 0 && !is_nan(value));
 	}
 
-	PUGI__FN void truncate_zeros(char* begin, char* end)
+	PUGI_IMPL_FN void truncate_zeros(char* begin, char* end)
 	{
 		while (begin != end && end[-1] == '0') end--;
 
@@ -8401,8 +8791,8 @@ PUGI__NS_BEGIN
 	}
 
 	// gets mantissa digits in the form of 0.xxxxx with 0. implied and the exponent
-#if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400
-	PUGI__FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
+#if defined(PUGI_IMPL_MSVC_CRT_VERSION) && PUGI_IMPL_MSVC_CRT_VERSION >= 1400
+	PUGI_IMPL_FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
 	{
 		// get base values
 		int sign, exponent;
@@ -8416,10 +8806,10 @@ PUGI__NS_BEGIN
 		*out_exponent = exponent;
 	}
 #else
-	PUGI__FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
+	PUGI_IMPL_FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
 	{
 		// get a scientific notation value with IEEE DBL_DIG decimals
-		PUGI__SNPRINTF(buffer, "%.*e", DBL_DIG, value);
+		PUGI_IMPL_SNPRINTF(buffer, "%.*e", DBL_DIG, value);
 
 		// get the exponent (possibly negative)
 		char* exponent_string = strchr(buffer, 'e');
@@ -8429,7 +8819,7 @@ PUGI__NS_BEGIN
 
 		// extract mantissa string: skip sign
 		char* mantissa = buffer[0] == '-' ? buffer + 1 : buffer;
-		assert(mantissa[0] != '0' && mantissa[1] == '.');
+		assert(mantissa[0] != '0' && (mantissa[1] == '.' || mantissa[1] == ','));
 
 		// divide mantissa by 10 to eliminate integer part
 		mantissa[1] = mantissa[0];
@@ -8445,7 +8835,7 @@ PUGI__NS_BEGIN
 	}
 #endif
 
-	PUGI__FN xpath_string convert_number_to_string(double value, xpath_allocator* alloc)
+	PUGI_IMPL_FN xpath_string convert_number_to_string(double value, xpath_allocator* alloc)
 	{
 		// try special number conversion
 		const char_t* special = convert_number_to_string_special(value);
@@ -8512,10 +8902,10 @@ PUGI__NS_BEGIN
 		return xpath_string::from_heap_preallocated(result, s);
 	}
 
-	PUGI__FN bool check_string_to_number_format(const char_t* string)
+	PUGI_IMPL_FN bool check_string_to_number_format(const char_t* string)
 	{
 		// parse leading whitespace
-		while (PUGI__IS_CHARTYPE(*string, ct_space)) ++string;
+		while (PUGI_IMPL_IS_CHARTYPE(*string, ct_space)) ++string;
 
 		// parse sign
 		if (*string == '-') ++string;
@@ -8523,39 +8913,39 @@ PUGI__NS_BEGIN
 		if (!*string) return false;
 
 		// if there is no integer part, there should be a decimal part with at least one digit
-		if (!PUGI__IS_CHARTYPEX(string[0], ctx_digit) && (string[0] != '.' || !PUGI__IS_CHARTYPEX(string[1], ctx_digit))) return false;
+		if (!PUGI_IMPL_IS_CHARTYPEX(string[0], ctx_digit) && (string[0] != '.' || !PUGI_IMPL_IS_CHARTYPEX(string[1], ctx_digit))) return false;
 
 		// parse integer part
-		while (PUGI__IS_CHARTYPEX(*string, ctx_digit)) ++string;
+		while (PUGI_IMPL_IS_CHARTYPEX(*string, ctx_digit)) ++string;
 
 		// parse decimal part
 		if (*string == '.')
 		{
 			++string;
 
-			while (PUGI__IS_CHARTYPEX(*string, ctx_digit)) ++string;
+			while (PUGI_IMPL_IS_CHARTYPEX(*string, ctx_digit)) ++string;
 		}
 
 		// parse trailing whitespace
-		while (PUGI__IS_CHARTYPE(*string, ct_space)) ++string;
+		while (PUGI_IMPL_IS_CHARTYPE(*string, ct_space)) ++string;
 
 		return *string == 0;
 	}
 
-	PUGI__FN double convert_string_to_number(const char_t* string)
+	PUGI_IMPL_FN double convert_string_to_number(const char_t* string)
 	{
 		// check string format
 		if (!check_string_to_number_format(string)) return gen_nan();
 
 		// parse string
 	#ifdef PUGIXML_WCHAR_MODE
-		return wcstod(string, 0);
+		return wcstod(string, nullptr);
 	#else
-		return strtod(string, 0);
+		return strtod(string, nullptr);
 	#endif
 	}
 
-	PUGI__FN bool convert_string_to_number_scratch(char_t (&buffer)[32], const char_t* begin, const char_t* end, double* out_result)
+	PUGI_IMPL_FN bool convert_string_to_number_scratch(char_t (&buffer)[32], const char_t* begin, const char_t* end, double* out_result)
 	{
 		size_t length = static_cast<size_t>(end - begin);
 		char_t* scratch = buffer;
@@ -8579,24 +8969,24 @@ PUGI__NS_BEGIN
 		return true;
 	}
 
-	PUGI__FN double round_nearest(double value)
+	PUGI_IMPL_FN double round_nearest(double value)
 	{
 		return floor(value + 0.5);
 	}
 
-	PUGI__FN double round_nearest_nzero(double value)
+	PUGI_IMPL_FN double round_nearest_nzero(double value)
 	{
 		// same as round_nearest, but returns -0 for [-0.5, -0]
 		// ceil is used to differentiate between +0 and -0 (we return -0 for [-0.5, -0] and +0 for +0)
 		return (value >= -0.5 && value <= 0) ? ceil(value) : floor(value + 0.5);
 	}
 
-	PUGI__FN const char_t* qualified_name(const xpath_node& node)
+	PUGI_IMPL_FN const char_t* qualified_name(const xpath_node& node)
 	{
 		return node.attribute() ? node.attribute().name() : node.node().name();
 	}
 
-	PUGI__FN const char_t* local_name(const xpath_node& node)
+	PUGI_IMPL_FN const char_t* local_name(const xpath_node& node)
 	{
 		const char_t* name = qualified_name(node);
 		const char_t* p = find_char(name, ':');
@@ -8613,7 +9003,7 @@ PUGI__NS_BEGIN
 		{
 			const char_t* pos = find_char(name, ':');
 
-			prefix = pos ? name : 0;
+			prefix = pos ? name : nullptr;
 			prefix_length = pos ? static_cast<size_t>(pos - name) : 0;
 		}
 
@@ -8627,7 +9017,7 @@ PUGI__NS_BEGIN
 		}
 	};
 
-	PUGI__FN const char_t* namespace_uri(xml_node node)
+	PUGI_IMPL_FN const char_t* namespace_uri(xml_node node)
 	{
 		namespace_uri_predicate pred = node.name();
 
@@ -8645,7 +9035,7 @@ PUGI__NS_BEGIN
 		return PUGIXML_TEXT("");
 	}
 
-	PUGI__FN const char_t* namespace_uri(xml_attribute attr, xml_node parent)
+	PUGI_IMPL_FN const char_t* namespace_uri(xml_attribute attr, xml_node parent)
 	{
 		namespace_uri_predicate pred = attr.name();
 
@@ -8666,12 +9056,12 @@ PUGI__NS_BEGIN
 		return PUGIXML_TEXT("");
 	}
 
-	PUGI__FN const char_t* namespace_uri(const xpath_node& node)
+	PUGI_IMPL_FN const char_t* namespace_uri(const xpath_node& node)
 	{
 		return node.attribute() ? namespace_uri(node.attribute(), node.parent()) : namespace_uri(node.node());
 	}
 
-	PUGI__FN char_t* normalize_space(char_t* buffer)
+	PUGI_IMPL_FN char_t* normalize_space(char_t* buffer)
 	{
 		char_t* write = buffer;
 
@@ -8679,10 +9069,10 @@ PUGI__NS_BEGIN
 		{
 			char_t ch = *it++;
 
-			if (PUGI__IS_CHARTYPE(ch, ct_space))
+			if (PUGI_IMPL_IS_CHARTYPE(ch, ct_space))
 			{
 				// replace whitespace sequence with single space
-				while (PUGI__IS_CHARTYPE(*it, ct_space)) it++;
+				while (PUGI_IMPL_IS_CHARTYPE(*it, ct_space)) it++;
 
 				// avoid leading spaces
 				if (write != buffer) *write++ = ' ';
@@ -8691,7 +9081,7 @@ PUGI__NS_BEGIN
 		}
 
 		// remove trailing space
-		if (write != buffer && PUGI__IS_CHARTYPE(write[-1], ct_space)) write--;
+		if (write != buffer && PUGI_IMPL_IS_CHARTYPE(write[-1], ct_space)) write--;
 
 		// zero-terminate
 		*write = 0;
@@ -8699,13 +9089,13 @@ PUGI__NS_BEGIN
 		return write;
 	}
 
-	PUGI__FN char_t* translate(char_t* buffer, const char_t* from, const char_t* to, size_t to_length)
+	PUGI_IMPL_FN char_t* translate(char_t* buffer, const char_t* from, const char_t* to, size_t to_length)
 	{
 		char_t* write = buffer;
 
 		while (*buffer)
 		{
-			PUGI__DMC_VOLATILE char_t ch = *buffer++;
+			PUGI_IMPL_DMC_VOLATILE char_t ch = *buffer++;
 
 			const char_t* pos = find_char(from, ch);
 
@@ -8721,7 +9111,7 @@ PUGI__NS_BEGIN
 		return write;
 	}
 
-	PUGI__FN unsigned char* translate_table_generate(xpath_allocator* alloc, const char_t* from, const char_t* to)
+	PUGI_IMPL_FN unsigned char* translate_table_generate(xpath_allocator* alloc, const char_t* from, const char_t* to)
 	{
 		unsigned char table[128] = {0};
 
@@ -8731,7 +9121,7 @@ PUGI__NS_BEGIN
 			unsigned int tc = static_cast<unsigned int>(*to);
 
 			if (fc >= 128 || tc >= 128)
-				return 0;
+				return nullptr;
 
 			// code=128 means "skip character"
 			if (!table[fc])
@@ -8746,14 +9136,14 @@ PUGI__NS_BEGIN
 				table[i] = static_cast<unsigned char>(i);
 
 		void* result = alloc->allocate(sizeof(table));
-		if (!result) return 0;
+		if (!result) return nullptr;
 
 		memcpy(result, table, sizeof(table));
 
 		return static_cast<unsigned char*>(result);
 	}
 
-	PUGI__FN char_t* translate_table(char_t* buffer, const unsigned char* table)
+	PUGI_IMPL_FN char_t* translate_table(char_t* buffer, const unsigned char* table)
 	{
 		char_t* write = buffer;
 
@@ -8810,7 +9200,7 @@ PUGI__NS_BEGIN
 
 	struct xpath_variable_string: xpath_variable
 	{
-		xpath_variable_string(): xpath_variable(xpath_type_string), value(0)
+		xpath_variable_string(): xpath_variable(xpath_type_string), value(nullptr)
 		{
 		}
 
@@ -8835,7 +9225,7 @@ PUGI__NS_BEGIN
 
 	static const xpath_node_set dummy_node_set;
 
-	PUGI__FN PUGI__UNSIGNED_OVERFLOW unsigned int hash_string(const char_t* str)
+	PUGI_IMPL_FN PUGI_IMPL_UNSIGNED_OVERFLOW unsigned int hash_string(const char_t* str)
 	{
 		// Jenkins one-at-a-time hash (http://en.wikipedia.org/wiki/Jenkins_hash_function#one-at-a-time)
 		unsigned int result = 0;
@@ -8854,14 +9244,14 @@ PUGI__NS_BEGIN
 		return result;
 	}
 
-	template <typename T> PUGI__FN T* new_xpath_variable(const char_t* name)
+	template <typename T> PUGI_IMPL_FN T* new_xpath_variable(const char_t* name)
 	{
 		size_t length = strlength(name);
-		if (length == 0) return 0; // empty variable names are invalid
+		if (length == 0) return nullptr; // empty variable names are invalid
 
 		// $$ we can't use offsetof(T, name) because T is non-POD, so we just allocate additional length characters
 		void* memory = xml_memory::allocate(sizeof(T) + length * sizeof(char_t));
-		if (!memory) return 0;
+		if (!memory) return nullptr;
 
 		T* result = new (memory) T();
 
@@ -8870,7 +9260,7 @@ PUGI__NS_BEGIN
 		return result;
 	}
 
-	PUGI__FN xpath_variable* new_xpath_variable(xpath_value_type type, const char_t* name)
+	PUGI_IMPL_FN xpath_variable* new_xpath_variable(xpath_value_type type, const char_t* name)
 	{
 		switch (type)
 		{
@@ -8887,17 +9277,17 @@ PUGI__NS_BEGIN
 			return new_xpath_variable<xpath_variable_boolean>(name);
 
 		default:
-			return 0;
+			return nullptr;
 		}
 	}
 
-	template <typename T> PUGI__FN void delete_xpath_variable(T* var)
+	template <typename T> PUGI_IMPL_FN void delete_xpath_variable(T* var)
 	{
 		var->~T();
 		xml_memory::deallocate(var);
 	}
 
-	PUGI__FN void delete_xpath_variable(xpath_value_type type, xpath_variable* var)
+	PUGI_IMPL_FN void delete_xpath_variable(xpath_value_type type, xpath_variable* var)
 	{
 		switch (type)
 		{
@@ -8922,7 +9312,7 @@ PUGI__NS_BEGIN
 		}
 	}
 
-	PUGI__FN bool copy_xpath_variable(xpath_variable* lhs, const xpath_variable* rhs)
+	PUGI_IMPL_FN bool copy_xpath_variable(xpath_variable* lhs, const xpath_variable* rhs)
 	{
 		switch (rhs->type())
 		{
@@ -8944,7 +9334,7 @@ PUGI__NS_BEGIN
 		}
 	}
 
-	PUGI__FN bool get_variable_scratch(char_t (&buffer)[32], xpath_variable_set* set, const char_t* begin, const char_t* end, xpath_variable** out_result)
+	PUGI_IMPL_FN bool get_variable_scratch(char_t (&buffer)[32], xpath_variable_set* set, const char_t* begin, const char_t* end, xpath_variable** out_result)
 	{
 		size_t length = static_cast<size_t>(end - begin);
 		char_t* scratch = buffer;
@@ -8967,11 +9357,11 @@ PUGI__NS_BEGIN
 
 		return true;
 	}
-PUGI__NS_END
+PUGI_IMPL_NS_END
 
 // Internal node set class
-PUGI__NS_BEGIN
-	PUGI__FN xpath_node_set::type_t xpath_get_order(const xpath_node* begin, const xpath_node* end)
+PUGI_IMPL_NS_BEGIN
+	PUGI_IMPL_FN xpath_node_set::type_t xpath_get_order(const xpath_node* begin, const xpath_node* end)
 	{
 		if (end - begin < 2)
 			return xpath_node_set::type_sorted;
@@ -8987,7 +9377,7 @@ PUGI__NS_BEGIN
 		return first ? xpath_node_set::type_sorted : xpath_node_set::type_sorted_reverse;
 	}
 
-	PUGI__FN xpath_node_set::type_t xpath_sort(xpath_node* begin, xpath_node* end, xpath_node_set::type_t type, bool rev)
+	PUGI_IMPL_FN xpath_node_set::type_t xpath_sort(xpath_node* begin, xpath_node* end, xpath_node_set::type_t type, bool rev)
 	{
 		xpath_node_set::type_t order = rev ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted;
 
@@ -9010,7 +9400,7 @@ PUGI__NS_BEGIN
 		return order;
 	}
 
-	PUGI__FN xpath_node xpath_first(const xpath_node* begin, const xpath_node* end, xpath_node_set::type_t type)
+	PUGI_IMPL_FN xpath_node xpath_first(const xpath_node* begin, const xpath_node* end, xpath_node_set::type_t type)
 	{
 		if (begin == end) return xpath_node();
 
@@ -9040,7 +9430,7 @@ PUGI__NS_BEGIN
 		xpath_node* _eos;
 
 	public:
-		xpath_node_set_raw(): _type(xpath_node_set::type_unsorted), _begin(0), _end(0), _eos(0)
+		xpath_node_set_raw(): _type(xpath_node_set::type_unsorted), _begin(nullptr), _end(nullptr), _eos(nullptr)
 		{
 		}
 
@@ -9164,7 +9554,7 @@ PUGI__NS_BEGIN
 		}
 	};
 
-	PUGI__FN_NO_INLINE void xpath_node_set_raw::push_back_grow(const xpath_node& node, xpath_allocator* alloc)
+	PUGI_IMPL_FN_NO_INLINE void xpath_node_set_raw::push_back_grow(const xpath_node& node, xpath_allocator* alloc)
 	{
 		size_t capacity = static_cast<size_t>(_eos - _begin);
 
@@ -9183,9 +9573,9 @@ PUGI__NS_BEGIN
 		// push
 		*_end++ = node;
 	}
-PUGI__NS_END
+PUGI_IMPL_NS_END
 
-PUGI__NS_BEGIN
+PUGI_IMPL_NS_BEGIN
 	struct xpath_context
 	{
 		xpath_node n;
@@ -9232,7 +9622,7 @@ PUGI__NS_BEGIN
 		const char_t* begin;
 		const char_t* end;
 
-		xpath_lexer_string(): begin(0), end(0)
+		xpath_lexer_string(): begin(nullptr), end(nullptr)
 		{
 		}
 
@@ -9267,7 +9657,7 @@ PUGI__NS_BEGIN
 		{
 			const char_t* cur = _cur;
 
-			while (PUGI__IS_CHARTYPE(*cur, ct_space)) ++cur;
+			while (PUGI_IMPL_IS_CHARTYPE(*cur, ct_space)) ++cur;
 
 			// save lexeme position for error reporting
 			_cur_lexeme_pos = cur;
@@ -9349,17 +9739,17 @@ PUGI__NS_BEGIN
 			case '$':
 				cur += 1;
 
-				if (PUGI__IS_CHARTYPEX(*cur, ctx_start_symbol))
+				if (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_start_symbol))
 				{
 					_cur_lexeme_contents.begin = cur;
 
-					while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+					while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
 
-					if (cur[0] == ':' && PUGI__IS_CHARTYPEX(cur[1], ctx_symbol)) // qname
+					if (cur[0] == ':' && PUGI_IMPL_IS_CHARTYPEX(cur[1], ctx_symbol)) // qname
 					{
 						cur++; // :
 
-						while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+						while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
 					}
 
 					_cur_lexeme_contents.end = cur;
@@ -9422,13 +9812,13 @@ PUGI__NS_BEGIN
 					cur += 2;
 					_cur_lexeme = lex_double_dot;
 				}
-				else if (PUGI__IS_CHARTYPEX(*(cur+1), ctx_digit))
+				else if (PUGI_IMPL_IS_CHARTYPEX(*(cur+1), ctx_digit))
 				{
 					_cur_lexeme_contents.begin = cur; // .
 
 					++cur;
 
-					while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++;
+					while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_digit)) cur++;
 
 					_cur_lexeme_contents.end = cur;
 
@@ -9482,28 +9872,28 @@ PUGI__NS_BEGIN
 				break;
 
 			default:
-				if (PUGI__IS_CHARTYPEX(*cur, ctx_digit))
+				if (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_digit))
 				{
 					_cur_lexeme_contents.begin = cur;
 
-					while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++;
+					while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_digit)) cur++;
 
 					if (*cur == '.')
 					{
 						cur++;
 
-						while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++;
+						while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_digit)) cur++;
 					}
 
 					_cur_lexeme_contents.end = cur;
 
 					_cur_lexeme = lex_number;
 				}
-				else if (PUGI__IS_CHARTYPEX(*cur, ctx_start_symbol))
+				else if (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_start_symbol))
 				{
 					_cur_lexeme_contents.begin = cur;
 
-					while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+					while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
 
 					if (cur[0] == ':')
 					{
@@ -9511,11 +9901,11 @@ PUGI__NS_BEGIN
 						{
 							cur += 2; // :*
 						}
-						else if (PUGI__IS_CHARTYPEX(cur[1], ctx_symbol)) // namespace test qname
+						else if (PUGI_IMPL_IS_CHARTYPEX(cur[1], ctx_symbol)) // namespace test qname
 						{
 							cur++; // :
 
-							while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+							while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
 						}
 					}
 
@@ -9927,7 +10317,8 @@ PUGI__NS_BEGIN
 
 			xpath_node* last = ns.begin() + first;
 
-			xpath_context c(xpath_node(), 1, size);
+			xpath_node cn;
+			xpath_context c(cn, 1, size);
 
 			double er = expr->eval_number(c, stack);
 
@@ -10014,7 +10405,7 @@ PUGI__NS_BEGIN
 		{
 			assert(n);
 
-			xml_node_type type = PUGI__NODETYPE(n);
+			xml_node_type type = PUGI_IMPL_NODETYPE(n);
 
 			switch (_test)
 			{
@@ -10419,40 +10810,40 @@ PUGI__NS_BEGIN
 
 	public:
 		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, const char_t* value):
-			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(nullptr), _right(nullptr), _next(nullptr)
 		{
 			assert(type == ast_string_constant);
 			_data.string = value;
 		}
 
 		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, double value):
-			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(nullptr), _right(nullptr), _next(nullptr)
 		{
 			assert(type == ast_number_constant);
 			_data.number = value;
 		}
 
 		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_variable* value):
-			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(nullptr), _right(nullptr), _next(nullptr)
 		{
 			assert(type == ast_variable);
 			_data.variable = value;
 		}
 
-		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_ast_node* left = 0, xpath_ast_node* right = 0):
-			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(left), _right(right), _next(0)
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_ast_node* left = nullptr, xpath_ast_node* right = nullptr):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(left), _right(right), _next(nullptr)
 		{
 		}
 
 		xpath_ast_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents):
-			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(static_cast<char>(axis)), _test(static_cast<char>(test)), _left(left), _right(0), _next(0)
+			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(static_cast<char>(axis)), _test(static_cast<char>(test)), _left(left), _right(nullptr), _next(nullptr)
 		{
 			assert(type == ast_step);
 			_data.nodetest = contents;
 		}
 
 		xpath_ast_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test):
-			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(0), _test(static_cast<char>(test)), _left(left), _right(right), _next(0)
+			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(0), _test(static_cast<char>(test)), _left(left), _right(right), _next(nullptr)
 		{
 			assert(type == ast_filter || type == ast_predicate);
 		}
@@ -10512,7 +10903,7 @@ PUGI__NS_BEGIN
 				xpath_string lr = _left->eval_string(c, stack);
 				xpath_string rr = _right->eval_string(c, stack);
 
-				return find_substring(lr.c_str(), rr.c_str()) != 0;
+				return find_substring(lr.c_str(), rr.c_str()) != nullptr;
 			}
 
 			case ast_func_boolean:
@@ -11321,7 +11712,7 @@ PUGI__NS_BEGIN
 			_result->error = message;
 			_result->offset = _lexer.current_pos() - _query;
 
-			return 0;
+			return nullptr;
 		}
 
 		xpath_ast_node* error_oom()
@@ -11329,7 +11720,7 @@ PUGI__NS_BEGIN
 			assert(_alloc->_error);
 			*_alloc->_error = true;
 
-			return 0;
+			return nullptr;
 		}
 
 		xpath_ast_node* error_rec()
@@ -11345,37 +11736,37 @@ PUGI__NS_BEGIN
 		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, const char_t* value)
 		{
 			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
+			return memory ? new (memory) xpath_ast_node(type, rettype, value) : nullptr;
 		}
 
 		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, double value)
 		{
 			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
+			return memory ? new (memory) xpath_ast_node(type, rettype, value) : nullptr;
 		}
 
 		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_variable* value)
 		{
 			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
+			return memory ? new (memory) xpath_ast_node(type, rettype, value) : nullptr;
 		}
 
-		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_ast_node* left = 0, xpath_ast_node* right = 0)
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_ast_node* left = nullptr, xpath_ast_node* right = nullptr)
 		{
 			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, rettype, left, right) : 0;
+			return memory ? new (memory) xpath_ast_node(type, rettype, left, right) : nullptr;
 		}
 
 		xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents)
 		{
 			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, left, axis, test, contents) : 0;
+			return memory ? new (memory) xpath_ast_node(type, left, axis, test, contents) : nullptr;
 		}
 
 		xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test)
 		{
 			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, left, right, test) : 0;
+			return memory ? new (memory) xpath_ast_node(type, left, right, test) : nullptr;
 		}
 
 		const char_t* alloc_string(const xpath_lexer_string& value)
@@ -11386,7 +11777,7 @@ PUGI__NS_BEGIN
 			size_t length = static_cast<size_t>(value.end - value.begin);
 
 			char_t* c = static_cast<char_t*>(_alloc->allocate((length + 1) * sizeof(char_t)));
-			if (!c) return 0;
+			if (!c) return nullptr;
 
 			memcpy(c, value.begin, length * sizeof(char_t));
 			c[length] = 0;
@@ -11629,7 +12020,7 @@ PUGI__NS_BEGIN
 				if (!_variables)
 					return error("Unknown variable: variable set is not provided");
 
-				xpath_variable* var = 0;
+				xpath_variable* var = nullptr;
 				if (!get_variable_scratch(_scratch, _variables, name.begin, name.end, &var))
 					return error_oom();
 
@@ -11646,7 +12037,7 @@ PUGI__NS_BEGIN
 				_lexer.next();
 
 				xpath_ast_node* n = parse_expression();
-				if (!n) return 0;
+				if (!n) return NULL;
 
 				if (_lexer.current() != lex_close_brace)
 					return error("Expected ')' to match an opening '('");
@@ -11659,7 +12050,7 @@ PUGI__NS_BEGIN
 			case lex_quoted_string:
 			{
 				const char_t* value = alloc_string(_lexer.contents());
-				if (!value) return 0;
+				if (!value) return nullptr;
 
 				_lexer.next();
 
@@ -11680,13 +12071,13 @@ PUGI__NS_BEGIN
 
 			case lex_string:
 			{
-				xpath_ast_node* args[2] = {0};
+				xpath_ast_node* args[2] = {nullptr};
 				size_t argc = 0;
 
 				xpath_lexer_string function = _lexer.contents();
 				_lexer.next();
 
-				xpath_ast_node* last_arg = 0;
+				xpath_ast_node* last_arg = nullptr;
 
 				if (_lexer.current() != lex_open_brace)
 					return error("Unrecognized function call");
@@ -11707,7 +12098,7 @@ PUGI__NS_BEGIN
 						return error_rec();
 
 					xpath_ast_node* n = parse_expression();
-					if (!n) return 0;
+					if (!n) return nullptr;
 
 					if (argc < 2) args[argc] = n;
 					else last_arg->set_next(n);
@@ -11734,7 +12125,7 @@ PUGI__NS_BEGIN
 		xpath_ast_node* parse_filter_expression()
 		{
 			xpath_ast_node* n = parse_primary_expression();
-			if (!n) return 0;
+			if (!n) return nullptr;
 
 			size_t old_depth = _depth;
 
@@ -11749,10 +12140,10 @@ PUGI__NS_BEGIN
 					return error("Predicate has to be applied to node set");
 
 				xpath_ast_node* expr = parse_expression();
-				if (!expr) return 0;
+				if (!expr) return nullptr;
 
 				n = alloc_node(ast_filter, n, expr, predicate_default);
-				if (!n) return 0;
+				if (!n) return nullptr;
 
 				if (_lexer.current() != lex_close_square_brace)
 					return error("Expected ']' to match an opening '['");
@@ -11792,7 +12183,7 @@ PUGI__NS_BEGIN
 				if (_lexer.current() == lex_open_square_brace)
 					return error("Predicates are not allowed after an abbreviated step");
 
-				return alloc_node(ast_step, set, axis_self, nodetest_type_node, 0);
+				return alloc_node(ast_step, set, axis_self, nodetest_type_node, nullptr);
 			}
 			else if (_lexer.current() == lex_double_dot)
 			{
@@ -11801,7 +12192,7 @@ PUGI__NS_BEGIN
 				if (_lexer.current() == lex_open_square_brace)
 					return error("Predicates are not allowed after an abbreviated step");
 
-				return alloc_node(ast_step, set, axis_parent, nodetest_type_node, 0);
+				return alloc_node(ast_step, set, axis_parent, nodetest_type_node, nullptr);
 			}
 
 			nodetest_t nt_type = nodetest_none;
@@ -11908,14 +12299,14 @@ PUGI__NS_BEGIN
 			}
 
 			const char_t* nt_name_copy = alloc_string(nt_name);
-			if (!nt_name_copy) return 0;
+			if (!nt_name_copy) return nullptr;
 
 			xpath_ast_node* n = alloc_node(ast_step, set, axis, nt_type, nt_name_copy);
-			if (!n) return 0;
+			if (!n) return nullptr;
 
 			size_t old_depth = _depth;
 
-			xpath_ast_node* last = 0;
+			xpath_ast_node* last = nullptr;
 
 			while (_lexer.current() == lex_open_square_brace)
 			{
@@ -11925,10 +12316,10 @@ PUGI__NS_BEGIN
 					return error_rec();
 
 				xpath_ast_node* expr = parse_expression();
-				if (!expr) return 0;
+				if (!expr) return nullptr;
 
-				xpath_ast_node* pred = alloc_node(ast_predicate, 0, expr, predicate_default);
-				if (!pred) return 0;
+				xpath_ast_node* pred = alloc_node(ast_predicate, nullptr, expr, predicate_default);
+				if (!pred) return nullptr;
 
 				if (_lexer.current() != lex_close_square_brace)
 					return error("Expected ']' to match an opening '['");
@@ -11949,7 +12340,7 @@ PUGI__NS_BEGIN
 		xpath_ast_node* parse_relative_location_path(xpath_ast_node* set)
 		{
 			xpath_ast_node* n = parse_step(set);
-			if (!n) return 0;
+			if (!n) return nullptr;
 
 			size_t old_depth = _depth;
 
@@ -11960,8 +12351,8 @@ PUGI__NS_BEGIN
 
 				if (l == lex_double_slash)
 				{
-					n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
-					if (!n) return 0;
+					n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, nullptr);
+					if (!n) return nullptr;
 
 					++_depth;
 				}
@@ -11970,7 +12361,7 @@ PUGI__NS_BEGIN
 					return error_rec();
 
 				n = parse_step(n);
-				if (!n) return 0;
+				if (!n) return nullptr;
 			}
 
 			_depth = old_depth;
@@ -11987,7 +12378,7 @@ PUGI__NS_BEGIN
 				_lexer.next();
 
 				xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set);
-				if (!n) return 0;
+				if (!n) return nullptr;
 
 				// relative location path can start from axis_attribute, dot, double_dot, multiply and string lexemes; any other lexeme means standalone root path
 				lexeme_t l = _lexer.current();
@@ -12002,16 +12393,16 @@ PUGI__NS_BEGIN
 				_lexer.next();
 
 				xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set);
-				if (!n) return 0;
+				if (!n) return nullptr;
 
-				n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
-				if (!n) return 0;
+				n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, nullptr);
+				if (!n) return nullptr;
 
 				return parse_relative_location_path(n);
 			}
 
 			// else clause moved outside of if because of bogus warning 'control may reach end of non-void function being inlined' in gcc 4.0.1
-			return parse_relative_location_path(0);
+			return parse_relative_location_path(nullptr);
 		}
 
 		// PathExpr ::= LocationPath
@@ -12037,7 +12428,7 @@ PUGI__NS_BEGIN
 					// This is either a function call, or not - if not, we shall proceed with location path
 					const char_t* state = _lexer.state();
 
-					while (PUGI__IS_CHARTYPE(*state, ct_space)) ++state;
+					while (PUGI_IMPL_IS_CHARTYPE(*state, ct_space)) ++state;
 
 					if (*state != '(')
 						return parse_location_path();
@@ -12048,7 +12439,7 @@ PUGI__NS_BEGIN
 				}
 
 				xpath_ast_node* n = parse_filter_expression();
-				if (!n) return 0;
+				if (!n) return nullptr;
 
 				if (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash)
 				{
@@ -12060,8 +12451,8 @@ PUGI__NS_BEGIN
 						if (n->rettype() != xpath_type_node_set)
 							return error("Step has to be applied to node set");
 
-						n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
-						if (!n) return 0;
+						n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, nullptr);
+						if (!n) return nullptr;
 					}
 
 					// select from location path
@@ -12076,7 +12467,7 @@ PUGI__NS_BEGIN
 
 				// precedence 7+ - only parses union expressions
 				xpath_ast_node* n = parse_expression(7);
-				if (!n) return 0;
+				if (!n) return nullptr;
 
 				return alloc_node(ast_op_negate, xpath_type_number, n);
 			}
@@ -12164,14 +12555,14 @@ PUGI__NS_BEGIN
 					return error_rec();
 
 				xpath_ast_node* rhs = parse_path_or_unary_expression();
-				if (!rhs) return 0;
+				if (!rhs) return nullptr;
 
 				binary_op_t nextop = binary_op_t::parse(_lexer);
 
 				while (nextop.asttype != ast_unknown && nextop.precedence > op.precedence)
 				{
 					rhs = parse_expression_rec(rhs, nextop.precedence);
-					if (!rhs) return 0;
+					if (!rhs) return nullptr;
 
 					nextop = binary_op_t::parse(_lexer);
 				}
@@ -12180,7 +12571,7 @@ PUGI__NS_BEGIN
 					return error("Union operator has to be applied to node sets");
 
 				lhs = alloc_node(op.asttype, op.rettype, lhs, rhs);
-				if (!lhs) return 0;
+				if (!lhs) return nullptr;
 
 				op = binary_op_t::parse(_lexer);
 			}
@@ -12214,7 +12605,7 @@ PUGI__NS_BEGIN
 				return error_rec();
 
 			xpath_ast_node* n = parse_path_or_unary_expression();
-			if (!n) return 0;
+			if (!n) return nullptr;
 
 			n = parse_expression_rec(n, limit);
 
@@ -12230,7 +12621,7 @@ PUGI__NS_BEGIN
 		xpath_ast_node* parse()
 		{
 			xpath_ast_node* n = parse_expression();
-			if (!n) return 0;
+			if (!n) return nullptr;
 
 			assert(_depth == 0);
 
@@ -12254,7 +12645,7 @@ PUGI__NS_BEGIN
 		static xpath_query_impl* create()
 		{
 			void* memory = xml_memory::allocate(sizeof(xpath_query_impl));
-			if (!memory) return 0;
+			if (!memory) return nullptr;
 
 			return new (memory) xpath_query_impl();
 		}
@@ -12268,9 +12659,9 @@ PUGI__NS_BEGIN
 			xml_memory::deallocate(impl);
 		}
 
-		xpath_query_impl(): root(0), alloc(&block, &oom), oom(false)
+		xpath_query_impl(): root(nullptr), alloc(&block, &oom), oom(false)
 		{
-			block.next = 0;
+			block.next = nullptr;
 			block.capacity = sizeof(block.data);
 		}
 
@@ -12280,9 +12671,9 @@ PUGI__NS_BEGIN
 		bool oom;
 	};
 
-	PUGI__FN impl::xpath_ast_node* evaluate_node_set_prepare(xpath_query_impl* impl)
+	PUGI_IMPL_FN impl::xpath_ast_node* evaluate_node_set_prepare(xpath_query_impl* impl)
 	{
-		if (!impl) return 0;
+		if (!impl) return nullptr;
 
 		if (impl->root->rettype() != xpath_type_node_set)
 		{
@@ -12298,91 +12689,91 @@ PUGI__NS_BEGIN
 
 		return impl->root;
 	}
-PUGI__NS_END
+PUGI_IMPL_NS_END
 
 namespace pugi
 {
 #ifndef PUGIXML_NO_EXCEPTIONS
-	PUGI__FN xpath_exception::xpath_exception(const xpath_parse_result& result_): _result(result_)
+	PUGI_IMPL_FN xpath_exception::xpath_exception(const xpath_parse_result& result_): _result(result_)
 	{
 		assert(_result.error);
 	}
 
-	PUGI__FN const char* xpath_exception::what() const throw()
+	PUGI_IMPL_FN const char* xpath_exception::what() const PUGIXML_NOEXCEPT
 	{
 		return _result.error;
 	}
 
-	PUGI__FN const xpath_parse_result& xpath_exception::result() const
+	PUGI_IMPL_FN const xpath_parse_result& xpath_exception::result() const
 	{
 		return _result;
 	}
 #endif
 
-	PUGI__FN xpath_node::xpath_node()
+	PUGI_IMPL_FN xpath_node::xpath_node()
 	{
 	}
 
-	PUGI__FN xpath_node::xpath_node(const xml_node& node_): _node(node_)
+	PUGI_IMPL_FN xpath_node::xpath_node(const xml_node& node_): _node(node_)
 	{
 	}
 
-	PUGI__FN xpath_node::xpath_node(const xml_attribute& attribute_, const xml_node& parent_): _node(attribute_ ? parent_ : xml_node()), _attribute(attribute_)
+	PUGI_IMPL_FN xpath_node::xpath_node(const xml_attribute& attribute_, const xml_node& parent_): _node(attribute_ ? parent_ : xml_node()), _attribute(attribute_)
 	{
 	}
 
-	PUGI__FN xml_node xpath_node::node() const
+	PUGI_IMPL_FN xml_node xpath_node::node() const
 	{
 		return _attribute ? xml_node() : _node;
 	}
 
-	PUGI__FN xml_attribute xpath_node::attribute() const
+	PUGI_IMPL_FN xml_attribute xpath_node::attribute() const
 	{
 		return _attribute;
 	}
 
-	PUGI__FN xml_node xpath_node::parent() const
+	PUGI_IMPL_FN xml_node xpath_node::parent() const
 	{
 		return _attribute ? _node : _node.parent();
 	}
 
-	PUGI__FN static void unspecified_bool_xpath_node(xpath_node***)
+	PUGI_IMPL_FN static void unspecified_bool_xpath_node(xpath_node***)
 	{
 	}
 
-	PUGI__FN xpath_node::operator xpath_node::unspecified_bool_type() const
+	PUGI_IMPL_FN xpath_node::operator xpath_node::unspecified_bool_type() const
 	{
-		return (_node || _attribute) ? unspecified_bool_xpath_node : 0;
+		return (_node || _attribute) ? unspecified_bool_xpath_node : nullptr;
 	}
 
-	PUGI__FN bool xpath_node::operator!() const
+	PUGI_IMPL_FN bool xpath_node::operator!() const
 	{
 		return !(_node || _attribute);
 	}
 
-	PUGI__FN bool xpath_node::operator==(const xpath_node& n) const
+	PUGI_IMPL_FN bool xpath_node::operator==(const xpath_node& n) const
 	{
 		return _node == n._node && _attribute == n._attribute;
 	}
 
-	PUGI__FN bool xpath_node::operator!=(const xpath_node& n) const
+	PUGI_IMPL_FN bool xpath_node::operator!=(const xpath_node& n) const
 	{
 		return _node != n._node || _attribute != n._attribute;
 	}
 
 #ifdef __BORLANDC__
-	PUGI__FN bool operator&&(const xpath_node& lhs, bool rhs)
+	PUGI_IMPL_FN bool operator&&(const xpath_node& lhs, bool rhs)
 	{
 		return (bool)lhs && rhs;
 	}
 
-	PUGI__FN bool operator||(const xpath_node& lhs, bool rhs)
+	PUGI_IMPL_FN bool operator||(const xpath_node& lhs, bool rhs)
 	{
 		return (bool)lhs || rhs;
 	}
 #endif
 
-	PUGI__FN void xpath_node_set::_assign(const_iterator begin_, const_iterator end_, type_t type_)
+	PUGI_IMPL_FN void xpath_node_set::_assign(const_iterator begin_, const_iterator end_, type_t type_)
 	{
 		assert(begin_ <= end_);
 
@@ -12414,7 +12805,7 @@ namespace pugi
 	}
 
 #ifdef PUGIXML_HAS_MOVE
-	PUGI__FN void xpath_node_set::_move(xpath_node_set& rhs) PUGIXML_NOEXCEPT
+	PUGI_IMPL_FN void xpath_node_set::_move(xpath_node_set& rhs) PUGIXML_NOEXCEPT
 	{
 		_type = rhs._type;
 		_storage[0] = rhs._storage[0];
@@ -12427,27 +12818,27 @@ namespace pugi
 	}
 #endif
 
-	PUGI__FN xpath_node_set::xpath_node_set(): _type(type_unsorted), _begin(_storage), _end(_storage)
+	PUGI_IMPL_FN xpath_node_set::xpath_node_set(): _type(type_unsorted), _begin(_storage), _end(_storage)
 	{
 	}
 
-	PUGI__FN xpath_node_set::xpath_node_set(const_iterator begin_, const_iterator end_, type_t type_): _type(type_unsorted), _begin(_storage), _end(_storage)
+	PUGI_IMPL_FN xpath_node_set::xpath_node_set(const_iterator begin_, const_iterator end_, type_t type_): _type(type_unsorted), _begin(_storage), _end(_storage)
 	{
 		_assign(begin_, end_, type_);
 	}
 
-	PUGI__FN xpath_node_set::~xpath_node_set()
+	PUGI_IMPL_FN xpath_node_set::~xpath_node_set()
 	{
 		if (_begin != _storage)
 			impl::xml_memory::deallocate(_begin);
 	}
 
-	PUGI__FN xpath_node_set::xpath_node_set(const xpath_node_set& ns): _type(type_unsorted), _begin(_storage), _end(_storage)
+	PUGI_IMPL_FN xpath_node_set::xpath_node_set(const xpath_node_set& ns): _type(type_unsorted), _begin(_storage), _end(_storage)
 	{
 		_assign(ns._begin, ns._end, ns._type);
 	}
 
-	PUGI__FN xpath_node_set& xpath_node_set::operator=(const xpath_node_set& ns)
+	PUGI_IMPL_FN xpath_node_set& xpath_node_set::operator=(const xpath_node_set& ns)
 	{
 		if (this == &ns) return *this;
 
@@ -12457,12 +12848,12 @@ namespace pugi
 	}
 
 #ifdef PUGIXML_HAS_MOVE
-	PUGI__FN xpath_node_set::xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT: _type(type_unsorted), _begin(_storage), _end(_storage)
+	PUGI_IMPL_FN xpath_node_set::xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT: _type(type_unsorted), _begin(_storage), _end(_storage)
 	{
 		_move(rhs);
 	}
 
-	PUGI__FN xpath_node_set& xpath_node_set::operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT
+	PUGI_IMPL_FN xpath_node_set& xpath_node_set::operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT
 	{
 		if (this == &rhs) return *this;
 
@@ -12475,66 +12866,66 @@ namespace pugi
 	}
 #endif
 
-	PUGI__FN xpath_node_set::type_t xpath_node_set::type() const
+	PUGI_IMPL_FN xpath_node_set::type_t xpath_node_set::type() const
 	{
 		return _type;
 	}
 
-	PUGI__FN size_t xpath_node_set::size() const
+	PUGI_IMPL_FN size_t xpath_node_set::size() const
 	{
 		return _end - _begin;
 	}
 
-	PUGI__FN bool xpath_node_set::empty() const
+	PUGI_IMPL_FN bool xpath_node_set::empty() const
 	{
 		return _begin == _end;
 	}
 
-	PUGI__FN const xpath_node& xpath_node_set::operator[](size_t index) const
+	PUGI_IMPL_FN const xpath_node& xpath_node_set::operator[](size_t index) const
 	{
 		assert(index < size());
 		return _begin[index];
 	}
 
-	PUGI__FN xpath_node_set::const_iterator xpath_node_set::begin() const
+	PUGI_IMPL_FN xpath_node_set::const_iterator xpath_node_set::begin() const
 	{
 		return _begin;
 	}
 
-	PUGI__FN xpath_node_set::const_iterator xpath_node_set::end() const
+	PUGI_IMPL_FN xpath_node_set::const_iterator xpath_node_set::end() const
 	{
 		return _end;
 	}
 
-	PUGI__FN void xpath_node_set::sort(bool reverse)
+	PUGI_IMPL_FN void xpath_node_set::sort(bool reverse)
 	{
 		_type = impl::xpath_sort(_begin, _end, _type, reverse);
 	}
 
-	PUGI__FN xpath_node xpath_node_set::first() const
+	PUGI_IMPL_FN xpath_node xpath_node_set::first() const
 	{
 		return impl::xpath_first(_begin, _end, _type);
 	}
 
-	PUGI__FN xpath_parse_result::xpath_parse_result(): error("Internal error"), offset(0)
+	PUGI_IMPL_FN xpath_parse_result::xpath_parse_result(): error("Internal error"), offset(0)
 	{
 	}
 
-	PUGI__FN xpath_parse_result::operator bool() const
+	PUGI_IMPL_FN xpath_parse_result::operator bool() const
 	{
-		return error == 0;
+		return error == nullptr;
 	}
 
-	PUGI__FN const char* xpath_parse_result::description() const
+	PUGI_IMPL_FN const char* xpath_parse_result::description() const
 	{
 		return error ? error : "No error";
 	}
 
-	PUGI__FN xpath_variable::xpath_variable(xpath_value_type type_): _type(type_), _next(0)
+	PUGI_IMPL_FN xpath_variable::xpath_variable(xpath_value_type type_): _type(type_), _next(nullptr)
 	{
 	}
 
-	PUGI__FN const char_t* xpath_variable::name() const
+	PUGI_IMPL_FN const char_t* xpath_variable::name() const
 	{
 		switch (_type)
 		{
@@ -12552,37 +12943,37 @@ namespace pugi
 
 		default:
 			assert(false && "Invalid variable type"); // unreachable
-			return 0;
+			return nullptr;
 		}
 	}
 
-	PUGI__FN xpath_value_type xpath_variable::type() const
+	PUGI_IMPL_FN xpath_value_type xpath_variable::type() const
 	{
 		return _type;
 	}
 
-	PUGI__FN bool xpath_variable::get_boolean() const
+	PUGI_IMPL_FN bool xpath_variable::get_boolean() const
 	{
 		return (_type == xpath_type_boolean) ? static_cast<const impl::xpath_variable_boolean*>(this)->value : false;
 	}
 
-	PUGI__FN double xpath_variable::get_number() const
+	PUGI_IMPL_FN double xpath_variable::get_number() const
 	{
 		return (_type == xpath_type_number) ? static_cast<const impl::xpath_variable_number*>(this)->value : impl::gen_nan();
 	}
 
-	PUGI__FN const char_t* xpath_variable::get_string() const
+	PUGI_IMPL_FN const char_t* xpath_variable::get_string() const
 	{
-		const char_t* value = (_type == xpath_type_string) ? static_cast<const impl::xpath_variable_string*>(this)->value : 0;
+		const char_t* value = (_type == xpath_type_string) ? static_cast<const impl::xpath_variable_string*>(this)->value : nullptr;
 		return value ? value : PUGIXML_TEXT("");
 	}
 
-	PUGI__FN const xpath_node_set& xpath_variable::get_node_set() const
+	PUGI_IMPL_FN const xpath_node_set& xpath_variable::get_node_set() const
 	{
 		return (_type == xpath_type_node_set) ? static_cast<const impl::xpath_variable_node_set*>(this)->value : impl::dummy_node_set;
 	}
 
-	PUGI__FN bool xpath_variable::set(bool value)
+	PUGI_IMPL_FN bool xpath_variable::set(bool value)
 	{
 		if (_type != xpath_type_boolean) return false;
 
@@ -12590,7 +12981,7 @@ namespace pugi
 		return true;
 	}
 
-	PUGI__FN bool xpath_variable::set(double value)
+	PUGI_IMPL_FN bool xpath_variable::set(double value)
 	{
 		if (_type != xpath_type_number) return false;
 
@@ -12598,7 +12989,7 @@ namespace pugi
 		return true;
 	}
 
-	PUGI__FN bool xpath_variable::set(const char_t* value)
+	PUGI_IMPL_FN bool xpath_variable::set(const char_t* value)
 	{
 		if (_type != xpath_type_string) return false;
 
@@ -12619,7 +13010,7 @@ namespace pugi
 		return true;
 	}
 
-	PUGI__FN bool xpath_variable::set(const xpath_node_set& value)
+	PUGI_IMPL_FN bool xpath_variable::set(const xpath_node_set& value)
 	{
 		if (_type != xpath_type_node_set) return false;
 
@@ -12627,27 +13018,27 @@ namespace pugi
 		return true;
 	}
 
-	PUGI__FN xpath_variable_set::xpath_variable_set()
+	PUGI_IMPL_FN xpath_variable_set::xpath_variable_set()
 	{
 		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-			_data[i] = 0;
+			_data[i] = nullptr;
 	}
 
-	PUGI__FN xpath_variable_set::~xpath_variable_set()
+	PUGI_IMPL_FN xpath_variable_set::~xpath_variable_set()
 	{
 		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
 			_destroy(_data[i]);
 	}
 
-	PUGI__FN xpath_variable_set::xpath_variable_set(const xpath_variable_set& rhs)
+	PUGI_IMPL_FN xpath_variable_set::xpath_variable_set(const xpath_variable_set& rhs)
 	{
 		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-			_data[i] = 0;
+			_data[i] = nullptr;
 
 		_assign(rhs);
 	}
 
-	PUGI__FN xpath_variable_set& xpath_variable_set::operator=(const xpath_variable_set& rhs)
+	PUGI_IMPL_FN xpath_variable_set& xpath_variable_set::operator=(const xpath_variable_set& rhs)
 	{
 		if (this == &rhs) return *this;
 
@@ -12657,30 +13048,30 @@ namespace pugi
 	}
 
 #ifdef PUGIXML_HAS_MOVE
-	PUGI__FN xpath_variable_set::xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
+	PUGI_IMPL_FN xpath_variable_set::xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
 	{
 		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
 		{
 			_data[i] = rhs._data[i];
-			rhs._data[i] = 0;
+			rhs._data[i] = nullptr;
 		}
 	}
 
-	PUGI__FN xpath_variable_set& xpath_variable_set::operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
+	PUGI_IMPL_FN xpath_variable_set& xpath_variable_set::operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
 	{
 		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
 		{
 			_destroy(_data[i]);
 
 			_data[i] = rhs._data[i];
-			rhs._data[i] = 0;
+			rhs._data[i] = nullptr;
 		}
 
 		return *this;
 	}
 #endif
 
-	PUGI__FN void xpath_variable_set::_assign(const xpath_variable_set& rhs)
+	PUGI_IMPL_FN void xpath_variable_set::_assign(const xpath_variable_set& rhs)
 	{
 		xpath_variable_set temp;
 
@@ -12691,7 +13082,7 @@ namespace pugi
 		_swap(temp);
 	}
 
-	PUGI__FN void xpath_variable_set::_swap(xpath_variable_set& rhs)
+	PUGI_IMPL_FN void xpath_variable_set::_swap(xpath_variable_set& rhs)
 	{
 		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
 		{
@@ -12702,7 +13093,7 @@ namespace pugi
 		}
 	}
 
-	PUGI__FN xpath_variable* xpath_variable_set::_find(const char_t* name) const
+	PUGI_IMPL_FN xpath_variable* xpath_variable_set::_find(const char_t* name) const
 	{
 		const size_t hash_size = sizeof(_data) / sizeof(_data[0]);
 		size_t hash = impl::hash_string(name) % hash_size;
@@ -12712,12 +13103,12 @@ namespace pugi
 			if (impl::strequal(var->name(), name))
 				return var;
 
-		return 0;
+		return nullptr;
 	}
 
-	PUGI__FN bool xpath_variable_set::_clone(xpath_variable* var, xpath_variable** out_result)
+	PUGI_IMPL_FN bool xpath_variable_set::_clone(xpath_variable* var, xpath_variable** out_result)
 	{
-		xpath_variable* last = 0;
+		xpath_variable* last = nullptr;
 
 		while (var)
 		{
@@ -12742,7 +13133,7 @@ namespace pugi
 		return true;
 	}
 
-	PUGI__FN void xpath_variable_set::_destroy(xpath_variable* var)
+	PUGI_IMPL_FN void xpath_variable_set::_destroy(xpath_variable* var)
 	{
 		while (var)
 		{
@@ -12754,7 +13145,7 @@ namespace pugi
 		}
 	}
 
-	PUGI__FN xpath_variable* xpath_variable_set::add(const char_t* name, xpath_value_type type)
+	PUGI_IMPL_FN xpath_variable* xpath_variable_set::add(const char_t* name, xpath_value_type type)
 	{
 		const size_t hash_size = sizeof(_data) / sizeof(_data[0]);
 		size_t hash = impl::hash_string(name) % hash_size;
@@ -12762,7 +13153,7 @@ namespace pugi
 		// look for existing variable
 		for (xpath_variable* var = _data[hash]; var; var = var->_next)
 			if (impl::strequal(var->name(), name))
-				return var->type() == type ? var : 0;
+				return var->type() == type ? var : nullptr;
 
 		// add new variable
 		xpath_variable* result = impl::new_xpath_variable(type, name);
@@ -12777,41 +13168,41 @@ namespace pugi
 		return result;
 	}
 
-	PUGI__FN bool xpath_variable_set::set(const char_t* name, bool value)
+	PUGI_IMPL_FN bool xpath_variable_set::set(const char_t* name, bool value)
 	{
 		xpath_variable* var = add(name, xpath_type_boolean);
 		return var ? var->set(value) : false;
 	}
 
-	PUGI__FN bool xpath_variable_set::set(const char_t* name, double value)
+	PUGI_IMPL_FN bool xpath_variable_set::set(const char_t* name, double value)
 	{
 		xpath_variable* var = add(name, xpath_type_number);
 		return var ? var->set(value) : false;
 	}
 
-	PUGI__FN bool xpath_variable_set::set(const char_t* name, const char_t* value)
+	PUGI_IMPL_FN bool xpath_variable_set::set(const char_t* name, const char_t* value)
 	{
 		xpath_variable* var = add(name, xpath_type_string);
 		return var ? var->set(value) : false;
 	}
 
-	PUGI__FN bool xpath_variable_set::set(const char_t* name, const xpath_node_set& value)
+	PUGI_IMPL_FN bool xpath_variable_set::set(const char_t* name, const xpath_node_set& value)
 	{
 		xpath_variable* var = add(name, xpath_type_node_set);
 		return var ? var->set(value) : false;
 	}
 
-	PUGI__FN xpath_variable* xpath_variable_set::get(const char_t* name)
+	PUGI_IMPL_FN xpath_variable* xpath_variable_set::get(const char_t* name)
 	{
 		return _find(name);
 	}
 
-	PUGI__FN const xpath_variable* xpath_variable_set::get(const char_t* name) const
+	PUGI_IMPL_FN const xpath_variable* xpath_variable_set::get(const char_t* name) const
 	{
 		return _find(name);
 	}
 
-	PUGI__FN xpath_query::xpath_query(const char_t* query, xpath_variable_set* variables): _impl(0)
+	PUGI_IMPL_FN xpath_query::xpath_query(const char_t* query, xpath_variable_set* variables): _impl(nullptr)
 	{
 		impl::xpath_query_impl* qimpl = impl::xpath_query_impl::create();
 
@@ -12835,7 +13226,7 @@ namespace pugi
 				qimpl->root->optimize(&qimpl->alloc);
 
 				_impl = impl.release();
-				_result.error = 0;
+				_result.error = nullptr;
 			}
 			else
 			{
@@ -12849,26 +13240,26 @@ namespace pugi
 		}
 	}
 
-	PUGI__FN xpath_query::xpath_query(): _impl(0)
+	PUGI_IMPL_FN xpath_query::xpath_query(): _impl(nullptr)
 	{
 	}
 
-	PUGI__FN xpath_query::~xpath_query()
+	PUGI_IMPL_FN xpath_query::~xpath_query()
 	{
 		if (_impl)
 			impl::xpath_query_impl::destroy(static_cast<impl::xpath_query_impl*>(_impl));
 	}
 
 #ifdef PUGIXML_HAS_MOVE
-	PUGI__FN xpath_query::xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT
+	PUGI_IMPL_FN xpath_query::xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT
 	{
 		_impl = rhs._impl;
 		_result = rhs._result;
-		rhs._impl = 0;
+		rhs._impl = nullptr;
 		rhs._result = xpath_parse_result();
 	}
 
-	PUGI__FN xpath_query& xpath_query::operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT
+	PUGI_IMPL_FN xpath_query& xpath_query::operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT
 	{
 		if (this == &rhs) return *this;
 
@@ -12877,21 +13268,21 @@ namespace pugi
 
 		_impl = rhs._impl;
 		_result = rhs._result;
-		rhs._impl = 0;
+		rhs._impl = nullptr;
 		rhs._result = xpath_parse_result();
 
 		return *this;
 	}
 #endif
 
-	PUGI__FN xpath_value_type xpath_query::return_type() const
+	PUGI_IMPL_FN xpath_value_type xpath_query::return_type() const
 	{
 		if (!_impl) return xpath_type_none;
 
 		return static_cast<impl::xpath_query_impl*>(_impl)->root->rettype();
 	}
 
-	PUGI__FN bool xpath_query::evaluate_boolean(const xpath_node& n) const
+	PUGI_IMPL_FN bool xpath_query::evaluate_boolean(const xpath_node& n) const
 	{
 		if (!_impl) return false;
 
@@ -12912,7 +13303,7 @@ namespace pugi
 		return r;
 	}
 
-	PUGI__FN double xpath_query::evaluate_number(const xpath_node& n) const
+	PUGI_IMPL_FN double xpath_query::evaluate_number(const xpath_node& n) const
 	{
 		if (!_impl) return impl::gen_nan();
 
@@ -12934,7 +13325,7 @@ namespace pugi
 	}
 
 #ifndef PUGIXML_NO_STL
-	PUGI__FN string_t xpath_query::evaluate_string(const xpath_node& n) const
+	PUGI_IMPL_FN string_t xpath_query::evaluate_string(const xpath_node& n) const
 	{
 		if (!_impl) return string_t();
 
@@ -12956,7 +13347,7 @@ namespace pugi
 	}
 #endif
 
-	PUGI__FN size_t xpath_query::evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const
+	PUGI_IMPL_FN size_t xpath_query::evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const
 	{
 		impl::xpath_context c(n, 1, 1);
 		impl::xpath_stack_data sd;
@@ -12986,7 +13377,7 @@ namespace pugi
 		return full_size;
 	}
 
-	PUGI__FN xpath_node_set xpath_query::evaluate_node_set(const xpath_node& n) const
+	PUGI_IMPL_FN xpath_node_set xpath_query::evaluate_node_set(const xpath_node& n) const
 	{
 		impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast<impl::xpath_query_impl*>(_impl));
 		if (!root) return xpath_node_set();
@@ -13008,7 +13399,7 @@ namespace pugi
 		return xpath_node_set(r.begin(), r.end(), r.type());
 	}
 
-	PUGI__FN xpath_node xpath_query::evaluate_node(const xpath_node& n) const
+	PUGI_IMPL_FN xpath_node xpath_query::evaluate_node(const xpath_node& n) const
 	{
 		impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast<impl::xpath_query_impl*>(_impl));
 		if (!root) return xpath_node();
@@ -13030,54 +13421,54 @@ namespace pugi
 		return r.first();
 	}
 
-	PUGI__FN const xpath_parse_result& xpath_query::result() const
+	PUGI_IMPL_FN const xpath_parse_result& xpath_query::result() const
 	{
 		return _result;
 	}
 
-	PUGI__FN static void unspecified_bool_xpath_query(xpath_query***)
+	PUGI_IMPL_FN static void unspecified_bool_xpath_query(xpath_query***)
 	{
 	}
 
-	PUGI__FN xpath_query::operator xpath_query::unspecified_bool_type() const
+	PUGI_IMPL_FN xpath_query::operator xpath_query::unspecified_bool_type() const
 	{
-		return _impl ? unspecified_bool_xpath_query : 0;
+		return _impl ? unspecified_bool_xpath_query : nullptr;
 	}
 
-	PUGI__FN bool xpath_query::operator!() const
+	PUGI_IMPL_FN bool xpath_query::operator!() const
 	{
 		return !_impl;
 	}
 
-	PUGI__FN xpath_node xml_node::select_node(const char_t* query, xpath_variable_set* variables) const
+	PUGI_IMPL_FN xpath_node xml_node::select_node(const char_t* query, xpath_variable_set* variables) const
 	{
 		xpath_query q(query, variables);
 		return q.evaluate_node(*this);
 	}
 
-	PUGI__FN xpath_node xml_node::select_node(const xpath_query& query) const
+	PUGI_IMPL_FN xpath_node xml_node::select_node(const xpath_query& query) const
 	{
 		return query.evaluate_node(*this);
 	}
 
-	PUGI__FN xpath_node_set xml_node::select_nodes(const char_t* query, xpath_variable_set* variables) const
+	PUGI_IMPL_FN xpath_node_set xml_node::select_nodes(const char_t* query, xpath_variable_set* variables) const
 	{
 		xpath_query q(query, variables);
 		return q.evaluate_node_set(*this);
 	}
 
-	PUGI__FN xpath_node_set xml_node::select_nodes(const xpath_query& query) const
+	PUGI_IMPL_FN xpath_node_set xml_node::select_nodes(const xpath_query& query) const
 	{
 		return query.evaluate_node_set(*this);
 	}
 
-	PUGI__FN xpath_node xml_node::select_single_node(const char_t* query, xpath_variable_set* variables) const
+	PUGI_IMPL_FN xpath_node xml_node::select_single_node(const char_t* query, xpath_variable_set* variables) const
 	{
 		xpath_query q(query, variables);
 		return q.evaluate_node(*this);
 	}
 
-	PUGI__FN xpath_node xml_node::select_single_node(const xpath_query& query) const
+	PUGI_IMPL_FN xpath_node xml_node::select_single_node(const xpath_query& query) const
 	{
 		return query.evaluate_node(*this);
 	}
@@ -13089,51 +13480,55 @@ namespace pugi
 #	pragma option pop
 #endif
 
+#if defined(_MSC_VER) && defined(__c2__)
+#	pragma clang diagnostic pop
+#endif
+
+#if defined(__clang__)
+#	pragma clang diagnostic pop
+#endif
+
 // Intel C++ does not properly keep warning state for function templates,
 // so popping warning state at the end of translation unit leads to warnings in the middle.
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
 #	pragma warning(pop)
 #endif
 
-#if defined(_MSC_VER) && defined(__c2__)
-#	pragma clang diagnostic pop
-#endif
-
 // Undefine all local macros (makes sure we're not leaking macros in header-only mode)
-#undef PUGI__NO_INLINE
-#undef PUGI__UNLIKELY
-#undef PUGI__STATIC_ASSERT
-#undef PUGI__DMC_VOLATILE
-#undef PUGI__UNSIGNED_OVERFLOW
-#undef PUGI__MSVC_CRT_VERSION
-#undef PUGI__SNPRINTF
-#undef PUGI__NS_BEGIN
-#undef PUGI__NS_END
-#undef PUGI__FN
-#undef PUGI__FN_NO_INLINE
-#undef PUGI__GETHEADER_IMPL
-#undef PUGI__GETPAGE_IMPL
-#undef PUGI__GETPAGE
-#undef PUGI__NODETYPE
-#undef PUGI__IS_CHARTYPE_IMPL
-#undef PUGI__IS_CHARTYPE
-#undef PUGI__IS_CHARTYPEX
-#undef PUGI__ENDSWITH
-#undef PUGI__SKIPWS
-#undef PUGI__OPTSET
-#undef PUGI__PUSHNODE
-#undef PUGI__POPNODE
-#undef PUGI__SCANFOR
-#undef PUGI__SCANWHILE
-#undef PUGI__SCANWHILE_UNROLL
-#undef PUGI__ENDSEG
-#undef PUGI__THROW_ERROR
-#undef PUGI__CHECK_ERROR
+#undef PUGI_IMPL_NO_INLINE
+#undef PUGI_IMPL_UNLIKELY
+#undef PUGI_IMPL_STATIC_ASSERT
+#undef PUGI_IMPL_DMC_VOLATILE
+#undef PUGI_IMPL_UNSIGNED_OVERFLOW
+#undef PUGI_IMPL_MSVC_CRT_VERSION
+#undef PUGI_IMPL_SNPRINTF
+#undef PUGI_IMPL_NS_BEGIN
+#undef PUGI_IMPL_NS_END
+#undef PUGI_IMPL_FN
+#undef PUGI_IMPL_FN_NO_INLINE
+#undef PUGI_IMPL_GETHEADER_IMPL
+#undef PUGI_IMPL_GETPAGE_IMPL
+#undef PUGI_IMPL_GETPAGE
+#undef PUGI_IMPL_NODETYPE
+#undef PUGI_IMPL_IS_CHARTYPE_IMPL
+#undef PUGI_IMPL_IS_CHARTYPE
+#undef PUGI_IMPL_IS_CHARTYPEX
+#undef PUGI_IMPL_ENDSWITH
+#undef PUGI_IMPL_SKIPWS
+#undef PUGI_IMPL_OPTSET
+#undef PUGI_IMPL_PUSHNODE
+#undef PUGI_IMPL_POPNODE
+#undef PUGI_IMPL_SCANFOR
+#undef PUGI_IMPL_SCANWHILE
+#undef PUGI_IMPL_SCANWHILE_UNROLL
+#undef PUGI_IMPL_ENDSEG
+#undef PUGI_IMPL_THROW_ERROR
+#undef PUGI_IMPL_CHECK_ERROR
 
 #endif
 
 /**
- * Copyright (c) 2006-2022 Arseny Kapoulkine
+ * Copyright (c) 2006-2025 Arseny Kapoulkine
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/contrib/pugixml/src/pugixml.hpp b/contrib/pugixml/src/pugixml.hpp
index 050df154c..74e884b53 100644
--- a/contrib/pugixml/src/pugixml.hpp
+++ b/contrib/pugixml/src/pugixml.hpp
@@ -1,7 +1,7 @@
 /**
- * pugixml parser - version 1.13
+ * pugixml parser - version 1.15
  * --------------------------------------------------------
- * Copyright (C) 2006-2022, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Copyright (C) 2006-2025, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
  * Report bugs and download new versions at https://pugixml.org/
  *
  * This library is distributed under the MIT License. See notice at the end
@@ -14,7 +14,7 @@
 // Define version macro; evaluates to major * 1000 + minor * 10 + patch so that it's safe to use in less-than comparisons
 // Note: pugixml used major * 100 + minor * 10 + patch format up until 1.9 (which had version identifier 190); starting from pugixml 1.10, the minor version number is two digits
 #ifndef PUGIXML_VERSION
-#	define PUGIXML_VERSION 1130 // 1.13
+#	define PUGIXML_VERSION 1150 // 1.15
 #endif
 
 // Include user configuration file (this can define various configuration macros)
@@ -38,6 +38,20 @@
 #	include <string>
 #endif
 
+// Check if std::string_view is available
+#if !defined(PUGIXML_HAS_STRING_VIEW) && !defined(PUGIXML_NO_STL)
+#	if __cplusplus >= 201703L
+#		define PUGIXML_HAS_STRING_VIEW
+#	elif defined(_MSVC_LANG) && _MSVC_LANG >= 201703L
+#		define PUGIXML_HAS_STRING_VIEW
+#	endif
+#endif
+
+// Include string_view if appropriate
+#ifdef PUGIXML_HAS_STRING_VIEW
+#	include <string_view>
+#endif
+
 // Macro for deprecated features
 #ifndef PUGIXML_DEPRECATED
 #	if defined(__GNUC__)
@@ -82,14 +96,14 @@
 #	endif
 #endif
 
-// If C++ is 2011 or higher, add 'noexcept' specifiers
+// If C++ is 2011 or higher, use 'noexcept' specifiers
 #ifndef PUGIXML_NOEXCEPT
 #	if __cplusplus >= 201103
 #		define PUGIXML_NOEXCEPT noexcept
 #	elif defined(_MSC_VER) && _MSC_VER >= 1900
 #		define PUGIXML_NOEXCEPT noexcept
 #	else
-#		define PUGIXML_NOEXCEPT
+#		define PUGIXML_NOEXCEPT throw()
 #	endif
 #endif
 
@@ -138,7 +152,12 @@ namespace pugi
 
 #ifndef PUGIXML_NO_STL
 	// String type used for operations that work with STL string; depends on PUGIXML_WCHAR_MODE
-	typedef std::basic_string<PUGIXML_CHAR, std::char_traits<PUGIXML_CHAR>, std::allocator<PUGIXML_CHAR> > string_t;
+	typedef std::basic_string<PUGIXML_CHAR> string_t;
+#endif
+
+#ifdef PUGIXML_HAS_STRING_VIEW
+	// String view type used for operations that can work with a length delimited string; depends on PUGIXML_WCHAR_MODE
+	typedef std::basic_string_view<PUGIXML_CHAR> string_view_t;
 #endif
 }
 
@@ -213,6 +232,10 @@ namespace pugi
 	// This flag is off by default.
 	const unsigned int parse_embed_pcdata = 0x2000;
 
+	// This flag determines whether determines whether the the two pcdata should be merged or not, if no intermediatory data are parsed in the document.
+	// This flag is off by default.
+	const unsigned int parse_merge_pcdata = 0x4000;
+
 	// The default parsing mode.
 	// Elements, PCDATA and CDATA sections are added to the DOM tree, character/reference entities are expanded,
 	// End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules.
@@ -324,7 +347,7 @@ namespace pugi
 	class PUGIXML_CLASS xml_writer
 	{
 	public:
-		virtual ~xml_writer() {}
+		virtual ~xml_writer();
 
 		// Write memory chunk into stream/file/whatever
 		virtual void write(const void* data, size_t size) = 0;
@@ -349,14 +372,14 @@ namespace pugi
 	{
 	public:
 		// Construct writer from an output stream object
-		xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream);
-		xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream);
+		xml_writer_stream(std::basic_ostream<char>& stream);
+		xml_writer_stream(std::basic_ostream<wchar_t>& stream);
 
 		virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
 
 	private:
-		std::basic_ostream<char, std::char_traits<char> >* narrow_stream;
-		std::basic_ostream<wchar_t, std::char_traits<wchar_t> >* wide_stream;
+		std::basic_ostream<char>* narrow_stream;
+		std::basic_ostream<wchar_t>* wide_stream;
 	};
 	#endif
 
@@ -392,7 +415,7 @@ namespace pugi
 		bool operator<=(const xml_attribute& r) const;
 		bool operator>=(const xml_attribute& r) const;
 
-		// Check if attribute is empty
+		// Check if attribute is empty (null)
 		bool empty() const;
 
 		// Get attribute name/value, or "" if attribute is empty
@@ -418,8 +441,15 @@ namespace pugi
 
 		// Set attribute name/value (returns false if attribute is empty or there is not enough memory)
 		bool set_name(const char_t* rhs);
-		bool set_value(const char_t* rhs, size_t sz);
+		bool set_name(const char_t* rhs, size_t size);
+	#ifdef PUGIXML_HAS_STRING_VIEW
+		bool set_name(string_view_t rhs);
+	#endif
 		bool set_value(const char_t* rhs);
+		bool set_value(const char_t* rhs, size_t size);
+	#ifdef PUGIXML_HAS_STRING_VIEW
+		bool set_value(string_view_t rhs);
+	#endif
 
 		// Set attribute value with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
 		bool set_value(int rhs);
@@ -447,6 +477,10 @@ namespace pugi
 		xml_attribute& operator=(float rhs);
 		xml_attribute& operator=(bool rhs);
 
+	#ifdef PUGIXML_HAS_STRING_VIEW
+		xml_attribute& operator=(string_view_t rhs);
+	#endif
+
 	#ifdef PUGIXML_HAS_LONG_LONG
 		xml_attribute& operator=(long long rhs);
 		xml_attribute& operator=(unsigned long long rhs);
@@ -502,7 +536,7 @@ namespace pugi
 		bool operator<=(const xml_node& r) const;
 		bool operator>=(const xml_node& r) const;
 
-		// Check if node is empty.
+		// Check if node is empty (null)
 		bool empty() const;
 
 		// Get node type
@@ -541,9 +575,18 @@ namespace pugi
 		xml_attribute attribute(const char_t* name) const;
 		xml_node next_sibling(const char_t* name) const;
 		xml_node previous_sibling(const char_t* name) const;
+	#ifdef PUGIXML_HAS_STRING_VIEW
+		xml_node child(string_view_t name) const;
+		xml_attribute attribute(string_view_t name) const;
+		xml_node next_sibling(string_view_t name) const;
+		xml_node previous_sibling(string_view_t name) const;
+	#endif
 
 		// Get attribute, starting the search from a hint (and updating hint so that searching for a sequence of attributes is fast)
 		xml_attribute attribute(const char_t* name, xml_attribute& hint) const;
+	#ifdef PUGIXML_HAS_STRING_VIEW
+		xml_attribute attribute(string_view_t name, xml_attribute& hint) const;
+	#endif
 
 		// Get child value of current node; that is, value of the first child node of type PCDATA/CDATA
 		const char_t* child_value() const;
@@ -553,14 +596,27 @@ namespace pugi
 
 		// Set node name/value (returns false if node is empty, there is not enough memory, or node can not have name/value)
 		bool set_name(const char_t* rhs);
-		bool set_value(const char_t* rhs, size_t sz);
+		bool set_name(const char_t* rhs, size_t size);
+	#ifdef PUGIXML_HAS_STRING_VIEW
+		bool set_name(string_view_t rhs);
+	#endif
 		bool set_value(const char_t* rhs);
+		bool set_value(const char_t* rhs, size_t size);
+	#ifdef PUGIXML_HAS_STRING_VIEW
+		bool set_value(string_view_t rhs);
+	#endif
 
 		// Add attribute with specified name. Returns added attribute, or empty attribute on errors.
 		xml_attribute append_attribute(const char_t* name);
 		xml_attribute prepend_attribute(const char_t* name);
 		xml_attribute insert_attribute_after(const char_t* name, const xml_attribute& attr);
 		xml_attribute insert_attribute_before(const char_t* name, const xml_attribute& attr);
+	#ifdef PUGIXML_HAS_STRING_VIEW
+		xml_attribute append_attribute(string_view_t name);
+		xml_attribute prepend_attribute(string_view_t name);
+		xml_attribute insert_attribute_after(string_view_t name, const xml_attribute& attr);
+		xml_attribute insert_attribute_before(string_view_t name, const xml_attribute& attr);
+	#endif
 
 		// Add a copy of the specified attribute. Returns added attribute, or empty attribute on errors.
 		xml_attribute append_copy(const xml_attribute& proto);
@@ -579,6 +635,12 @@ namespace pugi
 		xml_node prepend_child(const char_t* name);
 		xml_node insert_child_after(const char_t* name, const xml_node& node);
 		xml_node insert_child_before(const char_t* name, const xml_node& node);
+	#ifdef PUGIXML_HAS_STRING_VIEW
+		xml_node append_child(string_view_t name);
+		xml_node prepend_child(string_view_t name);
+		xml_node insert_child_after(string_view_t, const xml_node& node);
+		xml_node insert_child_before(string_view_t name, const xml_node& node);
+	#endif
 
 		// Add a copy of the specified node as a child. Returns added node, or empty node on errors.
 		xml_node append_copy(const xml_node& proto);
@@ -595,6 +657,9 @@ namespace pugi
 		// Remove specified attribute
 		bool remove_attribute(const xml_attribute& a);
 		bool remove_attribute(const char_t* name);
+	#ifdef PUGIXML_HAS_STRING_VIEW
+		bool remove_attribute(string_view_t name);
+	#endif
 
 		// Remove all attributes
 		bool remove_attributes();
@@ -602,6 +667,9 @@ namespace pugi
 		// Remove specified child
 		bool remove_child(const xml_node& n);
 		bool remove_child(const char_t* name);
+	#ifdef PUGIXML_HAS_STRING_VIEW
+		bool remove_child(string_view_t name);
+	#endif
 
 		// Remove all children
 		bool remove_children();
@@ -694,8 +762,8 @@ namespace pugi
 
 	#ifndef PUGIXML_NO_STL
 		// Print subtree to stream
-		void print(std::basic_ostream<char, std::char_traits<char> >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;
-		void print(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, unsigned int depth = 0) const;
+		void print(std::basic_ostream<char>& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;
+		void print(std::basic_ostream<wchar_t>& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, unsigned int depth = 0) const;
 	#endif
 
 		// Child nodes iterators
@@ -712,9 +780,12 @@ namespace pugi
 
 		// Range-based for support
 		xml_object_range<xml_node_iterator> children() const;
-		xml_object_range<xml_named_node_iterator> children(const char_t* name) const;
 		xml_object_range<xml_attribute_iterator> attributes() const;
 
+		// Range-based for support for all children with the specified name
+		// Note: name pointer must have a longer lifetime than the returned object; be careful with passing temporaries!
+		xml_object_range<xml_named_node_iterator> children(const char_t* name) const;
+
 		// Get node offset in parsed file/string (in char_t units) for debugging purposes
 		ptrdiff_t offset_debug() const;
 
@@ -755,7 +826,7 @@ namespace pugi
 		// Borland C++ workaround
 		bool operator!() const;
 
-		// Check if text object is empty
+		// Check if text object is empty (null)
 		bool empty() const;
 
 		// Get text, or "" if object is empty
@@ -779,8 +850,11 @@ namespace pugi
 		bool as_bool(bool def = false) const;
 
 		// Set text (returns false if object is empty or there is not enough memory)
-		bool set(const char_t* rhs, size_t sz);
 		bool set(const char_t* rhs);
+		bool set(const char_t* rhs, size_t size);
+	#ifdef PUGIXML_HAS_STRING_VIEW
+		bool set(string_view_t rhs);
+	#endif
 
 		// Set text with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
 		bool set(int rhs);
@@ -808,6 +882,10 @@ namespace pugi
 		xml_text& operator=(float rhs);
 		xml_text& operator=(bool rhs);
 
+	#ifdef PUGIXML_HAS_STRING_VIEW
+		xml_text& operator=(string_view_t rhs);
+	#endif
+
 	#ifdef PUGIXML_HAS_LONG_LONG
 		xml_text& operator=(long long rhs);
 		xml_text& operator=(unsigned long long rhs);
@@ -927,6 +1005,7 @@ namespace pugi
 		xml_named_node_iterator();
 
 		// Construct an iterator which points to the specified node
+		// Note: name pointer is stored in the iterator and must have a longer lifetime than iterator itself
 		xml_named_node_iterator(const xml_node& node, const char_t* name);
 
 		// Iterator operators
@@ -1062,8 +1141,8 @@ namespace pugi
 
 	#ifndef PUGIXML_NO_STL
 		// Load document from stream.
-		xml_parse_result load(std::basic_istream<char, std::char_traits<char> >& stream, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
-		xml_parse_result load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options = parse_default);
+		xml_parse_result load(std::basic_istream<char>& stream, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+		xml_parse_result load(std::basic_istream<wchar_t>& stream, unsigned int options = parse_default);
 	#endif
 
 		// (deprecated: use load_string instead) Load document from zero-terminated string. No encoding conversions are applied.
@@ -1092,8 +1171,8 @@ namespace pugi
 
 	#ifndef PUGIXML_NO_STL
 		// Save XML document to stream (semantics is slightly different from xml_node::print, see documentation for details).
-		void save(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
-		void save(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default) const;
+		void save(std::basic_ostream<char>& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+		void save(std::basic_ostream<wchar_t>& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default) const;
 	#endif
 
 		// Save XML to file
@@ -1304,7 +1383,7 @@ namespace pugi
 		explicit xpath_exception(const xpath_parse_result& result);
 
 		// Get error message
-		virtual const char* what() const throw() PUGIXML_OVERRIDE;
+		virtual const char* what() const PUGIXML_NOEXCEPT PUGIXML_OVERRIDE;
 
 		// Get parse result
 		const xpath_parse_result& result() const;
@@ -1429,12 +1508,12 @@ namespace pugi
 
 #ifndef PUGIXML_NO_STL
 	// Convert wide string to UTF8
-	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const wchar_t* str);
-	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >& str);
+	std::basic_string<char> PUGIXML_FUNCTION as_utf8(const wchar_t* str);
+	std::basic_string<char> PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t>& str);
 
 	// Convert UTF8 to wide string
-	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const char* str);
-	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const std::basic_string<char, std::char_traits<char>, std::allocator<char> >& str);
+	std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const char* str);
+	std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const std::basic_string<char>& str);
 #endif
 
 	// Memory allocation function interface; returns pointer to allocated memory or NULL on failure
@@ -1481,7 +1560,7 @@ namespace std
 #endif
 
 /**
- * Copyright (c) 2006-2022 Arseny Kapoulkine
+ * Copyright (c) 2006-2025 Arseny Kapoulkine
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/contrib/rapidjson/include/rapidjson/allocators.h b/contrib/rapidjson/include/rapidjson/allocators.h
index 44ec5295c..275417bd8 100644
--- a/contrib/rapidjson/include/rapidjson/allocators.h
+++ b/contrib/rapidjson/include/rapidjson/allocators.h
@@ -16,6 +16,14 @@
 #define RAPIDJSON_ALLOCATORS_H_
 
 #include "rapidjson.h"
+#include "internal/meta.h"
+
+#include <memory>
+#include <limits>
+
+#if RAPIDJSON_HAS_CXX11
+#include <type_traits>
+#endif
 
 RAPIDJSON_NAMESPACE_BEGIN
 
@@ -89,7 +97,14 @@ public:
         }
         return RAPIDJSON_REALLOC(originalPtr, newSize);
     }
-    static void Free(void *ptr) { RAPIDJSON_FREE(ptr); }
+    static void Free(void *ptr) RAPIDJSON_NOEXCEPT { RAPIDJSON_FREE(ptr); }
+
+    bool operator==(const CrtAllocator&) const RAPIDJSON_NOEXCEPT {
+        return true;
+    }
+    bool operator!=(const CrtAllocator&) const RAPIDJSON_NOEXCEPT {
+        return false;
+    }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -113,16 +128,64 @@ public:
 */
 template <typename BaseAllocator = CrtAllocator>
 class MemoryPoolAllocator {
+    //! Chunk header for perpending to each chunk.
+    /*! Chunks are stored as a singly linked list.
+    */
+    struct ChunkHeader {
+        size_t capacity;    //!< Capacity of the chunk in bytes (excluding the header itself).
+        size_t size;        //!< Current size of allocated memory in bytes.
+        ChunkHeader *next;  //!< Next chunk in the linked list.
+    };
+
+    struct SharedData {
+        ChunkHeader *chunkHead;  //!< Head of the chunk linked-list. Only the head chunk serves allocation.
+        BaseAllocator* ownBaseAllocator; //!< base allocator created by this object.
+        size_t refcount;
+        bool ownBuffer;
+    };
+
+    static const size_t SIZEOF_SHARED_DATA = RAPIDJSON_ALIGN(sizeof(SharedData));
+    static const size_t SIZEOF_CHUNK_HEADER = RAPIDJSON_ALIGN(sizeof(ChunkHeader));
+
+    static inline ChunkHeader *GetChunkHead(SharedData *shared)
+    {
+        return reinterpret_cast<ChunkHeader*>(reinterpret_cast<uint8_t*>(shared) + SIZEOF_SHARED_DATA);
+    }
+    static inline uint8_t *GetChunkBuffer(SharedData *shared)
+    {
+        return reinterpret_cast<uint8_t*>(shared->chunkHead) + SIZEOF_CHUNK_HEADER;
+    }
+
+    static const size_t kDefaultChunkCapacity = RAPIDJSON_ALLOCATOR_DEFAULT_CHUNK_CAPACITY; //!< Default chunk capacity.
+
 public:
     static const bool kNeedFree = false;    //!< Tell users that no need to call Free() with this allocator. (concept Allocator)
+    static const bool kRefCounted = true;   //!< Tell users that this allocator is reference counted on copy
 
     //! Constructor with chunkSize.
     /*! \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
         \param baseAllocator The allocator for allocating memory chunks.
     */
+    explicit
     MemoryPoolAllocator(size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) : 
-        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(0), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
+        chunk_capacity_(chunkSize),
+        baseAllocator_(baseAllocator ? baseAllocator : RAPIDJSON_NEW(BaseAllocator)()),
+        shared_(static_cast<SharedData*>(baseAllocator_ ? baseAllocator_->Malloc(SIZEOF_SHARED_DATA + SIZEOF_CHUNK_HEADER) : 0))
     {
+        RAPIDJSON_ASSERT(baseAllocator_ != 0);
+        RAPIDJSON_ASSERT(shared_ != 0);
+        if (baseAllocator) {
+            shared_->ownBaseAllocator = 0;
+        }
+        else {
+            shared_->ownBaseAllocator = baseAllocator_;
+        }
+        shared_->chunkHead = GetChunkHead(shared_);
+        shared_->chunkHead->capacity = 0;
+        shared_->chunkHead->size = 0;
+        shared_->chunkHead->next = 0;
+        shared_->ownBuffer = true;
+        shared_->refcount = 1;
     }
 
     //! Constructor with user-supplied buffer.
@@ -136,41 +199,101 @@ public:
         \param baseAllocator The allocator for allocating memory chunks.
     */
     MemoryPoolAllocator(void *buffer, size_t size, size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) :
-        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(buffer), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
+        chunk_capacity_(chunkSize),
+        baseAllocator_(baseAllocator),
+        shared_(static_cast<SharedData*>(AlignBuffer(buffer, size)))
     {
-        RAPIDJSON_ASSERT(buffer != 0);
-        RAPIDJSON_ASSERT(size > sizeof(ChunkHeader));
-        chunkHead_ = reinterpret_cast<ChunkHeader*>(buffer);
-        chunkHead_->capacity = size - sizeof(ChunkHeader);
-        chunkHead_->size = 0;
-        chunkHead_->next = 0;
+        RAPIDJSON_ASSERT(size >= SIZEOF_SHARED_DATA + SIZEOF_CHUNK_HEADER);
+        shared_->chunkHead = GetChunkHead(shared_);
+        shared_->chunkHead->capacity = size - SIZEOF_SHARED_DATA - SIZEOF_CHUNK_HEADER;
+        shared_->chunkHead->size = 0;
+        shared_->chunkHead->next = 0;
+        shared_->ownBaseAllocator = 0;
+        shared_->ownBuffer = false;
+        shared_->refcount = 1;
     }
 
+    MemoryPoolAllocator(const MemoryPoolAllocator& rhs) RAPIDJSON_NOEXCEPT :
+        chunk_capacity_(rhs.chunk_capacity_),
+        baseAllocator_(rhs.baseAllocator_),
+        shared_(rhs.shared_)
+    {
+        RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
+        ++shared_->refcount;
+    }
+    MemoryPoolAllocator& operator=(const MemoryPoolAllocator& rhs) RAPIDJSON_NOEXCEPT
+    {
+        RAPIDJSON_NOEXCEPT_ASSERT(rhs.shared_->refcount > 0);
+        ++rhs.shared_->refcount;
+        this->~MemoryPoolAllocator();
+        baseAllocator_ = rhs.baseAllocator_;
+        chunk_capacity_ = rhs.chunk_capacity_;
+        shared_ = rhs.shared_;
+        return *this;
+    }
+
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    MemoryPoolAllocator(MemoryPoolAllocator&& rhs) RAPIDJSON_NOEXCEPT :
+        chunk_capacity_(rhs.chunk_capacity_),
+        baseAllocator_(rhs.baseAllocator_),
+        shared_(rhs.shared_)
+    {
+        RAPIDJSON_NOEXCEPT_ASSERT(rhs.shared_->refcount > 0);
+        rhs.shared_ = 0;
+    }
+    MemoryPoolAllocator& operator=(MemoryPoolAllocator&& rhs) RAPIDJSON_NOEXCEPT
+    {
+        RAPIDJSON_NOEXCEPT_ASSERT(rhs.shared_->refcount > 0);
+        this->~MemoryPoolAllocator();
+        baseAllocator_ = rhs.baseAllocator_;
+        chunk_capacity_ = rhs.chunk_capacity_;
+        shared_ = rhs.shared_;
+        rhs.shared_ = 0;
+        return *this;
+    }
+#endif
+
     //! Destructor.
     /*! This deallocates all memory chunks, excluding the user-supplied buffer.
     */
-    ~MemoryPoolAllocator() {
+    ~MemoryPoolAllocator() RAPIDJSON_NOEXCEPT {
+        if (!shared_) {
+            // do nothing if moved
+            return;
+        }
+        if (shared_->refcount > 1) {
+            --shared_->refcount;
+            return;
+        }
         Clear();
-        RAPIDJSON_DELETE(ownBaseAllocator_);
+        BaseAllocator *a = shared_->ownBaseAllocator;
+        if (shared_->ownBuffer) {
+            baseAllocator_->Free(shared_);
+        }
+        RAPIDJSON_DELETE(a);
     }
 
-    //! Deallocates all memory chunks, excluding the user-supplied buffer.
-    void Clear() {
-        while (chunkHead_ && chunkHead_ != userBuffer_) {
-            ChunkHeader* next = chunkHead_->next;
-            baseAllocator_->Free(chunkHead_);
-            chunkHead_ = next;
+    //! Deallocates all memory chunks, excluding the first/user one.
+    void Clear() RAPIDJSON_NOEXCEPT {
+        RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
+        for (;;) {
+            ChunkHeader* c = shared_->chunkHead;
+            if (!c->next) {
+                break;
+            }
+            shared_->chunkHead = c->next;
+            baseAllocator_->Free(c);
         }
-        if (chunkHead_ && chunkHead_ == userBuffer_)
-            chunkHead_->size = 0; // Clear user buffer
+        shared_->chunkHead->size = 0;
     }
 
     //! Computes the total capacity of allocated memory chunks.
     /*! \return total capacity in bytes.
     */
-    size_t Capacity() const {
+    size_t Capacity() const RAPIDJSON_NOEXCEPT {
+        RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
         size_t capacity = 0;
-        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
+        for (ChunkHeader* c = shared_->chunkHead; c != 0; c = c->next)
             capacity += c->capacity;
         return capacity;
     }
@@ -178,25 +301,35 @@ public:
     //! Computes the memory blocks allocated.
     /*! \return total used bytes.
     */
-    size_t Size() const {
+    size_t Size() const RAPIDJSON_NOEXCEPT {
+        RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
         size_t size = 0;
-        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
+        for (ChunkHeader* c = shared_->chunkHead; c != 0; c = c->next)
             size += c->size;
         return size;
     }
 
+    //! Whether the allocator is shared.
+    /*! \return true or false.
+    */
+    bool Shared() const RAPIDJSON_NOEXCEPT {
+        RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
+        return shared_->refcount > 1;
+    }
+
     //! Allocates a memory block. (concept Allocator)
     void* Malloc(size_t size) {
+        RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
         if (!size)
             return NULL;
 
         size = RAPIDJSON_ALIGN(size);
-        if (chunkHead_ == 0 || chunkHead_->size + size > chunkHead_->capacity)
+        if (RAPIDJSON_UNLIKELY(shared_->chunkHead->size + size > shared_->chunkHead->capacity))
             if (!AddChunk(chunk_capacity_ > size ? chunk_capacity_ : size))
                 return NULL;
 
-        void *buffer = reinterpret_cast<char *>(chunkHead_) + RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size;
-        chunkHead_->size += size;
+        void *buffer = GetChunkBuffer(shared_) + shared_->chunkHead->size;
+        shared_->chunkHead->size += size;
         return buffer;
     }
 
@@ -205,6 +338,7 @@ public:
         if (originalPtr == 0)
             return Malloc(newSize);
 
+        RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
         if (newSize == 0)
             return NULL;
 
@@ -216,10 +350,10 @@ public:
             return originalPtr;
 
         // Simply expand it if it is the last allocation and there is sufficient space
-        if (originalPtr == reinterpret_cast<char *>(chunkHead_) + RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size - originalSize) {
+        if (originalPtr == GetChunkBuffer(shared_) + shared_->chunkHead->size - originalSize) {
             size_t increment = static_cast<size_t>(newSize - originalSize);
-            if (chunkHead_->size + increment <= chunkHead_->capacity) {
-                chunkHead_->size += increment;
+            if (shared_->chunkHead->size + increment <= shared_->chunkHead->capacity) {
+                shared_->chunkHead->size += increment;
                 return originalPtr;
             }
         }
@@ -235,50 +369,325 @@ public:
     }
 
     //! Frees a memory block (concept Allocator)
-    static void Free(void *ptr) { (void)ptr; } // Do nothing
+    static void Free(void *ptr) RAPIDJSON_NOEXCEPT { (void)ptr; } // Do nothing
+
+    //! Compare (equality) with another MemoryPoolAllocator
+    bool operator==(const MemoryPoolAllocator& rhs) const RAPIDJSON_NOEXCEPT {
+        RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
+        RAPIDJSON_NOEXCEPT_ASSERT(rhs.shared_->refcount > 0);
+        return shared_ == rhs.shared_;
+    }
+    //! Compare (inequality) with another MemoryPoolAllocator
+    bool operator!=(const MemoryPoolAllocator& rhs) const RAPIDJSON_NOEXCEPT {
+        return !operator==(rhs);
+    }
 
 private:
-    //! Copy constructor is not permitted.
-    MemoryPoolAllocator(const MemoryPoolAllocator& rhs) /* = delete */;
-    //! Copy assignment operator is not permitted.
-    MemoryPoolAllocator& operator=(const MemoryPoolAllocator& rhs) /* = delete */;
-
     //! Creates a new chunk.
     /*! \param capacity Capacity of the chunk in bytes.
         \return true if success.
     */
     bool AddChunk(size_t capacity) {
         if (!baseAllocator_)
-            ownBaseAllocator_ = baseAllocator_ = RAPIDJSON_NEW(BaseAllocator)();
-        if (ChunkHeader* chunk = reinterpret_cast<ChunkHeader*>(baseAllocator_->Malloc(RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + capacity))) {
+            shared_->ownBaseAllocator = baseAllocator_ = RAPIDJSON_NEW(BaseAllocator)();
+        if (ChunkHeader* chunk = static_cast<ChunkHeader*>(baseAllocator_->Malloc(SIZEOF_CHUNK_HEADER + capacity))) {
             chunk->capacity = capacity;
             chunk->size = 0;
-            chunk->next = chunkHead_;
-            chunkHead_ =  chunk;
+            chunk->next = shared_->chunkHead;
+            shared_->chunkHead = chunk;
             return true;
         }
         else
             return false;
     }
 
-    static const int kDefaultChunkCapacity = RAPIDJSON_ALLOCATOR_DEFAULT_CHUNK_CAPACITY; //!< Default chunk capacity.
+    static inline void* AlignBuffer(void* buf, size_t &size)
+    {
+        RAPIDJSON_NOEXCEPT_ASSERT(buf != 0);
+        const uintptr_t mask = sizeof(void*) - 1;
+        const uintptr_t ubuf = reinterpret_cast<uintptr_t>(buf);
+        if (RAPIDJSON_UNLIKELY(ubuf & mask)) {
+            const uintptr_t abuf = (ubuf + mask) & ~mask;
+            RAPIDJSON_ASSERT(size >= abuf - ubuf);
+            buf = reinterpret_cast<void*>(abuf);
+            size -= abuf - ubuf;
+        }
+        return buf;
+    }
 
-    //! Chunk header for perpending to each chunk.
-    /*! Chunks are stored as a singly linked list.
-    */
-    struct ChunkHeader {
-        size_t capacity;    //!< Capacity of the chunk in bytes (excluding the header itself).
-        size_t size;        //!< Current size of allocated memory in bytes.
-        ChunkHeader *next;  //!< Next chunk in the linked list.
+    size_t chunk_capacity_;     //!< The minimum capacity of chunk when they are allocated.
+    BaseAllocator* baseAllocator_;  //!< base allocator for allocating memory chunks.
+    SharedData *shared_;        //!< The shared data of the allocator
+};
+
+namespace internal {
+    template<typename, typename = void>
+    struct IsRefCounted :
+        public FalseType
+    { };
+    template<typename T>
+    struct IsRefCounted<T, typename internal::EnableIfCond<T::kRefCounted>::Type> :
+        public TrueType
+    { };
+}
+
+template<typename T, typename A>
+inline T* Realloc(A& a, T* old_p, size_t old_n, size_t new_n)
+{
+    RAPIDJSON_NOEXCEPT_ASSERT(old_n <= (std::numeric_limits<size_t>::max)() / sizeof(T) && new_n <= (std::numeric_limits<size_t>::max)() / sizeof(T));
+    return static_cast<T*>(a.Realloc(old_p, old_n * sizeof(T), new_n * sizeof(T)));
+}
+
+template<typename T, typename A>
+inline T *Malloc(A& a, size_t n = 1)
+{
+    return Realloc<T, A>(a, NULL, 0, n);
+}
+
+template<typename T, typename A>
+inline void Free(A& a, T *p, size_t n = 1)
+{
+    static_cast<void>(Realloc<T, A>(a, p, n, 0));
+}
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++) // std::allocator can safely be inherited
+#endif
+
+template <typename T, typename BaseAllocator = CrtAllocator>
+class StdAllocator :
+    public std::allocator<T>
+{
+    typedef std::allocator<T> allocator_type;
+#if RAPIDJSON_HAS_CXX11
+    typedef std::allocator_traits<allocator_type> traits_type;
+#else
+    typedef allocator_type traits_type;
+#endif
+
+public:
+    typedef BaseAllocator BaseAllocatorType;
+
+    StdAllocator() RAPIDJSON_NOEXCEPT :
+        allocator_type(),
+        baseAllocator_()
+    { }
+
+    StdAllocator(const StdAllocator& rhs) RAPIDJSON_NOEXCEPT :
+        allocator_type(rhs),
+        baseAllocator_(rhs.baseAllocator_)
+    { }
+
+    template<typename U>
+    StdAllocator(const StdAllocator<U, BaseAllocator>& rhs) RAPIDJSON_NOEXCEPT :
+        allocator_type(rhs),
+        baseAllocator_(rhs.baseAllocator_)
+    { }
+
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    StdAllocator(StdAllocator&& rhs) RAPIDJSON_NOEXCEPT :
+        allocator_type(std::move(rhs)),
+        baseAllocator_(std::move(rhs.baseAllocator_))
+    { }
+#endif
+#if RAPIDJSON_HAS_CXX11
+    using propagate_on_container_move_assignment = std::true_type;
+    using propagate_on_container_swap = std::true_type;
+#endif
+
+    /* implicit */
+    StdAllocator(const BaseAllocator& baseAllocator) RAPIDJSON_NOEXCEPT :
+        allocator_type(),
+        baseAllocator_(baseAllocator)
+    { }
+
+    ~StdAllocator() RAPIDJSON_NOEXCEPT
+    { }
+
+    template<typename U>
+    struct rebind {
+        typedef StdAllocator<U, BaseAllocator> other;
     };
 
-    ChunkHeader *chunkHead_;    //!< Head of the chunk linked-list. Only the head chunk serves allocation.
-    size_t chunk_capacity_;     //!< The minimum capacity of chunk when they are allocated.
-    void *userBuffer_;          //!< User supplied buffer.
-    BaseAllocator* baseAllocator_;  //!< base allocator for allocating memory chunks.
-    BaseAllocator* ownBaseAllocator_;   //!< base allocator created by this object.
+    typedef typename traits_type::size_type         size_type;
+    typedef typename traits_type::difference_type   difference_type;
+
+    typedef typename traits_type::value_type        value_type;
+    typedef typename traits_type::pointer           pointer;
+    typedef typename traits_type::const_pointer     const_pointer;
+
+#if RAPIDJSON_HAS_CXX11
+
+    typedef typename std::add_lvalue_reference<value_type>::type &reference;
+    typedef typename std::add_lvalue_reference<typename std::add_const<value_type>::type>::type &const_reference;
+
+    pointer address(reference r) const RAPIDJSON_NOEXCEPT
+    {
+        return std::addressof(r);
+    }
+    const_pointer address(const_reference r) const RAPIDJSON_NOEXCEPT
+    {
+        return std::addressof(r);
+    }
+
+    size_type max_size() const RAPIDJSON_NOEXCEPT
+    {
+        return traits_type::max_size(*this);
+    }
+
+    template <typename ...Args>
+    void construct(pointer p, Args&&... args)
+    {
+        traits_type::construct(*this, p, std::forward<Args>(args)...);
+    }
+    void destroy(pointer p)
+    {
+        traits_type::destroy(*this, p);
+    }
+
+#else // !RAPIDJSON_HAS_CXX11
+
+    typedef typename allocator_type::reference       reference;
+    typedef typename allocator_type::const_reference const_reference;
+
+    pointer address(reference r) const RAPIDJSON_NOEXCEPT
+    {
+        return allocator_type::address(r);
+    }
+    const_pointer address(const_reference r) const RAPIDJSON_NOEXCEPT
+    {
+        return allocator_type::address(r);
+    }
+
+    size_type max_size() const RAPIDJSON_NOEXCEPT
+    {
+        return allocator_type::max_size();
+    }
+
+    void construct(pointer p, const_reference r)
+    {
+        allocator_type::construct(p, r);
+    }
+    void destroy(pointer p)
+    {
+        allocator_type::destroy(p);
+    }
+
+#endif // !RAPIDJSON_HAS_CXX11
+
+    template <typename U>
+    U* allocate(size_type n = 1, const void* = 0)
+    {
+        return RAPIDJSON_NAMESPACE::Malloc<U>(baseAllocator_, n);
+    }
+    template <typename U>
+    void deallocate(U* p, size_type n = 1)
+    {
+        RAPIDJSON_NAMESPACE::Free<U>(baseAllocator_, p, n);
+    }
+
+    pointer allocate(size_type n = 1, const void* = 0)
+    {
+        return allocate<value_type>(n);
+    }
+    void deallocate(pointer p, size_type n = 1)
+    {
+        deallocate<value_type>(p, n);
+    }
+
+#if RAPIDJSON_HAS_CXX11
+    using is_always_equal = std::is_empty<BaseAllocator>;
+#endif
+
+    template<typename U>
+    bool operator==(const StdAllocator<U, BaseAllocator>& rhs) const RAPIDJSON_NOEXCEPT
+    {
+        return baseAllocator_ == rhs.baseAllocator_;
+    }
+    template<typename U>
+    bool operator!=(const StdAllocator<U, BaseAllocator>& rhs) const RAPIDJSON_NOEXCEPT
+    {
+        return !operator==(rhs);
+    }
+
+    //! rapidjson Allocator concept
+    static const bool kNeedFree = BaseAllocator::kNeedFree;
+    static const bool kRefCounted = internal::IsRefCounted<BaseAllocator>::Value;
+    void* Malloc(size_t size)
+    {
+        return baseAllocator_.Malloc(size);
+    }
+    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize)
+    {
+        return baseAllocator_.Realloc(originalPtr, originalSize, newSize);
+    }
+    static void Free(void *ptr) RAPIDJSON_NOEXCEPT
+    {
+        BaseAllocator::Free(ptr);
+    }
+
+private:
+    template <typename, typename>
+    friend class StdAllocator; // access to StdAllocator<!T>.*
+
+    BaseAllocator baseAllocator_;
 };
 
+#if !RAPIDJSON_HAS_CXX17 // std::allocator<void> deprecated in C++17
+template <typename BaseAllocator>
+class StdAllocator<void, BaseAllocator> :
+    public std::allocator<void>
+{
+    typedef std::allocator<void> allocator_type;
+
+public:
+    typedef BaseAllocator BaseAllocatorType;
+
+    StdAllocator() RAPIDJSON_NOEXCEPT :
+        allocator_type(),
+        baseAllocator_()
+    { }
+
+    StdAllocator(const StdAllocator& rhs) RAPIDJSON_NOEXCEPT :
+        allocator_type(rhs),
+        baseAllocator_(rhs.baseAllocator_)
+    { }
+
+    template<typename U>
+    StdAllocator(const StdAllocator<U, BaseAllocator>& rhs) RAPIDJSON_NOEXCEPT :
+        allocator_type(rhs),
+        baseAllocator_(rhs.baseAllocator_)
+    { }
+
+    /* implicit */
+    StdAllocator(const BaseAllocator& baseAllocator) RAPIDJSON_NOEXCEPT :
+        allocator_type(),
+        baseAllocator_(baseAllocator)
+    { }
+
+    ~StdAllocator() RAPIDJSON_NOEXCEPT
+    { }
+
+    template<typename U>
+    struct rebind {
+        typedef StdAllocator<U, BaseAllocator> other;
+    };
+
+    typedef typename allocator_type::value_type value_type;
+
+private:
+    template <typename, typename>
+    friend class StdAllocator; // access to StdAllocator<!T>.*
+
+    BaseAllocator baseAllocator_;
+};
+#endif
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_POP
+#endif
+
 RAPIDJSON_NAMESPACE_END
 
 #endif // RAPIDJSON_ENCODINGS_H_
diff --git a/contrib/rapidjson/include/rapidjson/document.h b/contrib/rapidjson/include/rapidjson/document.h
index 028235ec6..f183749ad 100644
--- a/contrib/rapidjson/include/rapidjson/document.h
+++ b/contrib/rapidjson/include/rapidjson/document.h
@@ -42,12 +42,21 @@ RAPIDJSON_DIAG_OFF(4244) // conversion from kXxxFlags to 'uint16_t', possible lo
 RAPIDJSON_DIAG_OFF(effc++)
 #endif // __GNUC__
 
+#ifdef GetObject
+// see https://github.com/Tencent/rapidjson/issues/1448
+// a former included windows.h might have defined a macro called GetObject, which affects
+// GetObject defined here. This ensures the macro does not get applied
+#pragma push_macro("GetObject")
+#define RAPIDJSON_WINDOWS_GETOBJECT_WORKAROUND_APPLIED
+#undef GetObject
+#endif
+
 #ifndef RAPIDJSON_NOMEMBERITERATORCLASS
 #include <iterator> // std::random_access_iterator_tag
 #endif
 
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-#include <utility> // std::move
+#if RAPIDJSON_USE_MEMBERSMAP
+#include <map> // std::multimap
 #endif
 
 RAPIDJSON_NAMESPACE_BEGIN
@@ -66,7 +75,7 @@ class GenericDocument;
     User can define this to use CrtAllocator or MemoryPoolAllocator.
 */
 #ifndef RAPIDJSON_DEFAULT_ALLOCATOR
-#define RAPIDJSON_DEFAULT_ALLOCATOR MemoryPoolAllocator<CrtAllocator>
+#define RAPIDJSON_DEFAULT_ALLOCATOR ::RAPIDJSON_NAMESPACE::MemoryPoolAllocator<::RAPIDJSON_NAMESPACE::CrtAllocator>
 #endif
 
 /*! \def RAPIDJSON_DEFAULT_STACK_ALLOCATOR
@@ -76,7 +85,7 @@ class GenericDocument;
     User can define this to use CrtAllocator or MemoryPoolAllocator.
 */
 #ifndef RAPIDJSON_DEFAULT_STACK_ALLOCATOR
-#define RAPIDJSON_DEFAULT_STACK_ALLOCATOR CrtAllocator
+#define RAPIDJSON_DEFAULT_STACK_ALLOCATOR ::RAPIDJSON_NAMESPACE::CrtAllocator
 #endif
 
 /*! \def RAPIDJSON_VALUE_DEFAULT_OBJECT_CAPACITY
@@ -732,18 +741,8 @@ public:
     template <typename SourceAllocator>
     GenericValue(const GenericValue<Encoding,SourceAllocator>& rhs, Allocator& allocator, bool copyConstStrings = false) {
         switch (rhs.GetType()) {
-        case kObjectType: {
-                SizeType count = rhs.data_.o.size;
-                Member* lm = reinterpret_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
-                const typename GenericValue<Encoding,SourceAllocator>::Member* rm = rhs.GetMembersPointer();
-                for (SizeType i = 0; i < count; i++) {
-                    new (&lm[i].name) GenericValue(rm[i].name, allocator, copyConstStrings);
-                    new (&lm[i].value) GenericValue(rm[i].value, allocator, copyConstStrings);
-                }
-                data_.f.flags = kObjectFlag;
-                data_.o.size = data_.o.capacity = count;
-                SetMembersPointer(lm);
-            }
+        case kObjectType:
+            DoCopyMembers(rhs, allocator, copyConstStrings);
             break;
         case kArrayType: {
                 SizeType count = rhs.data_.a.size;
@@ -879,25 +878,30 @@ public:
     /*! Need to destruct elements of array, members of object, or copy-string.
     */
     ~GenericValue() {
-        if (Allocator::kNeedFree) { // Shortcut by Allocator's trait
+        // With RAPIDJSON_USE_MEMBERSMAP, the maps need to be destroyed to release
+        // their Allocator if it's refcounted (e.g. MemoryPoolAllocator).
+        if (Allocator::kNeedFree || (RAPIDJSON_USE_MEMBERSMAP+0 &&
+                                     internal::IsRefCounted<Allocator>::Value)) {
             switch(data_.f.flags) {
             case kArrayFlag:
                 {
                     GenericValue* e = GetElementsPointer();
                     for (GenericValue* v = e; v != e + data_.a.size; ++v)
                         v->~GenericValue();
-                    Allocator::Free(e);
+                    if (Allocator::kNeedFree) { // Shortcut by Allocator's trait
+                        Allocator::Free(e);
+                    }
                 }
                 break;
 
             case kObjectFlag:
-                for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
-                    m->~Member();
-                Allocator::Free(GetMembersPointer());
+                DoFreeMembers();
                 break;
 
             case kCopyStringFlag:
-                Allocator::Free(const_cast<Ch*>(GetStringPointer()));
+                if (Allocator::kNeedFree) { // Shortcut by Allocator's trait
+                    Allocator::Free(const_cast<Ch*>(GetStringPointer()));
+                }
                 break;
 
             default:
@@ -916,8 +920,13 @@ public:
     */
     GenericValue& operator=(GenericValue& rhs) RAPIDJSON_NOEXCEPT {
         if (RAPIDJSON_LIKELY(this != &rhs)) {
+            // Can't destroy "this" before assigning "rhs", otherwise "rhs"
+            // could be used after free if it's an sub-Value of "this",
+            // hence the temporary danse.
+            GenericValue temp;
+            temp.RawAssign(rhs);
             this->~GenericValue();
-            RawAssign(rhs);
+            RawAssign(temp);
         }
         return *this;
     }
@@ -1024,7 +1033,7 @@ public:
                 return false;           
             for (ConstMemberIterator lhsMemberItr = MemberBegin(); lhsMemberItr != MemberEnd(); ++lhsMemberItr) {
                 typename RhsType::ConstMemberIterator rhsMemberItr = rhs.FindMember(lhsMemberItr->name);
-                if (rhsMemberItr == rhs.MemberEnd() || lhsMemberItr->value != rhsMemberItr->value)
+                if (rhsMemberItr == rhs.MemberEnd() || (!(lhsMemberItr->value == rhsMemberItr->value)))
                     return false;
             }
             return true;
@@ -1033,7 +1042,7 @@ public:
             if (data_.a.size != rhs.data_.a.size)
                 return false;
             for (SizeType i = 0; i < data_.a.size; i++)
-                if ((*this)[i] != rhs[i])
+                if (!((*this)[i] == rhs[i]))
                     return false;
             return true;
 
@@ -1069,6 +1078,7 @@ public:
     */
     template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>,internal::IsGenericValue<T> >), (bool)) operator==(const T& rhs) const { return *this == GenericValue(rhs); }
 
+#ifndef __cpp_impl_three_way_comparison
     //! Not-equal-to operator
     /*! \return !(*this == rhs)
      */
@@ -1093,6 +1103,7 @@ public:
      */
     template <typename T> friend RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator!=(const T& lhs, const GenericValue& rhs) { return !(rhs == lhs); }
     //@}
+#endif
 
     //!@name Type
     //@{
@@ -1219,13 +1230,28 @@ public:
         else {
             RAPIDJSON_ASSERT(false);    // see above note
 
-            // This will generate -Wexit-time-destructors in clang
-            // static GenericValue NullValue;
-            // return NullValue;
-
-            // Use static buffer and placement-new to prevent destruction
-            static char buffer[sizeof(GenericValue)];
+#if RAPIDJSON_HAS_CXX11
+            // Use thread-local storage to prevent races between threads.
+            // Use static buffer and placement-new to prevent destruction, with
+            // alignas() to ensure proper alignment.
+            alignas(GenericValue) thread_local static char buffer[sizeof(GenericValue)];
             return *new (buffer) GenericValue();
+#elif defined(_MSC_VER) && _MSC_VER < 1900
+            // There's no way to solve both thread locality and proper alignment
+            // simultaneously.
+            __declspec(thread) static char buffer[sizeof(GenericValue)];
+            return *new (buffer) GenericValue();
+#elif defined(__GNUC__) || defined(__clang__)
+            // This will generate -Wexit-time-destructors in clang, but that's
+            // better than having under-alignment.
+            __thread static GenericValue buffer;
+            return buffer;
+#else
+            // Don't know what compiler this is, so don't know how to ensure
+            // thread-locality.
+            static GenericValue buffer;
+            return buffer;
+#endif
         }
     }
     template <typename SourceAllocator>
@@ -1258,10 +1284,7 @@ public:
     */
     GenericValue& MemberReserve(SizeType newCapacity, Allocator &allocator) {
         RAPIDJSON_ASSERT(IsObject());
-        if (newCapacity > data_.o.capacity) {
-            SetMembersPointer(reinterpret_cast<Member*>(allocator.Realloc(GetMembersPointer(), data_.o.capacity * sizeof(Member), newCapacity * sizeof(Member))));
-            data_.o.capacity = newCapacity;
-        }
+        DoReserveMembers(newCapacity, allocator);
         return *this;
     }
 
@@ -1335,11 +1358,7 @@ public:
     MemberIterator FindMember(const GenericValue<Encoding, SourceAllocator>& name) {
         RAPIDJSON_ASSERT(IsObject());
         RAPIDJSON_ASSERT(name.IsString());
-        MemberIterator member = MemberBegin();
-        for ( ; member != MemberEnd(); ++member)
-            if (name.StringEqual(member->name))
-                break;
-        return member;
+        return DoFindMember(name);
     }
     template <typename SourceAllocator> ConstMemberIterator FindMember(const GenericValue<Encoding, SourceAllocator>& name) const { return const_cast<GenericValue&>(*this).FindMember(name); }
 
@@ -1368,14 +1387,7 @@ public:
     GenericValue& AddMember(GenericValue& name, GenericValue& value, Allocator& allocator) {
         RAPIDJSON_ASSERT(IsObject());
         RAPIDJSON_ASSERT(name.IsString());
-
-        ObjectData& o = data_.o;
-        if (o.size >= o.capacity)
-            MemberReserve(o.capacity == 0 ? kDefaultObjectCapacity : (o.capacity + (o.capacity + 1) / 2), allocator);
-        Member* members = GetMembersPointer();
-        members[o.size].name.RawAssign(name);
-        members[o.size].value.RawAssign(value);
-        o.size++;
+        DoAddMember(name, value, allocator);
         return *this;
     }
 
@@ -1509,9 +1521,7 @@ public:
     */
     void RemoveAllMembers() {
         RAPIDJSON_ASSERT(IsObject()); 
-        for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
-            m->~Member();
-        data_.o.size = 0;
+        DoClearMembers();
     }
 
     //! Remove a member in object by its name.
@@ -1555,14 +1565,7 @@ public:
         RAPIDJSON_ASSERT(data_.o.size > 0);
         RAPIDJSON_ASSERT(GetMembersPointer() != 0);
         RAPIDJSON_ASSERT(m >= MemberBegin() && m < MemberEnd());
-
-        MemberIterator last(GetMembersPointer() + (data_.o.size - 1));
-        if (data_.o.size > 1 && m != last)
-            *m = *last; // Move the last one to this place
-        else
-            m->~Member(); // Only one left, just destroy
-        --data_.o.size;
-        return m;
+        return DoRemoveMember(m);
     }
 
     //! Remove a member from an object by iterator.
@@ -1594,13 +1597,7 @@ public:
         RAPIDJSON_ASSERT(first >= MemberBegin());
         RAPIDJSON_ASSERT(first <= last);
         RAPIDJSON_ASSERT(last <= MemberEnd());
-
-        MemberIterator pos = MemberBegin() + (first - MemberBegin());
-        for (MemberIterator itr = pos; itr != last; ++itr)
-            itr->~Member();
-        std::memmove(static_cast<void*>(&*pos), &*last, static_cast<size_t>(MemberEnd() - last) * sizeof(Member));
-        data_.o.size -= static_cast<SizeType>(last - first);
-        return pos;
+        return DoEraseMembers(first, last);
     }
 
     //! Erase a member in object by its name.
@@ -1629,7 +1626,9 @@ public:
     }
 
     Object GetObject() { RAPIDJSON_ASSERT(IsObject()); return Object(*this); }
+    Object GetObj() { RAPIDJSON_ASSERT(IsObject()); return Object(*this); }
     ConstObject GetObject() const { RAPIDJSON_ASSERT(IsObject()); return ConstObject(*this); }
+    ConstObject GetObj() const { RAPIDJSON_ASSERT(IsObject()); return ConstObject(*this); }
 
     //@}
 
@@ -1851,12 +1850,12 @@ public:
     //!@name String
     //@{
 
-    const Ch* GetString() const { RAPIDJSON_ASSERT(IsString()); return (data_.f.flags & kInlineStrFlag) ? data_.ss.str : GetStringPointer(); }
+    const Ch* GetString() const { RAPIDJSON_ASSERT(IsString()); return DataString(data_); }
 
     //! Get the length of string.
     /*! Since rapidjson permits "\\u0000" in the json string, strlen(v.GetString()) may not equal to v.GetStringLength().
     */
-    SizeType GetStringLength() const { RAPIDJSON_ASSERT(IsString()); return ((data_.f.flags & kInlineStrFlag) ? (data_.ss.GetLength()) : data_.s.length); }
+    SizeType GetStringLength() const { RAPIDJSON_ASSERT(IsString()); return DataStringLength(data_); }
 
     //! Set this value as a string without copying source string.
     /*! This version has better performance with supplied length, and also support string containing null character.
@@ -1967,7 +1966,7 @@ public:
         case kArrayType:
             if (RAPIDJSON_UNLIKELY(!handler.StartArray()))
                 return false;
-            for (const GenericValue* v = Begin(); v != End(); ++v)
+            for (ConstValueIterator v = Begin(); v != End(); ++v)
                 if (RAPIDJSON_UNLIKELY(!v->Accept(handler)))
                     return false;
             return handler.EndArray(data_.a.size);
@@ -2105,6 +2104,13 @@ private:
         Flag f;
     };  // 16 bytes in 32-bit mode, 24 bytes in 64-bit mode, 16 bytes in 64-bit with RAPIDJSON_48BITPOINTER_OPTIMIZATION
 
+    static RAPIDJSON_FORCEINLINE const Ch* DataString(const Data& data) {
+        return (data.f.flags & kInlineStrFlag) ? data.ss.str : RAPIDJSON_GETPOINTER(Ch, data.s.str);
+    }
+    static RAPIDJSON_FORCEINLINE SizeType DataStringLength(const Data& data) {
+        return (data.f.flags & kInlineStrFlag) ? data.ss.GetLength() : data.s.length;
+    }
+
     RAPIDJSON_FORCEINLINE const Ch* GetStringPointer() const { return RAPIDJSON_GETPOINTER(Ch, data_.s.str); }
     RAPIDJSON_FORCEINLINE const Ch* SetStringPointer(const Ch* str) { return RAPIDJSON_SETPOINTER(Ch, data_.s.str, str); }
     RAPIDJSON_FORCEINLINE GenericValue* GetElementsPointer() const { return RAPIDJSON_GETPOINTER(GenericValue, data_.a.elements); }
@@ -2112,6 +2118,286 @@ private:
     RAPIDJSON_FORCEINLINE Member* GetMembersPointer() const { return RAPIDJSON_GETPOINTER(Member, data_.o.members); }
     RAPIDJSON_FORCEINLINE Member* SetMembersPointer(Member* members) { return RAPIDJSON_SETPOINTER(Member, data_.o.members, members); }
 
+#if RAPIDJSON_USE_MEMBERSMAP
+
+    struct MapTraits {
+        struct Less {
+            bool operator()(const Data& s1, const Data& s2) const {
+                SizeType n1 = DataStringLength(s1), n2 = DataStringLength(s2);
+                int cmp = std::memcmp(DataString(s1), DataString(s2), sizeof(Ch) * (n1 < n2 ? n1 : n2));
+                return cmp < 0 || (cmp == 0 && n1 < n2);
+            }
+        };
+        typedef std::pair<const Data, SizeType> Pair;
+        typedef std::multimap<Data, SizeType, Less, StdAllocator<Pair, Allocator> > Map;
+        typedef typename Map::iterator Iterator;
+    };
+    typedef typename MapTraits::Map         Map;
+    typedef typename MapTraits::Less        MapLess;
+    typedef typename MapTraits::Pair        MapPair;
+    typedef typename MapTraits::Iterator    MapIterator;
+
+    //
+    // Layout of the members' map/array, re(al)located according to the needed capacity:
+    //
+    //    {Map*}<>{capacity}<>{Member[capacity]}<>{MapIterator[capacity]}
+    //
+    // (where <> stands for the RAPIDJSON_ALIGN-ment, if needed)
+    //
+
+    static RAPIDJSON_FORCEINLINE size_t GetMapLayoutSize(SizeType capacity) {
+        return RAPIDJSON_ALIGN(sizeof(Map*)) +
+               RAPIDJSON_ALIGN(sizeof(SizeType)) +
+               RAPIDJSON_ALIGN(capacity * sizeof(Member)) +
+               capacity * sizeof(MapIterator);
+    }
+
+    static RAPIDJSON_FORCEINLINE SizeType &GetMapCapacity(Map* &map) {
+        return *reinterpret_cast<SizeType*>(reinterpret_cast<uintptr_t>(&map) +
+                                            RAPIDJSON_ALIGN(sizeof(Map*)));
+    }
+
+    static RAPIDJSON_FORCEINLINE Member* GetMapMembers(Map* &map) {
+        return reinterpret_cast<Member*>(reinterpret_cast<uintptr_t>(&map) +
+                                         RAPIDJSON_ALIGN(sizeof(Map*)) +
+                                         RAPIDJSON_ALIGN(sizeof(SizeType)));
+    }
+
+    static RAPIDJSON_FORCEINLINE MapIterator* GetMapIterators(Map* &map) {
+        return reinterpret_cast<MapIterator*>(reinterpret_cast<uintptr_t>(&map) +
+                                              RAPIDJSON_ALIGN(sizeof(Map*)) +
+                                              RAPIDJSON_ALIGN(sizeof(SizeType)) +
+                                              RAPIDJSON_ALIGN(GetMapCapacity(map) * sizeof(Member)));
+    }
+
+    static RAPIDJSON_FORCEINLINE Map* &GetMap(Member* members) {
+        RAPIDJSON_ASSERT(members != 0);
+        return *reinterpret_cast<Map**>(reinterpret_cast<uintptr_t>(members) -
+                                        RAPIDJSON_ALIGN(sizeof(SizeType)) -
+                                        RAPIDJSON_ALIGN(sizeof(Map*)));
+    }
+
+    // Some compilers' debug mechanisms want all iterators to be destroyed, for their accounting..
+    RAPIDJSON_FORCEINLINE MapIterator DropMapIterator(MapIterator& rhs) {
+#if RAPIDJSON_HAS_CXX11
+        MapIterator ret = std::move(rhs);
+#else
+        MapIterator ret = rhs;
+#endif
+        rhs.~MapIterator();
+        return ret;
+    }
+
+    Map* &DoReallocMap(Map** oldMap, SizeType newCapacity, Allocator& allocator) {
+        Map **newMap = static_cast<Map**>(allocator.Malloc(GetMapLayoutSize(newCapacity)));
+        GetMapCapacity(*newMap) = newCapacity;
+        if (!oldMap) {
+            *newMap = new (allocator.Malloc(sizeof(Map))) Map(MapLess(), allocator);
+        }
+        else {
+            *newMap = *oldMap;
+            size_t count = (*oldMap)->size();
+            std::memcpy(static_cast<void*>(GetMapMembers(*newMap)),
+                        static_cast<void*>(GetMapMembers(*oldMap)),
+                        count * sizeof(Member));
+            MapIterator *oldIt = GetMapIterators(*oldMap),
+                        *newIt = GetMapIterators(*newMap);
+            while (count--) {
+                new (&newIt[count]) MapIterator(DropMapIterator(oldIt[count]));
+            }
+            Allocator::Free(oldMap);
+        }
+        return *newMap;
+    }
+
+    RAPIDJSON_FORCEINLINE Member* DoAllocMembers(SizeType capacity, Allocator& allocator) {
+        return GetMapMembers(DoReallocMap(0, capacity, allocator));
+    }
+
+    void DoReserveMembers(SizeType newCapacity, Allocator& allocator) {
+        ObjectData& o = data_.o;
+        if (newCapacity > o.capacity) {
+            Member* oldMembers = GetMembersPointer();
+            Map **oldMap = oldMembers ? &GetMap(oldMembers) : 0,
+                *&newMap = DoReallocMap(oldMap, newCapacity, allocator);
+            RAPIDJSON_SETPOINTER(Member, o.members, GetMapMembers(newMap));
+            o.capacity = newCapacity;
+        }
+    }
+
+    template <typename SourceAllocator>
+    MemberIterator DoFindMember(const GenericValue<Encoding, SourceAllocator>& name) {
+        if (Member* members = GetMembersPointer()) {
+            Map* &map = GetMap(members);
+            MapIterator mit = map->find(reinterpret_cast<const Data&>(name.data_));
+            if (mit != map->end()) {
+                return MemberIterator(&members[mit->second]);
+            }
+        }
+        return MemberEnd();
+    }
+
+    void DoClearMembers() {
+        if (Member* members = GetMembersPointer()) {
+            Map* &map = GetMap(members);
+            MapIterator* mit = GetMapIterators(map);
+            for (SizeType i = 0; i < data_.o.size; i++) {
+                map->erase(DropMapIterator(mit[i]));
+                members[i].~Member();
+            }
+            data_.o.size = 0;
+        }
+    }
+
+    void DoFreeMembers() {
+        if (Member* members = GetMembersPointer()) {
+            GetMap(members)->~Map();
+            for (SizeType i = 0; i < data_.o.size; i++) {
+                members[i].~Member();
+            }
+            if (Allocator::kNeedFree) { // Shortcut by Allocator's trait
+                Map** map = &GetMap(members);
+                Allocator::Free(*map);
+                Allocator::Free(map);
+            }
+        }
+    }
+
+#else // !RAPIDJSON_USE_MEMBERSMAP
+
+    RAPIDJSON_FORCEINLINE Member* DoAllocMembers(SizeType capacity, Allocator& allocator) {
+        return Malloc<Member>(allocator, capacity);
+    }
+
+    void DoReserveMembers(SizeType newCapacity, Allocator& allocator) {
+        ObjectData& o = data_.o;
+        if (newCapacity > o.capacity) {
+            Member* newMembers = Realloc<Member>(allocator, GetMembersPointer(), o.capacity, newCapacity);
+            RAPIDJSON_SETPOINTER(Member, o.members, newMembers);
+            o.capacity = newCapacity;
+        }
+    }
+
+    template <typename SourceAllocator>
+    MemberIterator DoFindMember(const GenericValue<Encoding, SourceAllocator>& name) {
+        MemberIterator member = MemberBegin();
+        for ( ; member != MemberEnd(); ++member)
+            if (name.StringEqual(member->name))
+                break;
+        return member;
+    }
+
+    void DoClearMembers() {
+        for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
+            m->~Member();
+        data_.o.size = 0;
+    }
+
+    void DoFreeMembers() {
+        for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
+            m->~Member();
+        Allocator::Free(GetMembersPointer());
+    }
+
+#endif // !RAPIDJSON_USE_MEMBERSMAP
+
+    void DoAddMember(GenericValue& name, GenericValue& value, Allocator& allocator) {
+        ObjectData& o = data_.o;
+        if (o.size >= o.capacity)
+            DoReserveMembers(o.capacity ? (o.capacity + (o.capacity + 1) / 2) : kDefaultObjectCapacity, allocator);
+        Member* members = GetMembersPointer();
+        Member* m = members + o.size;
+        m->name.RawAssign(name);
+        m->value.RawAssign(value);
+#if RAPIDJSON_USE_MEMBERSMAP
+        Map* &map = GetMap(members);
+        MapIterator* mit = GetMapIterators(map);
+        new (&mit[o.size]) MapIterator(map->insert(MapPair(m->name.data_, o.size)));
+#endif
+        ++o.size;
+    }
+
+    MemberIterator DoRemoveMember(MemberIterator m) {
+        ObjectData& o = data_.o;
+        Member* members = GetMembersPointer();
+#if RAPIDJSON_USE_MEMBERSMAP
+        Map* &map = GetMap(members);
+        MapIterator* mit = GetMapIterators(map);
+        SizeType mpos = static_cast<SizeType>(&*m - members);
+        map->erase(DropMapIterator(mit[mpos]));
+#endif
+        MemberIterator last(members + (o.size - 1));
+        if (o.size > 1 && m != last) {
+#if RAPIDJSON_USE_MEMBERSMAP
+            new (&mit[mpos]) MapIterator(DropMapIterator(mit[&*last - members]));
+            mit[mpos]->second = mpos;
+#endif
+            *m = *last; // Move the last one to this place
+        }
+        else {
+            m->~Member(); // Only one left, just destroy
+        }
+        --o.size;
+        return m;
+    }
+
+    MemberIterator DoEraseMembers(ConstMemberIterator first, ConstMemberIterator last) {
+        ObjectData& o = data_.o;
+        MemberIterator beg = MemberBegin(),
+                       pos = beg + (first - beg),
+                       end = MemberEnd();
+#if RAPIDJSON_USE_MEMBERSMAP
+        Map* &map = GetMap(GetMembersPointer());
+        MapIterator* mit = GetMapIterators(map);
+#endif
+        for (MemberIterator itr = pos; itr != last; ++itr) {
+#if RAPIDJSON_USE_MEMBERSMAP
+            map->erase(DropMapIterator(mit[itr - beg]));
+#endif
+            itr->~Member();
+        }
+#if RAPIDJSON_USE_MEMBERSMAP
+        if (first != last) {
+            // Move remaining members/iterators
+            MemberIterator next = pos + (last - first);
+            for (MemberIterator itr = pos; next != end; ++itr, ++next) {
+                std::memcpy(static_cast<void*>(&*itr), &*next, sizeof(Member));
+                SizeType mpos = static_cast<SizeType>(itr - beg);
+                new (&mit[mpos]) MapIterator(DropMapIterator(mit[next - beg]));
+                mit[mpos]->second = mpos;
+            }
+        }
+#else
+        std::memmove(static_cast<void*>(&*pos), &*last,
+                     static_cast<size_t>(end - last) * sizeof(Member));
+#endif
+        o.size -= static_cast<SizeType>(last - first);
+        return pos;
+    }
+
+    template <typename SourceAllocator>
+    void DoCopyMembers(const GenericValue<Encoding,SourceAllocator>& rhs, Allocator& allocator, bool copyConstStrings) {
+        RAPIDJSON_ASSERT(rhs.GetType() == kObjectType);
+
+        data_.f.flags = kObjectFlag;
+        SizeType count = rhs.data_.o.size;
+        Member* lm = DoAllocMembers(count, allocator);
+        const typename GenericValue<Encoding,SourceAllocator>::Member* rm = rhs.GetMembersPointer();
+#if RAPIDJSON_USE_MEMBERSMAP
+        Map* &map = GetMap(lm);
+        MapIterator* mit = GetMapIterators(map);
+#endif
+        for (SizeType i = 0; i < count; i++) {
+            new (&lm[i].name) GenericValue(rm[i].name, allocator, copyConstStrings);
+            new (&lm[i].value) GenericValue(rm[i].value, allocator, copyConstStrings);
+#if RAPIDJSON_USE_MEMBERSMAP
+            new (&mit[i]) MapIterator(map->insert(MapPair(lm[i].name.data_, i)));
+#endif
+        }
+        data_.o.size = data_.o.capacity = count;
+        SetMembersPointer(lm);
+    }
+
     // Initialize this value as array with initial data, without calling destructor.
     void SetArrayRaw(GenericValue* values, SizeType count, Allocator& allocator) {
         data_.f.flags = kArrayFlag;
@@ -2129,9 +2415,16 @@ private:
     void SetObjectRaw(Member* members, SizeType count, Allocator& allocator) {
         data_.f.flags = kObjectFlag;
         if (count) {
-            Member* m = static_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
+            Member* m = DoAllocMembers(count, allocator);
             SetMembersPointer(m);
             std::memcpy(static_cast<void*>(m), members, count * sizeof(Member));
+#if RAPIDJSON_USE_MEMBERSMAP
+            Map* &map = GetMap(m);
+            MapIterator* mit = GetMapIterators(map);
+            for (SizeType i = 0; i < count; i++) {
+                new (&mit[i]) MapIterator(map->insert(MapPair(m[i].name.data_, i)));
+            }
+#endif
         }
         else
             SetMembersPointer(0);
@@ -2208,6 +2501,7 @@ public:
     typedef typename Encoding::Ch Ch;                       //!< Character type derived from Encoding.
     typedef GenericValue<Encoding, Allocator> ValueType;    //!< Value type of the document.
     typedef Allocator AllocatorType;                        //!< Allocator type from template parameter.
+    typedef StackAllocator StackAllocatorType;              //!< StackAllocator type from template parameter.
 
     //! Constructor
     /*! Creates an empty document of specified type.
@@ -2252,6 +2546,13 @@ public:
 #endif
 
     ~GenericDocument() {
+        // Clear the ::ValueType before ownAllocator is destroyed, ~ValueType()
+        // runs last and may access its elements or members which would be freed
+        // with an allocator like MemoryPoolAllocator (CrtAllocator does not
+        // free its data when destroyed, but MemoryPoolAllocator does).
+        if (ownAllocator_) {
+            ValueType::SetNull();
+        }
         Destroy();
     }
 
@@ -2734,4 +3035,9 @@ private:
 RAPIDJSON_NAMESPACE_END
 RAPIDJSON_DIAG_POP
 
+#ifdef RAPIDJSON_WINDOWS_GETOBJECT_WORKAROUND_APPLIED
+#pragma pop_macro("GetObject")
+#undef RAPIDJSON_WINDOWS_GETOBJECT_WORKAROUND_APPLIED
+#endif
+
 #endif // RAPIDJSON_DOCUMENT_H_
diff --git a/contrib/rapidjson/include/rapidjson/error/en.h b/contrib/rapidjson/include/rapidjson/error/en.h
index 5d2e57b7f..c87b04eb1 100644
--- a/contrib/rapidjson/include/rapidjson/error/en.h
+++ b/contrib/rapidjson/include/rapidjson/error/en.h
@@ -1,5 +1,5 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
-// 
+//
 // Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
@@ -7,9 +7,9 @@
 //
 // http://opensource.org/licenses/MIT
 //
-// 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 
+// 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 RAPIDJSON_ERROR_EN_H_
@@ -39,13 +39,13 @@ inline const RAPIDJSON_ERROR_CHARTYPE* GetParseError_En(ParseErrorCode parseErro
 
         case kParseErrorDocumentEmpty:                  return RAPIDJSON_ERROR_STRING("The document is empty.");
         case kParseErrorDocumentRootNotSingular:        return RAPIDJSON_ERROR_STRING("The document root must not be followed by other values.");
-    
+
         case kParseErrorValueInvalid:                   return RAPIDJSON_ERROR_STRING("Invalid value.");
-    
+
         case kParseErrorObjectMissName:                 return RAPIDJSON_ERROR_STRING("Missing a name for object member.");
         case kParseErrorObjectMissColon:                return RAPIDJSON_ERROR_STRING("Missing a colon after a name of object member.");
         case kParseErrorObjectMissCommaOrCurlyBracket:  return RAPIDJSON_ERROR_STRING("Missing a comma or '}' after an object member.");
-    
+
         case kParseErrorArrayMissCommaOrSquareBracket:  return RAPIDJSON_ERROR_STRING("Missing a comma or ']' after an array element.");
 
         case kParseErrorStringUnicodeEscapeInvalidHex:  return RAPIDJSON_ERROR_STRING("Incorrect hex digit after \\u escape in string.");
@@ -104,15 +104,69 @@ inline const RAPIDJSON_ERROR_CHARTYPE* GetValidateError_En(ValidateErrorCode val
         case kValidateErrorType:                        return RAPIDJSON_ERROR_STRING("Property has a type '%actual' that is not in the following list: '%expected'.");
 
         case kValidateErrorOneOf:                       return RAPIDJSON_ERROR_STRING("Property did not match any of the sub-schemas specified by 'oneOf', refer to following errors.");
-        case kValidateErrorOneOfMatch:                  return RAPIDJSON_ERROR_STRING("Property matched more than one of the sub-schemas specified by 'oneOf'.");
+        case kValidateErrorOneOfMatch:                  return RAPIDJSON_ERROR_STRING("Property matched more than one of the sub-schemas specified by 'oneOf', indices '%matches'.");
         case kValidateErrorAllOf:                       return RAPIDJSON_ERROR_STRING("Property did not match all of the sub-schemas specified by 'allOf', refer to following errors.");
         case kValidateErrorAnyOf:                       return RAPIDJSON_ERROR_STRING("Property did not match any of the sub-schemas specified by 'anyOf', refer to following errors.");
         case kValidateErrorNot:                         return RAPIDJSON_ERROR_STRING("Property matched the sub-schema specified by 'not'.");
 
+        case kValidateErrorReadOnly:                    return RAPIDJSON_ERROR_STRING("Property is read-only but has been provided when validation is for writing.");
+        case kValidateErrorWriteOnly:                   return RAPIDJSON_ERROR_STRING("Property is write-only but has been provided when validation is for reading.");
+
         default:                                        return RAPIDJSON_ERROR_STRING("Unknown error.");
     }
 }
 
+//! Maps error code of schema document compilation into error message.
+/*!
+    \ingroup RAPIDJSON_ERRORS
+    \param schemaErrorCode Error code obtained from compiling the schema document.
+    \return the error message.
+    \note User can make a copy of this function for localization.
+        Using switch-case is safer for future modification of error codes.
+*/
+  inline const RAPIDJSON_ERROR_CHARTYPE* GetSchemaError_En(SchemaErrorCode schemaErrorCode) {
+      switch (schemaErrorCode) {
+          case kSchemaErrorNone:                        return RAPIDJSON_ERROR_STRING("No error.");
+
+          case kSchemaErrorStartUnknown:                return RAPIDJSON_ERROR_STRING("Pointer '%value' to start of schema does not resolve to a location in the document.");
+          case kSchemaErrorRefPlainName:                return RAPIDJSON_ERROR_STRING("$ref fragment '%value' must be a JSON pointer.");
+          case kSchemaErrorRefInvalid:                  return RAPIDJSON_ERROR_STRING("$ref must not be an empty string.");
+          case kSchemaErrorRefPointerInvalid:           return RAPIDJSON_ERROR_STRING("$ref fragment '%value' is not a valid JSON pointer at offset '%offset'.");
+          case kSchemaErrorRefUnknown:                  return RAPIDJSON_ERROR_STRING("$ref '%value' does not resolve to a location in the target document.");
+          case kSchemaErrorRefCyclical:                 return RAPIDJSON_ERROR_STRING("$ref '%value' is cyclical.");
+          case kSchemaErrorRefNoRemoteProvider:         return RAPIDJSON_ERROR_STRING("$ref is remote but there is no remote provider.");
+          case kSchemaErrorRefNoRemoteSchema:           return RAPIDJSON_ERROR_STRING("$ref '%value' is remote but the remote provider did not return a schema.");
+          case kSchemaErrorRegexInvalid:                return RAPIDJSON_ERROR_STRING("Invalid regular expression '%value' in 'pattern' or 'patternProperties'.");
+          case kSchemaErrorSpecUnknown:                 return RAPIDJSON_ERROR_STRING("JSON schema draft or OpenAPI version is not recognized.");
+          case kSchemaErrorSpecUnsupported:             return RAPIDJSON_ERROR_STRING("JSON schema draft or OpenAPI version is not supported.");
+          case kSchemaErrorSpecIllegal:                 return RAPIDJSON_ERROR_STRING("Both JSON schema draft and OpenAPI version found in document.");
+          case kSchemaErrorReadOnlyAndWriteOnly:        return RAPIDJSON_ERROR_STRING("Property must not be both 'readOnly' and 'writeOnly'.");
+
+          default:                                      return RAPIDJSON_ERROR_STRING("Unknown error.");
+    }
+  }
+
+//! Maps error code of pointer parse into error message.
+/*!
+    \ingroup RAPIDJSON_ERRORS
+    \param pointerParseErrorCode Error code obtained from pointer parse.
+    \return the error message.
+    \note User can make a copy of this function for localization.
+        Using switch-case is safer for future modification of error codes.
+*/
+inline const RAPIDJSON_ERROR_CHARTYPE* GetPointerParseError_En(PointerParseErrorCode pointerParseErrorCode) {
+    switch (pointerParseErrorCode) {
+        case kPointerParseErrorNone:                       return RAPIDJSON_ERROR_STRING("No error.");
+
+        case kPointerParseErrorTokenMustBeginWithSolidus:  return RAPIDJSON_ERROR_STRING("A token must begin with a '/'.");
+        case kPointerParseErrorInvalidEscape:              return RAPIDJSON_ERROR_STRING("Invalid escape.");
+        case kPointerParseErrorInvalidPercentEncoding:     return RAPIDJSON_ERROR_STRING("Invalid percent encoding in URI fragment.");
+        case kPointerParseErrorCharacterMustPercentEncode: return RAPIDJSON_ERROR_STRING("A character must be percent encoded in a URI fragment.");
+
+        default:                                           return RAPIDJSON_ERROR_STRING("Unknown error.");
+    }
+}
+
 RAPIDJSON_NAMESPACE_END
 
 #ifdef __clang__
diff --git a/contrib/rapidjson/include/rapidjson/error/error.h b/contrib/rapidjson/include/rapidjson/error/error.h
index 6270da11a..cae345db3 100644
--- a/contrib/rapidjson/include/rapidjson/error/error.h
+++ b/contrib/rapidjson/include/rapidjson/error/error.h
@@ -1,5 +1,5 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
-// 
+//
 // Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
@@ -7,9 +7,9 @@
 //
 // http://opensource.org/licenses/MIT
 //
-// 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 
+// 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 RAPIDJSON_ERROR_ERROR_H_
@@ -42,7 +42,7 @@ RAPIDJSON_DIAG_OFF(padded)
 ///////////////////////////////////////////////////////////////////////////////
 // RAPIDJSON_ERROR_STRING
 
-//! Macro for converting string literial to \ref RAPIDJSON_ERROR_CHARTYPE[].
+//! Macro for converting string literal to \ref RAPIDJSON_ERROR_CHARTYPE[].
 /*! \ingroup RAPIDJSON_ERRORS
     By default this conversion macro does nothing.
     On Windows, user can define this macro as \c _T(x) for supporting both
@@ -185,14 +185,17 @@ enum ValidateErrorCode {
     kValidateErrorPatternProperties,           //!< See other errors.
     kValidateErrorDependencies,                //!< Object has missing property or schema dependencies.
 
-    kValidateErrorEnum,                        //!< Property has a value that is not one of its allowed enumerated values
-    kValidateErrorType,                        //!< Property has a type that is not allowed by the schema..
+    kValidateErrorEnum,                        //!< Property has a value that is not one of its allowed enumerated values.
+    kValidateErrorType,                        //!< Property has a type that is not allowed by the schema.
 
     kValidateErrorOneOf,                       //!< Property did not match any of the sub-schemas specified by 'oneOf'.
     kValidateErrorOneOfMatch,                  //!< Property matched more than one of the sub-schemas specified by 'oneOf'.
     kValidateErrorAllOf,                       //!< Property did not match all of the sub-schemas specified by 'allOf'.
     kValidateErrorAnyOf,                       //!< Property did not match any of the sub-schemas specified by 'anyOf'.
-    kValidateErrorNot                          //!< Property matched the sub-schema specified by 'not'.
+    kValidateErrorNot,                         //!< Property matched the sub-schema specified by 'not'.
+
+    kValidateErrorReadOnly,                    //!< Property is read-only but has been provided when validation is for writing
+    kValidateErrorWriteOnly                    //!< Property is write-only but has been provided when validation is for reading
 };
 
 //! Function pointer type of GetValidateError().
@@ -207,6 +210,72 @@ enum ValidateErrorCode {
 */
 typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetValidateErrorFunc)(ValidateErrorCode);
 
+///////////////////////////////////////////////////////////////////////////////
+// SchemaErrorCode
+
+//! Error codes when validating.
+/*! \ingroup RAPIDJSON_ERRORS
+    \see GenericSchemaValidator
+*/
+enum SchemaErrorCode {
+    kSchemaErrorNone = 0,                      //!< No error.
+
+    kSchemaErrorStartUnknown,                  //!< Pointer to start of schema does not resolve to a location in the document
+    kSchemaErrorRefPlainName,                  //!< $ref fragment must be a JSON pointer
+    kSchemaErrorRefInvalid,                    //!< $ref must not be an empty string
+    kSchemaErrorRefPointerInvalid,             //!< $ref fragment is not a valid JSON pointer at offset
+    kSchemaErrorRefUnknown,                    //!< $ref does not resolve to a location in the target document
+    kSchemaErrorRefCyclical,                   //!< $ref is cyclical
+    kSchemaErrorRefNoRemoteProvider,           //!< $ref is remote but there is no remote provider
+    kSchemaErrorRefNoRemoteSchema,             //!< $ref is remote but the remote provider did not return a schema
+    kSchemaErrorRegexInvalid,                  //!< Invalid regular expression in 'pattern' or 'patternProperties'
+    kSchemaErrorSpecUnknown,                   //!< JSON schema draft or OpenAPI version is not recognized
+    kSchemaErrorSpecUnsupported,               //!< JSON schema draft or OpenAPI version is not supported
+    kSchemaErrorSpecIllegal,                   //!< Both JSON schema draft and OpenAPI version found in document
+    kSchemaErrorReadOnlyAndWriteOnly           //!< Property must not be both 'readOnly' and 'writeOnly'
+};
+
+//! Function pointer type of GetSchemaError().
+/*! \ingroup RAPIDJSON_ERRORS
+
+    This is the prototype for \c GetSchemaError_X(), where \c X is a locale.
+    User can dynamically change locale in runtime, e.g.:
+\code
+    GetSchemaErrorFunc GetSchemaError = GetSchemaError_En; // or whatever
+    const RAPIDJSON_ERROR_CHARTYPE* s = GetSchemaError(validator.GetInvalidSchemaCode());
+\endcode
+*/
+typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetSchemaErrorFunc)(SchemaErrorCode);
+
+///////////////////////////////////////////////////////////////////////////////
+// PointerParseErrorCode
+
+//! Error code of JSON pointer parsing.
+/*! \ingroup RAPIDJSON_ERRORS
+    \see GenericPointer::GenericPointer, GenericPointer::GetParseErrorCode
+*/
+enum PointerParseErrorCode {
+    kPointerParseErrorNone = 0,                     //!< The parse is successful
+
+    kPointerParseErrorTokenMustBeginWithSolidus,    //!< A token must begin with a '/'
+    kPointerParseErrorInvalidEscape,                //!< Invalid escape
+    kPointerParseErrorInvalidPercentEncoding,       //!< Invalid percent encoding in URI fragment
+    kPointerParseErrorCharacterMustPercentEncode    //!< A character must percent encoded in URI fragment
+};
+
+//! Function pointer type of GetPointerParseError().
+/*! \ingroup RAPIDJSON_ERRORS
+
+    This is the prototype for \c GetPointerParseError_X(), where \c X is a locale.
+    User can dynamically change locale in runtime, e.g.:
+\code
+    GetPointerParseErrorFunc GetPointerParseError = GetPointerParseError_En; // or whatever
+    const RAPIDJSON_ERROR_CHARTYPE* s = GetPointerParseError(pointer.GetParseErrorCode());
+\endcode
+*/
+typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetPointerParseErrorFunc)(PointerParseErrorCode);
+
+
 RAPIDJSON_NAMESPACE_END
 
 #ifdef __clang__
diff --git a/contrib/rapidjson/include/rapidjson/internal/biginteger.h b/contrib/rapidjson/include/rapidjson/internal/biginteger.h
index 12455788f..4930043dc 100644
--- a/contrib/rapidjson/include/rapidjson/internal/biginteger.h
+++ b/contrib/rapidjson/include/rapidjson/internal/biginteger.h
@@ -19,7 +19,11 @@
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && defined(_M_AMD64)
 #include <intrin.h> // for _umul128
+#if !defined(_ARM64EC_)
 #pragma intrinsic(_umul128)
+#else
+#pragma comment(lib,"softintrin")
+#endif
 #endif
 
 RAPIDJSON_NAMESPACE_BEGIN
@@ -37,7 +41,8 @@ public:
         digits_[0] = u;
     }
 
-    BigInteger(const char* decimals, size_t length) : count_(1) {
+    template<typename Ch>
+    BigInteger(const Ch* decimals, size_t length) : count_(1) {
         RAPIDJSON_ASSERT(length > 0);
         digits_[0] = 0;
         size_t i = 0;
@@ -221,7 +226,8 @@ public:
     bool IsZero() const { return count_ == 1 && digits_[0] == 0; }
 
 private:
-    void AppendDecimal64(const char* begin, const char* end) {
+    template<typename Ch>
+    void AppendDecimal64(const Ch* begin, const Ch* end) {
         uint64_t u = ParseUint64(begin, end);
         if (IsZero())
             *this = u;
@@ -236,11 +242,12 @@ private:
         digits_[count_++] = digit;
     }
 
-    static uint64_t ParseUint64(const char* begin, const char* end) {
+    template<typename Ch>
+    static uint64_t ParseUint64(const Ch* begin, const Ch* end) {
         uint64_t r = 0;
-        for (const char* p = begin; p != end; ++p) {
-            RAPIDJSON_ASSERT(*p >= '0' && *p <= '9');
-            r = r * 10u + static_cast<unsigned>(*p - '0');
+        for (const Ch* p = begin; p != end; ++p) {
+            RAPIDJSON_ASSERT(*p >= Ch('0') && *p <= Ch('9'));
+            r = r * 10u + static_cast<unsigned>(*p - Ch('0'));
         }
         return r;
     }
@@ -252,7 +259,7 @@ private:
         if (low < k)
             (*outHigh)++;
         return low;
-#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
+#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
         __extension__ typedef unsigned __int128 uint128;
         uint128 p = static_cast<uint128>(a) * static_cast<uint128>(b);
         p += k;
diff --git a/contrib/rapidjson/include/rapidjson/internal/diyfp.h b/contrib/rapidjson/include/rapidjson/internal/diyfp.h
index a40797ec2..1f60fb60c 100644
--- a/contrib/rapidjson/include/rapidjson/internal/diyfp.h
+++ b/contrib/rapidjson/include/rapidjson/internal/diyfp.h
@@ -25,7 +25,11 @@
 
 #if defined(_MSC_VER) && defined(_M_AMD64) && !defined(__INTEL_COMPILER)
 #include <intrin.h>
+#if !defined(_ARM64EC_)
 #pragma intrinsic(_umul128)
+#else
+#pragma comment(lib,"softintrin")
+#endif
 #endif
 
 RAPIDJSON_NAMESPACE_BEGIN
@@ -75,7 +79,7 @@ struct DiyFp {
         if (l & (uint64_t(1) << 63)) // rounding
             h++;
         return DiyFp(h, e + rhs.e + 64);
-#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
+#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
         __extension__ typedef unsigned __int128 uint128;
         uint128 p = static_cast<uint128>(f) * static_cast<uint128>(rhs.f);
         uint64_t h = static_cast<uint64_t>(p >> 64);
diff --git a/contrib/rapidjson/include/rapidjson/internal/dtoa.h b/contrib/rapidjson/include/rapidjson/internal/dtoa.h
index 621402fd3..cd456721a 100644
--- a/contrib/rapidjson/include/rapidjson/internal/dtoa.h
+++ b/contrib/rapidjson/include/rapidjson/internal/dtoa.h
@@ -58,7 +58,11 @@ inline int CountDecimalDigit32(uint32_t n) {
 }
 
 inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buffer, int* len, int* K) {
-    static const uint32_t kPow10[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 };
+    static const uint64_t kPow10[] = { 1ULL, 10ULL, 100ULL, 1000ULL, 10000ULL, 100000ULL, 1000000ULL, 10000000ULL, 100000000ULL,
+                                       1000000000ULL, 10000000000ULL, 100000000000ULL, 1000000000000ULL,
+                                       10000000000000ULL, 100000000000000ULL, 1000000000000000ULL,
+                                       10000000000000000ULL, 100000000000000000ULL, 1000000000000000000ULL,
+                                       10000000000000000000ULL };
     const DiyFp one(uint64_t(1) << -Mp.e, Mp.e);
     const DiyFp wp_w = Mp - W;
     uint32_t p1 = static_cast<uint32_t>(Mp.f >> -one.e);
@@ -86,7 +90,7 @@ inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buff
         uint64_t tmp = (static_cast<uint64_t>(p1) << -one.e) + p2;
         if (tmp <= delta) {
             *K += kappa;
-            GrisuRound(buffer, *len, delta, tmp, static_cast<uint64_t>(kPow10[kappa]) << -one.e, wp_w.f);
+            GrisuRound(buffer, *len, delta, tmp, kPow10[kappa] << -one.e, wp_w.f);
             return;
         }
     }
@@ -103,7 +107,7 @@ inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buff
         if (p2 < delta) {
             *K += kappa;
             int index = -kappa;
-            GrisuRound(buffer, *len, delta, p2, one.f, wp_w.f * (index < 9 ? kPow10[index] : 0));
+            GrisuRound(buffer, *len, delta, p2, one.f, wp_w.f * (index < 20 ? kPow10[index] : 0));
             return;
         }
     }
diff --git a/contrib/rapidjson/include/rapidjson/internal/regex.h b/contrib/rapidjson/include/rapidjson/internal/regex.h
index 6446c403a..7740dcd52 100644
--- a/contrib/rapidjson/include/rapidjson/internal/regex.h
+++ b/contrib/rapidjson/include/rapidjson/internal/regex.h
@@ -615,7 +615,7 @@ public:
         RAPIDJSON_ASSERT(regex_.IsValid());
         if (!allocator_)
             ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
-        stateSet_ = static_cast<unsigned*>(allocator_->Malloc(GetStateSetSize()));
+        stateSet_ = static_cast<uint32_t*>(allocator_->Malloc(GetStateSetSize()));
         state0_.template Reserve<SizeType>(regex_.stateCount_);
         state1_.template Reserve<SizeType>(regex_.stateCount_);
     }
diff --git a/contrib/rapidjson/include/rapidjson/internal/strfunc.h b/contrib/rapidjson/include/rapidjson/internal/strfunc.h
index baecb6cc8..b698a8f43 100644
--- a/contrib/rapidjson/include/rapidjson/internal/strfunc.h
+++ b/contrib/rapidjson/include/rapidjson/internal/strfunc.h
@@ -45,6 +45,20 @@ inline SizeType StrLen(const wchar_t* s) {
     return SizeType(std::wcslen(s));
 }
 
+//! Custom strcmpn() which works on different character types.
+/*! \tparam Ch Character type (e.g. char, wchar_t, short)
+    \param s1 Null-terminated input string.
+    \param s2 Null-terminated input string.
+    \return 0 if equal
+*/
+template<typename Ch>
+inline int StrCmp(const Ch* s1, const Ch* s2) {
+    RAPIDJSON_ASSERT(s1 != 0);
+    RAPIDJSON_ASSERT(s2 != 0);
+    while(*s1 && (*s1 == *s2)) { s1++; s2++; }
+    return static_cast<unsigned>(*s1) < static_cast<unsigned>(*s2) ? -1 : static_cast<unsigned>(*s1) > static_cast<unsigned>(*s2);
+}
+
 //! Returns number of code points in a encoded string.
 template<typename Encoding>
 bool CountStringCodePoint(const typename Encoding::Ch* s, SizeType length, SizeType* outCount) {
diff --git a/contrib/rapidjson/include/rapidjson/internal/strtod.h b/contrib/rapidjson/include/rapidjson/internal/strtod.h
index d61a67a49..55f0e380b 100644
--- a/contrib/rapidjson/include/rapidjson/internal/strtod.h
+++ b/contrib/rapidjson/include/rapidjson/internal/strtod.h
@@ -128,17 +128,18 @@ inline bool StrtodFast(double d, int p, double* result) {
 }
 
 // Compute an approximation and see if it is within 1/2 ULP
-inline bool StrtodDiyFp(const char* decimals, int dLen, int dExp, double* result) {
+template<typename Ch>
+inline bool StrtodDiyFp(const Ch* decimals, int dLen, int dExp, double* result) {
     uint64_t significand = 0;
     int i = 0;   // 2^64 - 1 = 18446744073709551615, 1844674407370955161 = 0x1999999999999999    
     for (; i < dLen; i++) {
         if (significand  >  RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) ||
-            (significand == RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) && decimals[i] > '5'))
+            (significand == RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) && decimals[i] > Ch('5')))
             break;
-        significand = significand * 10u + static_cast<unsigned>(decimals[i] - '0');
+        significand = significand * 10u + static_cast<unsigned>(decimals[i] - Ch('0'));
     }
     
-    if (i < dLen && decimals[i] >= '5') // Rounding
+    if (i < dLen && decimals[i] >= Ch('5')) // Rounding
         significand++;
 
     int remaining = dLen - i;
@@ -205,7 +206,8 @@ inline bool StrtodDiyFp(const char* decimals, int dLen, int dExp, double* result
     return halfWay - static_cast<unsigned>(error) >= precisionBits || precisionBits >= halfWay + static_cast<unsigned>(error);
 }
 
-inline double StrtodBigInteger(double approx, const char* decimals, int dLen, int dExp) {
+template<typename Ch>
+inline double StrtodBigInteger(double approx, const Ch* decimals, int dLen, int dExp) {
     RAPIDJSON_ASSERT(dLen >= 0);
     const BigInteger dInt(decimals, static_cast<unsigned>(dLen));
     Double a(approx);
@@ -223,7 +225,8 @@ inline double StrtodBigInteger(double approx, const char* decimals, int dLen, in
         return a.NextPositiveDouble();
 }
 
-inline double StrtodFullPrecision(double d, int p, const char* decimals, size_t length, size_t decimalPosition, int exp) {
+template<typename Ch>
+inline double StrtodFullPrecision(double d, int p, const Ch* decimals, size_t length, size_t decimalPosition, int exp) {
     RAPIDJSON_ASSERT(d >= 0.0);
     RAPIDJSON_ASSERT(length >= 1);
 
diff --git a/contrib/rapidjson/include/rapidjson/pointer.h b/contrib/rapidjson/include/rapidjson/pointer.h
index 90e5903bc..6f4ef3892 100644
--- a/contrib/rapidjson/include/rapidjson/pointer.h
+++ b/contrib/rapidjson/include/rapidjson/pointer.h
@@ -16,7 +16,9 @@
 #define RAPIDJSON_POINTER_H_
 
 #include "document.h"
+#include "uri.h"
 #include "internal/itoa.h"
+#include "error/error.h" // PointerParseErrorCode
 
 #ifdef __clang__
 RAPIDJSON_DIAG_PUSH
@@ -30,19 +32,6 @@ RAPIDJSON_NAMESPACE_BEGIN
 
 static const SizeType kPointerInvalidIndex = ~SizeType(0);  //!< Represents an invalid index in GenericPointer::Token
 
-//! Error code of parsing.
-/*! \ingroup RAPIDJSON_ERRORS
-    \see GenericPointer::GenericPointer, GenericPointer::GetParseErrorCode
-*/
-enum PointerParseErrorCode {
-    kPointerParseErrorNone = 0,                     //!< The parse is successful
-
-    kPointerParseErrorTokenMustBeginWithSolidus,    //!< A token must begin with a '/'
-    kPointerParseErrorInvalidEscape,                //!< Invalid escape
-    kPointerParseErrorInvalidPercentEncoding,       //!< Invalid percent encoding in URI fragment
-    kPointerParseErrorCharacterMustPercentEncode    //!< A character must percent encoded in URI fragment
-};
-
 ///////////////////////////////////////////////////////////////////////////////
 // GenericPointer
 
@@ -68,10 +57,10 @@ enum PointerParseErrorCode {
     supplied tokens eliminates these.
 
     GenericPointer depends on GenericDocument and GenericValue.
-    
+
     \tparam ValueType The value type of the DOM tree. E.g. GenericValue<UTF8<> >
     \tparam Allocator The allocator type for allocating memory for internal representation.
-    
+
     \note GenericPointer uses same encoding of ValueType.
     However, Allocator of GenericPointer is independent of Allocator of Value.
 */
@@ -80,8 +69,10 @@ class GenericPointer {
 public:
     typedef typename ValueType::EncodingType EncodingType;  //!< Encoding type from Value
     typedef typename ValueType::Ch Ch;                      //!< Character type from Value
+    typedef GenericUri<ValueType, Allocator> UriType;
 
-    //! A token is the basic units of internal representation.
+
+  //! A token is the basic units of internal representation.
     /*!
         A JSON pointer string representation "/foo/123" is parsed to two tokens: 
         "foo" and 123. 123 will be represented in both numeric form and string form.
@@ -163,7 +154,7 @@ public:
     GenericPointer(const Token* tokens, size_t tokenCount) : allocator_(), ownAllocator_(), nameBuffer_(), tokens_(const_cast<Token*>(tokens)), tokenCount_(tokenCount), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {}
 
     //! Copy constructor.
-    GenericPointer(const GenericPointer& rhs) : allocator_(rhs.allocator_), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
+    GenericPointer(const GenericPointer& rhs) : allocator_(), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
         *this = rhs;
     }
 
@@ -520,6 +511,70 @@ public:
 
     //@}
 
+    //!@name Compute URI
+    //@{
+
+    //! Compute the in-scope URI for a subtree.
+    //  For use with JSON pointers into JSON schema documents.
+    /*!
+        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
+        \param rootUri Root URI
+        \param unresolvedTokenIndex If the pointer cannot resolve a token in the pointer, this parameter can obtain the index of unresolved token.
+        \param allocator Allocator for Uris
+        \return Uri if it can be resolved. Otherwise null.
+
+        \note
+        There are only 3 situations when a URI cannot be resolved:
+        1. A value in the path is not an array nor object.
+        2. An object value does not contain the token.
+        3. A token is out of range of an array value.
+
+        Use unresolvedTokenIndex to retrieve the token index.
+    */
+    UriType GetUri(ValueType& root, const UriType& rootUri, size_t* unresolvedTokenIndex = 0, Allocator* allocator = 0) const {
+        static const Ch kIdString[] = { 'i', 'd', '\0' };
+        static const ValueType kIdValue(kIdString, 2);
+        UriType base = UriType(rootUri, allocator);
+        RAPIDJSON_ASSERT(IsValid());
+        ValueType* v = &root;
+        for (const Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
+            switch (v->GetType()) {
+                case kObjectType:
+                {
+                    // See if we have an id, and if so resolve with the current base
+                    typename ValueType::MemberIterator m = v->FindMember(kIdValue);
+                    if (m != v->MemberEnd() && (m->value).IsString()) {
+                        UriType here = UriType(m->value, allocator).Resolve(base, allocator);
+                        base = here;
+                    }
+                    m = v->FindMember(GenericValue<EncodingType>(GenericStringRef<Ch>(t->name, t->length)));
+                    if (m == v->MemberEnd())
+                        break;
+                    v = &m->value;
+                }
+                  continue;
+                case kArrayType:
+                    if (t->index == kPointerInvalidIndex || t->index >= v->Size())
+                        break;
+                    v = &((*v)[t->index]);
+                    continue;
+                default:
+                    break;
+            }
+
+            // Error: unresolved token
+            if (unresolvedTokenIndex)
+                *unresolvedTokenIndex = static_cast<size_t>(t - tokens_);
+            return UriType(allocator);
+        }
+        return base;
+    }
+
+    UriType GetUri(const ValueType& root, const UriType& rootUri, size_t* unresolvedTokenIndex = 0, Allocator* allocator = 0) const {
+      return GetUri(const_cast<ValueType&>(root), rootUri, unresolvedTokenIndex, allocator);
+    }
+
+
     //!@name Query value
     //@{
 
@@ -634,7 +689,7 @@ public:
     ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const Ch* defaultValue) const {
         return GetWithDefault(document, defaultValue, document.GetAllocator());
     }
-    
+
 #if RAPIDJSON_HAS_STDSTRING
     //! Query a value in a document with default std::basic_string.
     template <typename stackAllocator>
@@ -835,10 +890,16 @@ private:
             std::memcpy(nameBuffer_, rhs.nameBuffer_, nameBufferSize * sizeof(Ch));
         }
 
-        // Adjust pointers to name buffer
-        std::ptrdiff_t diff = nameBuffer_ - rhs.nameBuffer_;
-        for (Token *t = tokens_; t != tokens_ + rhs.tokenCount_; ++t)
-            t->name += diff;
+        // The names of each token point to a string in the nameBuffer_. The
+        // previous memcpy copied over string pointers into the rhs.nameBuffer_,
+        // but they should point to the strings in the new nameBuffer_.
+        for (size_t i = 0; i < rhs.tokenCount_; ++i) {
+          // The offset between the string address and the name buffer should
+          // still be constant, so we can just get this offset and set each new
+          // token name according the new buffer start + the known offset.
+          std::ptrdiff_t name_offset = rhs.tokens_[i].name - rhs.nameBuffer_;
+          tokens_[i].name = nameBuffer_ + name_offset;
+        }
 
         return nameBuffer_ + nameBufferSize;
     }
@@ -928,7 +989,7 @@ private:
                 }
 
                 i++;
-                
+
                 // Escaping "~0" -> '~', "~1" -> '/'
                 if (c == '~') {
                     if (i < length) {
diff --git a/contrib/rapidjson/include/rapidjson/rapidjson.h b/contrib/rapidjson/include/rapidjson/rapidjson.h
index 78aa89a0e..5ea694795 100644
--- a/contrib/rapidjson/include/rapidjson/rapidjson.h
+++ b/contrib/rapidjson/include/rapidjson/rapidjson.h
@@ -1,5 +1,5 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
-// 
+//
 // Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
@@ -7,9 +7,9 @@
 //
 // http://opensource.org/licenses/MIT
 //
-// 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 
+// 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 RAPIDJSON_RAPIDJSON_H_
@@ -17,7 +17,7 @@
 
 /*!\file rapidjson.h
     \brief common definitions and configuration
-    
+
     \see RAPIDJSON_CONFIG
  */
 
@@ -124,6 +124,19 @@
 #define RAPIDJSON_NAMESPACE_END }
 #endif
 
+///////////////////////////////////////////////////////////////////////////////
+// __cplusplus macro
+
+//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
+
+#if defined(_MSC_VER)
+#define RAPIDJSON_CPLUSPLUS _MSVC_LANG
+#else
+#define RAPIDJSON_CPLUSPLUS __cplusplus
+#endif
+
+//!@endcond
+
 ///////////////////////////////////////////////////////////////////////////////
 // RAPIDJSON_HAS_STDSTRING
 
@@ -149,6 +162,24 @@
 #include <string>
 #endif // RAPIDJSON_HAS_STDSTRING
 
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_USE_MEMBERSMAP
+
+/*! \def RAPIDJSON_USE_MEMBERSMAP
+    \ingroup RAPIDJSON_CONFIG
+    \brief Enable RapidJSON support for object members handling in a \c std::multimap
+
+    By defining this preprocessor symbol to \c 1, \ref rapidjson::GenericValue object
+    members are stored in a \c std::multimap for faster lookup and deletion times, a
+    trade off with a slightly slower insertion time and a small object allocat(or)ed
+    memory overhead.
+
+    \hideinitializer
+*/
+#ifndef RAPIDJSON_USE_MEMBERSMAP
+#define RAPIDJSON_USE_MEMBERSMAP 0 // not by default
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 // RAPIDJSON_NO_INT64DEFINE
 
@@ -164,7 +195,7 @@
 */
 #ifndef RAPIDJSON_NO_INT64DEFINE
 //!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#if defined(_MSC_VER) && (_MSC_VER < 1800)	// Visual Studio 2013
+#if defined(_MSC_VER) && (_MSC_VER < 1800) // Visual Studio 2013
 #include "msinttypes/stdint.h"
 #include "msinttypes/inttypes.h"
 #else
@@ -246,7 +277,7 @@
 #  elif defined(RAPIDJSON_DOXYGEN_RUNNING)
 #    define RAPIDJSON_ENDIAN
 #  else
-#    error Unknown machine endianness detected. User needs to define RAPIDJSON_ENDIAN.   
+#    error Unknown machine endianness detected. User needs to define RAPIDJSON_ENDIAN.
 #  endif
 #endif // RAPIDJSON_ENDIAN
 
@@ -411,7 +442,7 @@ RAPIDJSON_NAMESPACE_END
 
 // Prefer C++11 static_assert, if available
 #ifndef RAPIDJSON_STATIC_ASSERT
-#if __cplusplus >= 201103L || ( defined(_MSC_VER) && _MSC_VER >= 1800 )
+#if RAPIDJSON_CPLUSPLUS >= 201103L || ( defined(_MSC_VER) && _MSC_VER >= 1800 )
 #define RAPIDJSON_STATIC_ASSERT(x) \
    static_assert(x, RAPIDJSON_STRINGIFY(x))
 #endif // C++11
@@ -482,7 +513,7 @@ RAPIDJSON_NAMESPACE_END
 
 //!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
 
-#define RAPIDJSON_MULTILINEMACRO_BEGIN do {  
+#define RAPIDJSON_MULTILINEMACRO_BEGIN do {
 #define RAPIDJSON_MULTILINEMACRO_END \
 } while((void)0, 0)
 
@@ -541,8 +572,14 @@ RAPIDJSON_NAMESPACE_END
 ///////////////////////////////////////////////////////////////////////////////
 // C++11 features
 
+#ifndef RAPIDJSON_HAS_CXX11
+#define RAPIDJSON_HAS_CXX11 (RAPIDJSON_CPLUSPLUS >= 201103L)
+#endif
+
 #ifndef RAPIDJSON_HAS_CXX11_RVALUE_REFS
-#if defined(__clang__)
+#if RAPIDJSON_HAS_CXX11
+#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 1
+#elif defined(__clang__)
 #if __has_feature(cxx_rvalue_references) && \
     (defined(_MSC_VER) || defined(_LIBCPP_VERSION) || defined(__GLIBCXX__) && __GLIBCXX__ >= 20080306)
 #define RAPIDJSON_HAS_CXX11_RVALUE_REFS 1
@@ -559,8 +596,14 @@ RAPIDJSON_NAMESPACE_END
 #endif
 #endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
 
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+#include <utility> // std::move
+#endif
+
 #ifndef RAPIDJSON_HAS_CXX11_NOEXCEPT
-#if defined(__clang__)
+#if RAPIDJSON_HAS_CXX11
+#define RAPIDJSON_HAS_CXX11_NOEXCEPT 1
+#elif defined(__clang__)
 #define RAPIDJSON_HAS_CXX11_NOEXCEPT __has_feature(cxx_noexcept)
 #elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,6,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
     (defined(_MSC_VER) && _MSC_VER >= 1900) || \
@@ -570,11 +613,13 @@ RAPIDJSON_NAMESPACE_END
 #define RAPIDJSON_HAS_CXX11_NOEXCEPT 0
 #endif
 #endif
+#ifndef RAPIDJSON_NOEXCEPT
 #if RAPIDJSON_HAS_CXX11_NOEXCEPT
 #define RAPIDJSON_NOEXCEPT noexcept
 #else
-#define RAPIDJSON_NOEXCEPT /* noexcept */
+#define RAPIDJSON_NOEXCEPT throw()
 #endif // RAPIDJSON_HAS_CXX11_NOEXCEPT
+#endif
 
 // no automatic detection, yet
 #ifndef RAPIDJSON_HAS_CXX11_TYPETRAITS
@@ -600,9 +645,17 @@ RAPIDJSON_NAMESPACE_END
 ///////////////////////////////////////////////////////////////////////////////
 // C++17 features
 
-#if defined(__has_cpp_attribute)
-# if __has_cpp_attribute(fallthrough)
-#  define RAPIDJSON_DELIBERATE_FALLTHROUGH [[fallthrough]]
+#ifndef RAPIDJSON_HAS_CXX17
+#define RAPIDJSON_HAS_CXX17 (RAPIDJSON_CPLUSPLUS >= 201703L)
+#endif
+
+#if RAPIDJSON_HAS_CXX17
+# define RAPIDJSON_DELIBERATE_FALLTHROUGH [[fallthrough]]
+#elif defined(__has_cpp_attribute)
+# if __has_cpp_attribute(clang::fallthrough)
+#  define RAPIDJSON_DELIBERATE_FALLTHROUGH [[clang::fallthrough]]
+# elif __has_cpp_attribute(fallthrough)
+#  define RAPIDJSON_DELIBERATE_FALLTHROUGH __attribute__((fallthrough))
 # else
 #  define RAPIDJSON_DELIBERATE_FALLTHROUGH
 # endif
@@ -628,12 +681,8 @@ RAPIDJSON_NAMESPACE_END
 
 #ifndef RAPIDJSON_NOEXCEPT_ASSERT
 #ifdef RAPIDJSON_ASSERT_THROWS
-#if RAPIDJSON_HAS_CXX11_NOEXCEPT
-#define RAPIDJSON_NOEXCEPT_ASSERT(x)
-#else
 #include <cassert>
 #define RAPIDJSON_NOEXCEPT_ASSERT(x) assert(x)
-#endif // RAPIDJSON_HAS_CXX11_NOEXCEPT
 #else
 #define RAPIDJSON_NOEXCEPT_ASSERT(x) RAPIDJSON_ASSERT(x)
 #endif // RAPIDJSON_ASSERT_THROWS
@@ -682,7 +731,7 @@ enum Type {
     kFalseType = 1,     //!< false
     kTrueType = 2,      //!< true
     kObjectType = 3,    //!< object
-    kArrayType = 4,     //!< array 
+    kArrayType = 4,     //!< array
     kStringType = 5,    //!< string
     kNumberType = 6     //!< number
 };
diff --git a/contrib/rapidjson/include/rapidjson/reader.h b/contrib/rapidjson/include/rapidjson/reader.h
index 09ace4eba..55546601e 100644
--- a/contrib/rapidjson/include/rapidjson/reader.h
+++ b/contrib/rapidjson/include/rapidjson/reader.h
@@ -1404,11 +1404,11 @@ private:
     }
 #endif // RAPIDJSON_NEON
 
-    template<typename InputStream, bool backup, bool pushOnTake>
+    template<typename InputStream, typename StackCharacter, bool backup, bool pushOnTake>
     class NumberStream;
 
-    template<typename InputStream>
-    class NumberStream<InputStream, false, false> {
+    template<typename InputStream, typename StackCharacter>
+    class NumberStream<InputStream, StackCharacter, false, false> {
     public:
         typedef typename InputStream::Ch Ch;
 
@@ -1421,7 +1421,7 @@ private:
 
         size_t Tell() { return is.Tell(); }
         size_t Length() { return 0; }
-        const char* Pop() { return 0; }
+        const StackCharacter* Pop() { return 0; }
 
     protected:
         NumberStream& operator=(const NumberStream&);
@@ -1429,45 +1429,47 @@ private:
         InputStream& is;
     };
 
-    template<typename InputStream>
-    class NumberStream<InputStream, true, false> : public NumberStream<InputStream, false, false> {
-        typedef NumberStream<InputStream, false, false> Base;
+    template<typename InputStream, typename StackCharacter>
+    class NumberStream<InputStream, StackCharacter, true, false> : public NumberStream<InputStream, StackCharacter, false, false> {
+        typedef NumberStream<InputStream, StackCharacter, false, false> Base;
     public:
-        NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is), stackStream(reader.stack_) {}
+        NumberStream(GenericReader& reader, InputStream& s) : Base(reader, s), stackStream(reader.stack_) {}
 
         RAPIDJSON_FORCEINLINE Ch TakePush() {
-            stackStream.Put(static_cast<char>(Base::is.Peek()));
+            stackStream.Put(static_cast<StackCharacter>(Base::is.Peek()));
             return Base::is.Take();
         }
 
-        RAPIDJSON_FORCEINLINE void Push(char c) {
+        RAPIDJSON_FORCEINLINE void Push(StackCharacter c) {
             stackStream.Put(c);
         }
 
         size_t Length() { return stackStream.Length(); }
 
-        const char* Pop() {
+        const StackCharacter* Pop() {
             stackStream.Put('\0');
             return stackStream.Pop();
         }
 
     private:
-        StackStream<char> stackStream;
+        StackStream<StackCharacter> stackStream;
     };
 
-    template<typename InputStream>
-    class NumberStream<InputStream, true, true> : public NumberStream<InputStream, true, false> {
-        typedef NumberStream<InputStream, true, false> Base;
+    template<typename InputStream, typename StackCharacter>
+    class NumberStream<InputStream, StackCharacter, true, true> : public NumberStream<InputStream, StackCharacter, true, false> {
+        typedef NumberStream<InputStream, StackCharacter, true, false> Base;
     public:
-        NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is) {}
+        NumberStream(GenericReader& reader, InputStream& s) : Base(reader, s) {}
 
         RAPIDJSON_FORCEINLINE Ch Take() { return Base::TakePush(); }
     };
 
     template<unsigned parseFlags, typename InputStream, typename Handler>
     void ParseNumber(InputStream& is, Handler& handler) {
+        typedef typename internal::SelectIf<internal::BoolType<(parseFlags & kParseNumbersAsStringsFlag) != 0>, typename TargetEncoding::Ch, char>::Type NumberCharacter;
+
         internal::StreamLocalCopy<InputStream> copy(is);
-        NumberStream<InputStream,
+        NumberStream<InputStream, NumberCharacter,
             ((parseFlags & kParseNumbersAsStringsFlag) != 0) ?
                 ((parseFlags & kParseInsituFlag) == 0) :
                 ((parseFlags & kParseFullPrecisionFlag) != 0),
@@ -1692,10 +1694,10 @@ private:
             }
             else {
                 SizeType numCharsToCopy = static_cast<SizeType>(s.Length());
-                StringStream srcStream(s.Pop());
+                GenericStringStream<UTF8<NumberCharacter> > srcStream(s.Pop());
                 StackStream<typename TargetEncoding::Ch> dstStream(stack_);
                 while (numCharsToCopy--) {
-                    Transcoder<UTF8<>, TargetEncoding>::Transcode(srcStream, dstStream);
+                    Transcoder<UTF8<typename TargetEncoding::Ch>, TargetEncoding>::Transcode(srcStream, dstStream);
                 }
                 dstStream.Put('\0');
                 const typename TargetEncoding::Ch* str = dstStream.Pop();
@@ -1705,7 +1707,7 @@ private:
         }
         else {
            size_t length = s.Length();
-           const char* decimal = s.Pop();  // Pop stack no matter if it will be used or not.
+           const NumberCharacter* decimal = s.Pop();  // Pop stack no matter if it will be used or not.
 
            if (useDouble) {
                int p = exp + expFrac;
diff --git a/contrib/rapidjson/include/rapidjson/schema.h b/contrib/rapidjson/include/rapidjson/schema.h
index 11f716096..02a6d0f9e 100644
--- a/contrib/rapidjson/include/rapidjson/schema.h
+++ b/contrib/rapidjson/include/rapidjson/schema.h
@@ -1,5 +1,5 @@
 // Tencent is pleased to support the open source community by making RapidJSON available->
-// 
+//
 // Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip-> All rights reserved->
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
@@ -7,9 +7,9 @@
 //
 // http://opensource->org/licenses/MIT
 //
-// 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 
+// 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 RAPIDJSON_SCHEMA_H_
@@ -19,17 +19,14 @@
 #include "pointer.h"
 #include "stringbuffer.h"
 #include "error/en.h"
+#include "uri.h"
 #include <cmath> // abs, floor
 
 #if !defined(RAPIDJSON_SCHEMA_USE_INTERNALREGEX)
 #define RAPIDJSON_SCHEMA_USE_INTERNALREGEX 1
-#else
-#define RAPIDJSON_SCHEMA_USE_INTERNALREGEX 0
 #endif
 
-#if !RAPIDJSON_SCHEMA_USE_INTERNALREGEX && defined(RAPIDJSON_SCHEMA_USE_STDREGEX) && (__cplusplus >=201103L || (defined(_MSC_VER) && _MSC_VER >= 1800))
-#define RAPIDJSON_SCHEMA_USE_STDREGEX 1
-#else
+#if !defined(RAPIDJSON_SCHEMA_USE_STDREGEX) || !(__cplusplus >=201103L || (defined(_MSC_VER) && _MSC_VER >= 1800))
 #define RAPIDJSON_SCHEMA_USE_STDREGEX 0
 #endif
 
@@ -49,10 +46,6 @@
 #define RAPIDJSON_SCHEMA_VERBOSE 0
 #endif
 
-#if RAPIDJSON_SCHEMA_VERBOSE
-#include "stringbuffer.h"
-#endif
-
 RAPIDJSON_DIAG_PUSH
 
 #if defined(__GNUC__)
@@ -77,48 +70,94 @@ RAPIDJSON_NAMESPACE_BEGIN
 
 namespace internal {
 
-inline void PrintInvalidKeyword(const char* keyword) {
-    printf("Fail keyword: %s\n", keyword);
+inline void PrintInvalidKeywordData(const char* keyword) {
+    printf("    Fail keyword: '%s'\n", keyword);
 }
 
-inline void PrintInvalidKeyword(const wchar_t* keyword) {
-    wprintf(L"Fail keyword: %ls\n", keyword);
+inline void PrintInvalidKeywordData(const wchar_t* keyword) {
+    wprintf(L"    Fail keyword: '%ls'\n", keyword);
 }
 
-inline void PrintInvalidDocument(const char* document) {
-    printf("Fail document: %s\n\n", document);
+inline void PrintInvalidDocumentData(const char* document) {
+    printf("    Fail document: '%s'\n", document);
 }
 
-inline void PrintInvalidDocument(const wchar_t* document) {
-    wprintf(L"Fail document: %ls\n\n", document);
+inline void PrintInvalidDocumentData(const wchar_t* document) {
+    wprintf(L"    Fail document: '%ls'\n", document);
 }
 
-inline void PrintValidatorPointers(unsigned depth, const char* s, const char* d) {
-    printf("S: %*s%s\nD: %*s%s\n\n", depth * 4, " ", s, depth * 4, " ", d);
+inline void PrintValidatorPointersData(const char* s, const char* d, unsigned depth) {
+    printf("    Sch: %*s'%s'\n    Doc: %*s'%s'\n", depth * 4, " ", s, depth * 4, " ", d);
 }
 
-inline void PrintValidatorPointers(unsigned depth, const wchar_t* s, const wchar_t* d) {
-    wprintf(L"S: %*ls%ls\nD: %*ls%ls\n\n", depth * 4, L" ", s, depth * 4, L" ", d);
+inline void PrintValidatorPointersData(const wchar_t* s, const wchar_t* d, unsigned depth) {
+    wprintf(L"    Sch: %*ls'%ls'\n    Doc: %*ls'%ls'\n", depth * 4, L" ", s, depth * 4, L" ", d);
+}
+
+inline void PrintSchemaIdsData(const char* base, const char* local, const char* resolved) {
+    printf("    Resolving id: Base: '%s', Local: '%s', Resolved: '%s'\n", base, local, resolved);
+}
+
+inline void PrintSchemaIdsData(const wchar_t* base, const wchar_t* local, const wchar_t* resolved) {
+    wprintf(L"    Resolving id: Base: '%ls', Local: '%ls', Resolved: '%ls'\n", base, local, resolved);
+}
+
+inline void PrintMethodData(const char* method) {
+    printf("%s\n", method);
+}
+
+inline void PrintMethodData(const char* method, bool b) {
+    printf("%s, Data: '%s'\n", method, b ? "true" : "false");
+}
+
+inline void PrintMethodData(const char* method, int64_t i) {
+    printf("%s, Data: '%" PRId64 "'\n", method, i);
+}
+
+inline void PrintMethodData(const char* method, uint64_t u) {
+    printf("%s, Data: '%" PRIu64 "'\n", method, u);
+}
+
+inline void PrintMethodData(const char* method, double d) {
+    printf("%s, Data: '%lf'\n", method, d);
+}
+
+inline void PrintMethodData(const char* method, const char* s) {
+    printf("%s, Data: '%s'\n", method, s);
+}
+
+inline void PrintMethodData(const char* method, const wchar_t* s) {
+    wprintf(L"%hs, Data: '%ls'\n", method, s);
+}
+
+inline void PrintMethodData(const char* method, const char* s1, const char* s2) {
+    printf("%s, Data: '%s', '%s'\n", method, s1, s2);
+}
+
+inline void PrintMethodData(const char* method, const wchar_t* s1, const wchar_t* s2) {
+    wprintf(L"%hs, Data: '%ls', '%ls'\n", method, s1, s2);
 }
 
 } // namespace internal
 
 #endif // RAPIDJSON_SCHEMA_VERBOSE
 
+#ifndef RAPIDJSON_SCHEMA_PRINT
+#if RAPIDJSON_SCHEMA_VERBOSE
+#define RAPIDJSON_SCHEMA_PRINT(name, ...) internal::Print##name##Data(__VA_ARGS__)
+#else
+#define RAPIDJSON_SCHEMA_PRINT(name, ...)
+#endif
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 // RAPIDJSON_INVALID_KEYWORD_RETURN
 
-#if RAPIDJSON_SCHEMA_VERBOSE
-#define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword) internal::PrintInvalidKeyword(keyword)
-#else
-#define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword)
-#endif
-
 #define RAPIDJSON_INVALID_KEYWORD_RETURN(code)\
 RAPIDJSON_MULTILINEMACRO_BEGIN\
     context.invalidCode = code;\
     context.invalidKeyword = SchemaType::GetValidateErrorKeyword(code).GetString();\
-    RAPIDJSON_INVALID_KEYWORD_VERBOSE(context.invalidKeyword);\
+    RAPIDJSON_SCHEMA_PRINT(InvalidKeyword, context.invalidKeyword);\
     return false;\
 RAPIDJSON_MULTILINEMACRO_END
 
@@ -136,14 +175,56 @@ RAPIDJSON_MULTILINEMACRO_END
 #endif
 
 //! Combination of validate flags
-/*! \see
- */
 enum ValidateFlag {
     kValidateNoFlags = 0,                                       //!< No flags are set.
     kValidateContinueOnErrorFlag = 1,                           //!< Don't stop after first validation error.
+    kValidateReadFlag = 2,                                      //!< Validation is for a read semantic.
+    kValidateWriteFlag = 4,                                     //!< Validation is for a write semantic.
     kValidateDefaultFlags = RAPIDJSON_VALIDATE_DEFAULT_FLAGS    //!< Default validate flags. Can be customized by defining RAPIDJSON_VALIDATE_DEFAULT_FLAGS
 };
 
+///////////////////////////////////////////////////////////////////////////////
+// Specification
+enum SchemaDraft {
+    kDraftUnknown = -1,
+    kDraftNone = 0,
+    kDraft03 = 3,
+    kDraftMin = 4,                       //!< Current minimum supported draft
+    kDraft04 = 4,
+    kDraft05 = 5,
+    kDraftMax = 5,                       //!< Current maximum supported draft
+    kDraft06 = 6,
+    kDraft07 = 7,
+    kDraft2019_09 = 8,
+    kDraft2020_12 = 9
+};
+
+enum OpenApiVersion {
+    kVersionUnknown = -1,
+    kVersionNone = 0,
+    kVersionMin = 2,                      //!< Current minimum supported version
+    kVersion20 = 2,
+    kVersion30 = 3,
+    kVersionMax = 3,                      //!< Current maximum supported version
+    kVersion31 = 4,
+};
+
+struct Specification {
+    Specification(SchemaDraft d) : draft(d), oapi(kVersionNone) {}
+    Specification(OpenApiVersion o) : oapi(o) {
+        if (oapi == kVersion20) draft = kDraft04;
+        else if (oapi == kVersion30) draft = kDraft05;
+        else if (oapi == kVersion31) draft = kDraft2020_12;
+        else draft = kDraft04;
+    }
+    ~Specification() {}
+    bool IsSupported() const {
+        return ((draft >= kDraftMin && draft <= kDraftMax) && ((oapi == kVersionNone) || (oapi >= kVersionMin && oapi <= kVersionMax)));
+    }
+    SchemaDraft draft;
+    OpenApiVersion oapi;
+};
+
 ///////////////////////////////////////////////////////////////////////////////
 // Forward declarations
 
@@ -233,8 +314,11 @@ public:
     virtual void EndDisallowedType(const typename SchemaType::ValueType& actualType) = 0;
     virtual void NotAllOf(ISchemaValidator** subvalidators, SizeType count) = 0;
     virtual void NoneOf(ISchemaValidator** subvalidators, SizeType count) = 0;
-    virtual void NotOneOf(ISchemaValidator** subvalidators, SizeType count, bool matched) = 0;
+    virtual void NotOneOf(ISchemaValidator** subvalidators, SizeType count) = 0;
+    virtual void MultipleOneOf(SizeType index1, SizeType index2) = 0;
     virtual void Disallowed() = 0;
+    virtual void DisallowedWhenWriting() = 0;
+    virtual void DisallowedWhenReading() = 0;
 };
 
 
@@ -255,10 +339,10 @@ public:
     bool Uint(unsigned u) { Number n; n.u.u = u; n.d = static_cast<double>(u); return WriteNumber(n); }
     bool Int64(int64_t i) { Number n; n.u.i = i; n.d = static_cast<double>(i); return WriteNumber(n); }
     bool Uint64(uint64_t u) { Number n; n.u.u = u; n.d = static_cast<double>(u); return WriteNumber(n); }
-    bool Double(double d) { 
-        Number n; 
+    bool Double(double d) {
+        Number n;
         if (d < 0) n.u.i = static_cast<int64_t>(d);
-        else       n.u.u = static_cast<uint64_t>(d); 
+        else       n.u.u = static_cast<uint64_t>(d);
         n.d = d;
         return WriteNumber(n);
     }
@@ -279,7 +363,9 @@ public:
         uint64_t h = Hash(0, kObjectType);
         uint64_t* kv = stack_.template Pop<uint64_t>(memberCount * 2);
         for (SizeType i = 0; i < memberCount; i++)
-            h ^= Hash(kv[i * 2], kv[i * 2 + 1]);  // Use xor to achieve member order insensitive
+            // Issue #2205
+            // Hasing the key to avoid key=value cases with bug-prone zero-value hash
+            h ^= Hash(Hash(0, kv[i * 2]), kv[i * 2 + 1]);  // Use xor to achieve member order insensitive
         *stack_.template Push<uint64_t>() = h;
         return true;
     }
@@ -317,7 +403,7 @@ private:
     
     bool WriteBuffer(Type type, const void* data, size_t len) {
         // FNV-1a from http://isthe.com/chongo/tech/comp/fnv/
-        uint64_t h = Hash(RAPIDJSON_UINT64_C2(0x84222325, 0xcbf29ce4), type);
+        uint64_t h = Hash(RAPIDJSON_UINT64_C2(0xcbf29ce4, 0x84222325), type);
         const unsigned char* d = static_cast<const unsigned char*>(data);
         for (size_t i = 0; i < len; i++)
             h = Hash(h, d[i]);
@@ -352,10 +438,11 @@ struct SchemaValidationContext {
         kPatternValidatorWithAdditionalProperty
     };
 
-    SchemaValidationContext(SchemaValidatorFactoryType& f, ErrorHandlerType& eh, const SchemaType* s) :
+    SchemaValidationContext(SchemaValidatorFactoryType& f, ErrorHandlerType& eh, const SchemaType* s, unsigned fl = 0) :
         factory(f),
         error_handler(eh),
         schema(s),
+        flags(fl),
         valueSchema(),
         invalidKeyword(),
         invalidCode(),
@@ -379,13 +466,19 @@ struct SchemaValidationContext {
         if (hasher)
             factory.DestroryHasher(hasher);
         if (validators) {
-            for (SizeType i = 0; i < validatorCount; i++)
-                factory.DestroySchemaValidator(validators[i]);
+            for (SizeType i = 0; i < validatorCount; i++) {
+                if (validators[i]) {
+                    factory.DestroySchemaValidator(validators[i]);
+                }
+            }
             factory.FreeState(validators);
         }
         if (patternPropertiesValidators) {
-            for (SizeType i = 0; i < patternPropertiesValidatorCount; i++)
-                factory.DestroySchemaValidator(patternPropertiesValidators[i]);
+            for (SizeType i = 0; i < patternPropertiesValidatorCount; i++) {
+                if (patternPropertiesValidators[i]) {
+                    factory.DestroySchemaValidator(patternPropertiesValidators[i]);
+                }
+            }
             factory.FreeState(patternPropertiesValidators);
         }
         if (patternPropertiesSchemas)
@@ -397,6 +490,7 @@ struct SchemaValidationContext {
     SchemaValidatorFactoryType& factory;
     ErrorHandlerType& error_handler;
     const SchemaType* schema;
+    unsigned flags;
     const SchemaType* valueSchema;
     const Ch* invalidKeyword;
     ValidateErrorCode invalidCode;
@@ -432,11 +526,14 @@ public:
     typedef Schema<SchemaDocumentType> SchemaType;
     typedef GenericValue<EncodingType, AllocatorType> SValue;
     typedef IValidationErrorHandler<Schema> ErrorHandler;
+    typedef GenericUri<ValueType, AllocatorType> UriType;
     friend class GenericSchemaDocument<ValueType, AllocatorType>;
 
-    Schema(SchemaDocumentType* schemaDocument, const PointerType& p, const ValueType& value, const ValueType& document, AllocatorType* allocator) :
+    Schema(SchemaDocumentType* schemaDocument, const PointerType& p, const ValueType& value, const ValueType& document, AllocatorType* allocator, const UriType& id = UriType()) :
         allocator_(allocator),
         uri_(schemaDocument->GetURI(), *allocator),
+        id_(id, allocator),
+        spec_(schemaDocument->GetSpecification()),
         pointer_(p, allocator),
         typeless_(schemaDocument->GetTypeless()),
         enum_(),
@@ -469,14 +566,43 @@ public:
         maxLength_(~SizeType(0)),
         exclusiveMinimum_(false),
         exclusiveMaximum_(false),
-        defaultValueLength_(0)
+        defaultValueLength_(0),
+        readOnly_(false),
+        writeOnly_(false),
+        nullable_(false)
     {
+        GenericStringBuffer<EncodingType> sb;
+        p.StringifyUriFragment(sb);
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Schema", sb.GetString(), id.GetString());
+
         typedef typename ValueType::ConstValueIterator ConstValueIterator;
         typedef typename ValueType::ConstMemberIterator ConstMemberIterator;
 
+        // PR #1393
+        // Early add this Schema and its $ref(s) in schemaDocument's map to avoid infinite
+        // recursion (with recursive schemas), since schemaDocument->getSchema() is always
+        // checked before creating a new one. Don't cache typeless_, though.
+        if (this != typeless_) {
+          typedef typename SchemaDocumentType::SchemaEntry SchemaEntry;
+          SchemaEntry *entry = schemaDocument->schemaMap_.template Push<SchemaEntry>();
+          new (entry) SchemaEntry(pointer_, this, true, allocator_);
+          schemaDocument->AddSchemaRefs(this);
+        }
+
         if (!value.IsObject())
             return;
 
+        // If we have an id property, resolve it with the in-scope id
+        // Not supported for open api 2.0 or 3.0
+        if (spec_.oapi != kVersion20 && spec_.oapi != kVersion30)
+        if (const ValueType* v = GetMember(value, GetIdString())) {
+            if (v->IsString()) {
+                UriType local(*v, allocator);
+                id_ = local.Resolve(id_, allocator);
+                    RAPIDJSON_SCHEMA_PRINT(SchemaIds, id.GetString(), v->GetString(), id_.GetString());
+            }
+        }
+
         if (const ValueType* v = GetMember(value, GetTypeString())) {
             type_ = 0;
             if (v->IsString())
@@ -490,9 +616,9 @@ public:
             if (v->IsArray() && v->Size() > 0) {
                 enum_ = static_cast<uint64_t*>(allocator_->Malloc(sizeof(uint64_t) * v->Size()));
                 for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr) {
-                    typedef Hasher<EncodingType, MemoryPoolAllocator<> > EnumHasherType;
+                    typedef Hasher<EncodingType, MemoryPoolAllocator<AllocatorType> > EnumHasherType;
                     char buffer[256u + 24];
-                    MemoryPoolAllocator<> hasherAllocator(buffer, sizeof(buffer));
+                    MemoryPoolAllocator<AllocatorType> hasherAllocator(buffer, sizeof(buffer));
                     EnumHasherType h(&hasherAllocator, 256);
                     itr->Accept(h);
                     enum_[enumCount_++] = h.GetHashCode();
@@ -500,16 +626,19 @@ public:
             }
         }
 
-        if (schemaDocument) {
+        if (schemaDocument)
             AssignIfExist(allOf_, *schemaDocument, p, value, GetAllOfString(), document);
+
+        // AnyOf, OneOf, Not not supported for open api 2.0
+        if (schemaDocument && spec_.oapi != kVersion20) {
             AssignIfExist(anyOf_, *schemaDocument, p, value, GetAnyOfString(), document);
             AssignIfExist(oneOf_, *schemaDocument, p, value, GetOneOfString(), document);
-        }
 
-        if (const ValueType* v = GetMember(value, GetNotString())) {
-            schemaDocument->CreateSchema(&not_, p.Append(GetNotString(), allocator_), *v, document);
-            notValidatorIndex_ = validatorCount_;
-            validatorCount_++;
+            if (const ValueType* v = GetMember(value, GetNotString())) {
+                schemaDocument->CreateSchema(&not_, p.Append(GetNotString(), allocator_), *v, document, id_);
+                notValidatorIndex_ = validatorCount_;
+                validatorCount_++;
+            }
         }
 
         // Object
@@ -524,12 +653,14 @@ public:
             if (properties && properties->IsObject())
                 for (ConstMemberIterator itr = properties->MemberBegin(); itr != properties->MemberEnd(); ++itr)
                     AddUniqueElement(allProperties, itr->name);
-            
+
             if (required && required->IsArray())
                 for (ConstValueIterator itr = required->Begin(); itr != required->End(); ++itr)
                     if (itr->IsString())
                         AddUniqueElement(allProperties, *itr);
 
+            // Dependencies not supported for open api 2.0 and 3.0
+            if (spec_.oapi != kVersion20 && spec_.oapi != kVersion30)
             if (dependencies && dependencies->IsObject())
                 for (ConstMemberIterator itr = dependencies->MemberBegin(); itr != dependencies->MemberEnd(); ++itr) {
                     AddUniqueElement(allProperties, itr->name);
@@ -555,10 +686,12 @@ public:
             for (ConstMemberIterator itr = properties->MemberBegin(); itr != properties->MemberEnd(); ++itr) {
                 SizeType index;
                 if (FindPropertyIndex(itr->name, &index))
-                    schemaDocument->CreateSchema(&properties_[index].schema, q.Append(itr->name, allocator_), itr->value, document);
+                    schemaDocument->CreateSchema(&properties_[index].schema, q.Append(itr->name, allocator_), itr->value, document, id_);
             }
         }
 
+        // PatternProperties not supported for open api 2.0 and 3.0
+        if (spec_.oapi != kVersion20 && spec_.oapi != kVersion30)
         if (const ValueType* v = GetMember(value, GetPatternPropertiesString())) {
             PointerType q = p.Append(GetPatternPropertiesString(), allocator_);
             patternProperties_ = static_cast<PatternProperty*>(allocator_->Malloc(sizeof(PatternProperty) * v->MemberCount()));
@@ -566,8 +699,9 @@ public:
 
             for (ConstMemberIterator itr = v->MemberBegin(); itr != v->MemberEnd(); ++itr) {
                 new (&patternProperties_[patternPropertyCount_]) PatternProperty();
-                patternProperties_[patternPropertyCount_].pattern = CreatePattern(itr->name);
-                schemaDocument->CreateSchema(&patternProperties_[patternPropertyCount_].schema, q.Append(itr->name, allocator_), itr->value, document);
+                PointerType r = q.Append(itr->name, allocator_);
+                patternProperties_[patternPropertyCount_].pattern = CreatePattern(itr->name, schemaDocument, r);
+                schemaDocument->CreateSchema(&patternProperties_[patternPropertyCount_].schema, r, itr->value, document, id_);
                 patternPropertyCount_++;
             }
         }
@@ -582,6 +716,8 @@ public:
                     }
                 }
 
+        // Dependencies not supported for open api 2.0 and 3.0
+        if (spec_.oapi != kVersion20 && spec_.oapi != kVersion30)
         if (dependencies && dependencies->IsObject()) {
             PointerType q = p.Append(GetDependenciesString(), allocator_);
             hasDependencies_ = true;
@@ -599,7 +735,7 @@ public:
                     }
                     else if (itr->value.IsObject()) {
                         hasSchemaDependencies_ = true;
-                        schemaDocument->CreateSchema(&properties_[sourceIndex].dependenciesSchema, q.Append(itr->name, allocator_), itr->value, document);
+                        schemaDocument->CreateSchema(&properties_[sourceIndex].dependenciesSchema, q.Append(itr->name, allocator_), itr->value, document, id_);
                         properties_[sourceIndex].dependenciesValidatorIndex = validatorCount_;
                         validatorCount_++;
                     }
@@ -611,7 +747,7 @@ public:
             if (v->IsBool())
                 additionalProperties_ = v->GetBool();
             else if (v->IsObject())
-                schemaDocument->CreateSchema(&additionalPropertiesSchema_, p.Append(GetAdditionalPropertiesString(), allocator_), *v, document);
+                schemaDocument->CreateSchema(&additionalPropertiesSchema_, p.Append(GetAdditionalPropertiesString(), allocator_), *v, document, id_);
         }
 
         AssignIfExist(minProperties_, value, GetMinPropertiesString());
@@ -621,23 +757,25 @@ public:
         if (const ValueType* v = GetMember(value, GetItemsString())) {
             PointerType q = p.Append(GetItemsString(), allocator_);
             if (v->IsObject()) // List validation
-                schemaDocument->CreateSchema(&itemsList_, q, *v, document);
+                schemaDocument->CreateSchema(&itemsList_, q, *v, document, id_);
             else if (v->IsArray()) { // Tuple validation
                 itemsTuple_ = static_cast<const Schema**>(allocator_->Malloc(sizeof(const Schema*) * v->Size()));
                 SizeType index = 0;
                 for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr, index++)
-                    schemaDocument->CreateSchema(&itemsTuple_[itemsTupleCount_++], q.Append(index, allocator_), *itr, document);
+                    schemaDocument->CreateSchema(&itemsTuple_[itemsTupleCount_++], q.Append(index, allocator_), *itr, document, id_);
             }
         }
 
         AssignIfExist(minItems_, value, GetMinItemsString());
         AssignIfExist(maxItems_, value, GetMaxItemsString());
 
+        // AdditionalItems not supported for openapi 2.0 and 3.0
+        if (spec_.oapi != kVersion20 && spec_.oapi != kVersion30)
         if (const ValueType* v = GetMember(value, GetAdditionalItemsString())) {
             if (v->IsBool())
                 additionalItems_ = v->GetBool();
             else if (v->IsObject())
-                schemaDocument->CreateSchema(&additionalItemsSchema_, p.Append(GetAdditionalItemsString(), allocator_), *v, document);
+                schemaDocument->CreateSchema(&additionalItemsSchema_, p.Append(GetAdditionalItemsString(), allocator_), *v, document, id_);
         }
 
         AssignIfExist(uniqueItems_, value, GetUniqueItemsString());
@@ -647,7 +785,7 @@ public:
         AssignIfExist(maxLength_, value, GetMaxLengthString());
 
         if (const ValueType* v = GetMember(value, GetPatternString()))
-            pattern_ = CreatePattern(*v);
+            pattern_ = CreatePattern(*v, schemaDocument, p.Append(GetPatternString(), allocator_));
 
         // Number
         if (const ValueType* v = GetMember(value, GetMinimumString()))
@@ -670,6 +808,23 @@ public:
             if (v->IsString())
                 defaultValueLength_ = v->GetStringLength();
 
+        // ReadOnly - open api only (until draft 7 supported)
+        // WriteOnly - open api 3 only (until draft 7 supported)
+        // Both can't be true
+        if (spec_.oapi != kVersionNone)
+            AssignIfExist(readOnly_, value, GetReadOnlyString());
+        if (spec_.oapi >= kVersion30)
+            AssignIfExist(writeOnly_, value, GetWriteOnlyString());
+        if (readOnly_ && writeOnly_)
+            schemaDocument->SchemaError(kSchemaErrorReadOnlyAndWriteOnly, p);
+
+        // Nullable - open api 3 only
+        // If true add 'null' as allowable type
+        if (spec_.oapi >= kVersion30) {
+            AssignIfExist(nullable_, value, GetNullableString());
+            if (nullable_)
+                AddType(GetNullString());
+        }
     }
 
     ~Schema() {
@@ -697,11 +852,20 @@ public:
         return uri_;
     }
 
+    const UriType& GetId() const {
+        return id_;
+    }
+
+    const Specification& GetSpecification() const {
+        return spec_;
+    }
+
     const PointerType& GetPointer() const {
         return pointer_;
     }
 
     bool BeginValue(Context& context) const {
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::BeginValue");
         if (context.inArray) {
             if (uniqueItems_)
                 context.valueUniqueness = true;
@@ -733,6 +897,8 @@ public:
     }
 
     RAPIDJSON_FORCEINLINE bool EndValue(Context& context) const {
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::EndValue");
+        // Only check pattern properties if we have validators
         if (context.patternPropertiesValidatorCount > 0) {
             bool otherValid = false;
             SizeType count = context.patternPropertiesValidatorCount;
@@ -775,87 +941,98 @@ public:
             foundEnum:;
         }
 
-        if (allOf_.schemas)
-            for (SizeType i = allOf_.begin; i < allOf_.begin + allOf_.count; i++)
-                if (!context.validators[i]->IsValid()) {
-                    context.error_handler.NotAllOf(&context.validators[allOf_.begin], allOf_.count);
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorAllOf);
-                }
-        
-        if (anyOf_.schemas) {
-            for (SizeType i = anyOf_.begin; i < anyOf_.begin + anyOf_.count; i++)
-                if (context.validators[i]->IsValid())
-                    goto foundAny;
-            context.error_handler.NoneOf(&context.validators[anyOf_.begin], anyOf_.count);
-            RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorAnyOf);
-            foundAny:;
-        }
+        // Only check allOf etc if we have validators
+        if (context.validatorCount > 0) {
+            if (allOf_.schemas)
+                for (SizeType i = allOf_.begin; i < allOf_.begin + allOf_.count; i++)
+                    if (!context.validators[i]->IsValid()) {
+                        context.error_handler.NotAllOf(&context.validators[allOf_.begin], allOf_.count);
+                        RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorAllOf);
+                    }
 
-        if (oneOf_.schemas) {
-            bool oneValid = false;
-            for (SizeType i = oneOf_.begin; i < oneOf_.begin + oneOf_.count; i++)
-                if (context.validators[i]->IsValid()) {
-                    if (oneValid) {
-                        context.error_handler.NotOneOf(&context.validators[oneOf_.begin], oneOf_.count, true);
-                        RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorOneOfMatch);
-                    } else
-                        oneValid = true;
-                }
-            if (!oneValid) {
-                context.error_handler.NotOneOf(&context.validators[oneOf_.begin], oneOf_.count, false);
-                RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorOneOf);
+            if (anyOf_.schemas) {
+                for (SizeType i = anyOf_.begin; i < anyOf_.begin + anyOf_.count; i++)
+                    if (context.validators[i]->IsValid())
+                        goto foundAny;
+                context.error_handler.NoneOf(&context.validators[anyOf_.begin], anyOf_.count);
+                RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorAnyOf);
+                foundAny:;
             }
-        }
 
-        if (not_ && context.validators[notValidatorIndex_]->IsValid()) {
-            context.error_handler.Disallowed();
-            RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorNot);
+            if (oneOf_.schemas) {
+                bool oneValid = false;
+                SizeType firstMatch = 0;
+                for (SizeType i = oneOf_.begin; i < oneOf_.begin + oneOf_.count; i++)
+                    if (context.validators[i]->IsValid()) {
+                        if (oneValid) {
+                            context.error_handler.MultipleOneOf(firstMatch, i - oneOf_.begin);
+                            RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorOneOfMatch);
+                        } else {
+                            oneValid = true;
+                            firstMatch = i - oneOf_.begin;
+                        }
+                    }
+                if (!oneValid) {
+                    context.error_handler.NotOneOf(&context.validators[oneOf_.begin], oneOf_.count);
+                    RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorOneOf);
+                }
+            }
+
+            if (not_ && context.validators[notValidatorIndex_]->IsValid()) {
+                context.error_handler.Disallowed();
+                RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorNot);
+            }
         }
 
         return true;
     }
 
     bool Null(Context& context) const {
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Null");
         if (!(type_ & (1 << kNullSchemaType))) {
             DisallowedType(context, GetNullString());
             RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
         }
         return CreateParallelValidator(context);
     }
-    
-    bool Bool(Context& context, bool) const {
-        if (!(type_ & (1 << kBooleanSchemaType))) {
-            DisallowedType(context, GetBooleanString());
-            RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
-        }
+
+    bool Bool(Context& context, bool b) const {
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Bool", b);
+        if (!CheckBool(context, b))
+            return false;
         return CreateParallelValidator(context);
     }
 
     bool Int(Context& context, int i) const {
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Int", (int64_t)i);
         if (!CheckInt(context, i))
             return false;
         return CreateParallelValidator(context);
     }
 
     bool Uint(Context& context, unsigned u) const {
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Uint", (uint64_t)u);
         if (!CheckUint(context, u))
             return false;
         return CreateParallelValidator(context);
     }
 
     bool Int64(Context& context, int64_t i) const {
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Int64", i);
         if (!CheckInt(context, i))
             return false;
         return CreateParallelValidator(context);
     }
 
     bool Uint64(Context& context, uint64_t u) const {
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Uint64", u);
         if (!CheckUint(context, u))
             return false;
         return CreateParallelValidator(context);
     }
 
     bool Double(Context& context, double d) const {
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Double", d);
         if (!(type_ & (1 << kNumberSchemaType))) {
             DisallowedType(context, GetNumberString());
             RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
@@ -866,14 +1043,15 @@ public:
 
         if (!maximum_.IsNull() && !CheckDoubleMaximum(context, d))
             return false;
-        
+
         if (!multipleOf_.IsNull() && !CheckDoubleMultipleOf(context, d))
             return false;
-        
+
         return CreateParallelValidator(context);
     }
-    
+
     bool String(Context& context, const Ch* str, SizeType length, bool) const {
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::String", str);
         if (!(type_ & (1 << kStringSchemaType))) {
             DisallowedType(context, GetStringString());
             RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
@@ -902,6 +1080,7 @@ public:
     }
 
     bool StartObject(Context& context) const {
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::StartObject");
         if (!(type_ & (1 << kObjectSchemaType))) {
             DisallowedType(context, GetObjectString());
             RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
@@ -921,8 +1100,10 @@ public:
 
         return CreateParallelValidator(context);
     }
-    
+
     bool Key(Context& context, const Ch* str, SizeType len, bool) const {
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Key", str);
+
         if (patternProperties_) {
             context.patternPropertiesSchemaCount = 0;
             for (SizeType i = 0; i < patternPropertyCount_; i++)
@@ -949,7 +1130,7 @@ public:
         }
 
         if (additionalPropertiesSchema_) {
-            if (additionalPropertiesSchema_ && context.patternPropertiesSchemaCount > 0) {
+            if (context.patternPropertiesSchemaCount > 0) {
                 context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = additionalPropertiesSchema_;
                 context.valueSchema = typeless_;
                 context.valuePatternValidatorType = Context::kPatternValidatorWithAdditionalProperty;
@@ -974,6 +1155,7 @@ public:
     }
 
     bool EndObject(Context& context, SizeType memberCount) const {
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::EndObject");
         if (hasRequired_) {
             context.error_handler.StartMissingProperties();
             for (SizeType index = 0; index < propertyCount_; index++)
@@ -1014,13 +1196,14 @@ public:
                 }
             }
             if (context.error_handler.EndDependencyErrors())
-                RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorDependencies);  
+                RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorDependencies);
         }
 
         return true;
     }
 
     bool StartArray(Context& context) const {
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::StartArray");
         context.arrayElementIndex = 0;
         context.inArray = true;  // Ensure we note that we are in an array
 
@@ -1033,13 +1216,14 @@ public:
     }
 
     bool EndArray(Context& context, SizeType elementCount) const {
+        RAPIDJSON_SCHEMA_PRINT(Method, "Schema::EndArray");
         context.inArray = false;
-        
+
         if (elementCount < minItems_) {
             context.error_handler.TooFewItems(elementCount, minItems_);
             RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorMinItems);
         }
-        
+
         if (elementCount > maxItems_) {
             context.error_handler.TooManyItems(elementCount, maxItems_);
             RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorMaxItems);
@@ -1081,6 +1265,9 @@ public:
             case kValidateErrorAnyOf:                   return GetAnyOfString();
             case kValidateErrorNot:                     return GetNotString();
 
+            case kValidateErrorReadOnly:                return GetReadOnlyString();
+            case kValidateErrorWriteOnly:               return GetWriteOnlyString();
+
             default:                                    return GetNullString();
         }
     }
@@ -1128,6 +1315,14 @@ public:
     RAPIDJSON_STRING_(ExclusiveMaximum, 'e', 'x', 'c', 'l', 'u', 's', 'i', 'v', 'e', 'M', 'a', 'x', 'i', 'm', 'u', 'm')
     RAPIDJSON_STRING_(MultipleOf, 'm', 'u', 'l', 't', 'i', 'p', 'l', 'e', 'O', 'f')
     RAPIDJSON_STRING_(DefaultValue, 'd', 'e', 'f', 'a', 'u', 'l', 't')
+    RAPIDJSON_STRING_(Schema, '$', 's', 'c', 'h', 'e', 'm', 'a')
+    RAPIDJSON_STRING_(Ref, '$', 'r', 'e', 'f')
+    RAPIDJSON_STRING_(Id, 'i', 'd')
+    RAPIDJSON_STRING_(Swagger, 's', 'w', 'a', 'g', 'g', 'e', 'r')
+    RAPIDJSON_STRING_(OpenApi, 'o', 'p', 'e', 'n', 'a', 'p', 'i')
+    RAPIDJSON_STRING_(ReadOnly, 'r', 'e', 'a', 'd', 'O', 'n', 'l', 'y')
+    RAPIDJSON_STRING_(WriteOnly, 'w', 'r', 'i', 't', 'e', 'O', 'n', 'l', 'y')
+    RAPIDJSON_STRING_(Nullable, 'n', 'u', 'l', 'l', 'a', 'b', 'l', 'e')
 
 #undef RAPIDJSON_STRING_
 
@@ -1193,7 +1388,7 @@ private:
                 out.schemas = static_cast<const Schema**>(allocator_->Malloc(out.count * sizeof(const Schema*)));
                 memset(out.schemas, 0, sizeof(Schema*)* out.count);
                 for (SizeType i = 0; i < out.count; i++)
-                    schemaDocument.CreateSchema(&out.schemas[i], q.Append(i, allocator_), (*v)[i], document);
+                    schemaDocument.CreateSchema(&out.schemas[i], q.Append(i, allocator_), (*v)[i], document, id_);
                 out.begin = validatorCount_;
                 validatorCount_ += out.count;
             }
@@ -1202,10 +1397,11 @@ private:
 
 #if RAPIDJSON_SCHEMA_USE_INTERNALREGEX
     template <typename ValueType>
-    RegexType* CreatePattern(const ValueType& value) {
+    RegexType* CreatePattern(const ValueType& value, SchemaDocumentType* sd, const PointerType& p) {
         if (value.IsString()) {
             RegexType* r = new (allocator_->Malloc(sizeof(RegexType))) RegexType(value.GetString(), allocator_);
             if (!r->IsValid()) {
+                sd->SchemaErrorValue(kSchemaErrorRegexInvalid, p, value.GetString(), value.GetStringLength());
                 r->~RegexType();
                 AllocatorType::Free(r);
                 r = 0;
@@ -1221,13 +1417,14 @@ private:
     }
 #elif RAPIDJSON_SCHEMA_USE_STDREGEX
     template <typename ValueType>
-    RegexType* CreatePattern(const ValueType& value) {
+    RegexType* CreatePattern(const ValueType& value, SchemaDocumentType* sd, const PointerType& p) {
         if (value.IsString()) {
             RegexType *r = static_cast<RegexType*>(allocator_->Malloc(sizeof(RegexType)));
             try {
                 return new (r) RegexType(value.GetString(), std::size_t(value.GetStringLength()), std::regex_constants::ECMAScript);
             }
-            catch (const std::regex_error&) {
+            catch (const std::regex_error& e) {
+                sd->SchemaErrorValue(kSchemaErrorRegexInvalid, p, value.GetString(), value.GetStringLength());
                 AllocatorType::Free(r);
             }
         }
@@ -1240,7 +1437,9 @@ private:
     }
 #else
     template <typename ValueType>
-    RegexType* CreatePattern(const ValueType&) { return 0; }
+    RegexType* CreatePattern(const ValueType&) {
+        return 0;
+    }
 
     static bool IsPatternMatch(const RegexType*, const Ch *, SizeType) { return true; }
 #endif // RAPIDJSON_SCHEMA_USE_STDREGEX
@@ -1255,6 +1454,9 @@ private:
         else if (type == GetNumberString() ) type_ |= (1 << kNumberSchemaType) | (1 << kIntegerSchemaType);
     }
 
+    // Creates parallel validators for allOf, anyOf, oneOf, not and schema dependencies, if required.
+    // Also creates a hasher for enums and array uniqueness, if required.
+    // Also a useful place to add type-independent error checks.
     bool CreateParallelValidator(Context& context) const {
         if (enum_ || context.arrayUniqueness)
             context.hasher = context.factory.CreateHasher();
@@ -1262,6 +1464,7 @@ private:
         if (validatorCount_) {
             RAPIDJSON_ASSERT(context.validators == 0);
             context.validators = static_cast<ISchemaValidator**>(context.factory.MallocState(sizeof(ISchemaValidator*) * validatorCount_));
+            std::memset(context.validators, 0, sizeof(ISchemaValidator*) * validatorCount_);
             context.validatorCount = validatorCount_;
 
             // Always return after first failure for these sub-validators
@@ -1270,10 +1473,10 @@ private:
 
             if (anyOf_.schemas)
                 CreateSchemaValidators(context, anyOf_, false);
-            
+
             if (oneOf_.schemas)
                 CreateSchemaValidators(context, oneOf_, false);
-            
+
             if (not_)
                 context.validators[notValidatorIndex_] = context.factory.CreateSchemaValidator(*not_, false);
 
@@ -1284,6 +1487,16 @@ private:
             }
         }
 
+        // Add any other type-independent checks here
+        if (readOnly_ && (context.flags & kValidateWriteFlag)) {
+            context.error_handler.DisallowedWhenWriting();
+            RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorReadOnly);
+        }
+        if (writeOnly_ && (context.flags & kValidateReadFlag)) {
+            context.error_handler.DisallowedWhenReading();
+            RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorWriteOnly);
+        }
+
         return true;
     }
 
@@ -1297,7 +1510,7 @@ private:
         SizeType len = name.GetStringLength();
         const Ch* str = name.GetString();
         for (SizeType index = 0; index < propertyCount_; index++)
-            if (properties_[index].name.GetStringLength() == len && 
+            if (properties_[index].name.GetStringLength() == len &&
                 (std::memcmp(properties_[index].name.GetString(), str, sizeof(Ch) * len) == 0))
             {
                 *outIndex = index;
@@ -1306,6 +1519,14 @@ private:
         return false;
     }
 
+    bool CheckBool(Context& context, bool) const {
+        if (!(type_ & (1 << kBooleanSchemaType))) {
+            DisallowedType(context, GetBooleanString());
+            RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
+        }
+        return true;
+    }
+
     bool CheckInt(Context& context, int64_t i) const {
         if (!(type_ & ((1 << kIntegerSchemaType) | (1 << kNumberSchemaType)))) {
             DisallowedType(context, GetIntegerString());
@@ -1420,9 +1641,13 @@ private:
 
     bool CheckDoubleMultipleOf(Context& context, double d) const {
         double a = std::abs(d), b = std::abs(multipleOf_.GetDouble());
-        double q = std::floor(a / b);
-        double r = a - q * b;
-        if (r > 0.0) {
+        double q = a / b;
+        double qRounded = std::floor(q + 0.5);
+        double scaledEpsilon = (q + qRounded) * std::numeric_limits<double>::epsilon();
+        double difference = std::abs(qRounded - q);
+        bool isMultiple = (difference <= scaledEpsilon)
+                                        || (difference < std::numeric_limits<double>::min());
+        if (!isMultiple) {
             context.error_handler.NotMultipleOf(d, multipleOf_);
             RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorMultipleOf);
         }
@@ -1458,7 +1683,7 @@ private:
 
     struct PatternProperty {
         PatternProperty() : schema(), pattern() {}
-        ~PatternProperty() { 
+        ~PatternProperty() {
             if (pattern) {
                 pattern->~RegexType();
                 AllocatorType::Free(pattern);
@@ -1470,6 +1695,8 @@ private:
 
     AllocatorType* allocator_;
     SValue uri_;
+    UriType id_;
+    Specification spec_;
     PointerType pointer_;
     const SchemaType* typeless_;
     uint64_t* enum_;
@@ -1512,8 +1739,12 @@ private:
     SValue multipleOf_;
     bool exclusiveMinimum_;
     bool exclusiveMaximum_;
-    
+
     SizeType defaultValueLength_;
+
+    bool readOnly_;
+    bool writeOnly_;
+    bool nullable_;
 };
 
 template<typename Stack, typename Ch>
@@ -1555,9 +1786,18 @@ template <typename SchemaDocumentType>
 class IGenericRemoteSchemaDocumentProvider {
 public:
     typedef typename SchemaDocumentType::Ch Ch;
+    typedef typename SchemaDocumentType::ValueType ValueType;
+    typedef typename SchemaDocumentType::AllocatorType AllocatorType;
 
     virtual ~IGenericRemoteSchemaDocumentProvider() {}
     virtual const SchemaDocumentType* GetRemoteDocument(const Ch* uri, SizeType length) = 0;
+    virtual const SchemaDocumentType* GetRemoteDocument(const GenericUri<ValueType, AllocatorType> uri, Specification& spec) {
+        // Default implementation just calls through for compatibility
+        // Following line suppresses unused parameter warning
+        (void)spec;
+        // printf("GetRemoteDocument: %d %d\n", spec.draft, spec.oapi);
+        return GetRemoteDocument(uri.GetBaseString(), uri.GetBaseStringLength());
+    }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1582,7 +1822,9 @@ public:
     typedef typename EncodingType::Ch Ch;
     typedef internal::Schema<GenericSchemaDocument> SchemaType;
     typedef GenericPointer<ValueType, Allocator> PointerType;
-    typedef GenericValue<EncodingType, Allocator> URIType;
+    typedef GenericValue<EncodingType, AllocatorType> GValue;
+    typedef GenericUri<ValueType, Allocator> UriType;
+    typedef GenericStringRef<Ch> StringRefType;
     friend class internal::Schema<GenericSchemaDocument>;
     template <typename, typename, typename>
     friend class GenericSchemaValidator;
@@ -1596,46 +1838,53 @@ public:
         \param uriLength Length of \c name, in code points.
         \param remoteProvider An optional remote schema document provider for resolving remote reference. Can be null.
         \param allocator An optional allocator instance for allocating memory. Can be null.
+        \param pointer An optional JSON pointer to the start of the schema document
+        \param spec Optional schema draft or OpenAPI version. Used if no specification in document. Defaults to draft-04.
     */
     explicit GenericSchemaDocument(const ValueType& document, const Ch* uri = 0, SizeType uriLength = 0,
-        IRemoteSchemaDocumentProviderType* remoteProvider = 0, Allocator* allocator = 0) :
+        IRemoteSchemaDocumentProviderType* remoteProvider = 0, Allocator* allocator = 0,
+        const PointerType& pointer = PointerType(), // PR #1393
+        const Specification& spec = Specification(kDraft04)) :
         remoteProvider_(remoteProvider),
         allocator_(allocator),
         ownAllocator_(),
         root_(),
         typeless_(),
         schemaMap_(allocator, kInitialSchemaMapSize),
-        schemaRef_(allocator, kInitialSchemaRefSize)
+        schemaRef_(allocator, kInitialSchemaRefSize),
+        spec_(spec),
+        error_(kObjectType),
+        currentError_()
     {
+        RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaDocument::GenericSchemaDocument");
         if (!allocator_)
             ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
 
         Ch noUri[1] = {0};
         uri_.SetString(uri ? uri : noUri, uriLength, *allocator_);
+        docId_ = UriType(uri_, allocator_);
 
         typeless_ = static_cast<SchemaType*>(allocator_->Malloc(sizeof(SchemaType)));
-        new (typeless_) SchemaType(this, PointerType(), ValueType(kObjectType).Move(), ValueType(kObjectType).Move(), allocator_);
+        new (typeless_) SchemaType(this, PointerType(), ValueType(kObjectType).Move(), ValueType(kObjectType).Move(), allocator_, docId_);
+
+        // Establish the schema draft or open api version.
+        // We only ever look for '$schema' or 'swagger' or 'openapi' at the root of the document.
+        SetSchemaSpecification(document);
 
         // Generate root schema, it will call CreateSchema() to create sub-schemas,
-        // And call AddRefSchema() if there are $ref.
-        CreateSchemaRecursive(&root_, PointerType(), document, document);
-
-        // Resolve $ref
-        while (!schemaRef_.Empty()) {
-            SchemaRefEntry* refEntry = schemaRef_.template Pop<SchemaRefEntry>(1);
-            if (const SchemaType* s = GetSchema(refEntry->target)) {
-                if (refEntry->schema)
-                    *refEntry->schema = s;
-
-                // Create entry in map if not exist
-                if (!GetSchema(refEntry->source)) {
-                    new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(refEntry->source, const_cast<SchemaType*>(s), false, allocator_);
-                }
-            }
-            else if (refEntry->schema)
-                *refEntry->schema = typeless_;
-
-            refEntry->~SchemaRefEntry();
+        // And call HandleRefSchema() if there are $ref.
+        // PR #1393 use input pointer if supplied
+        root_ = typeless_;
+        if (pointer.GetTokenCount() == 0) {
+            CreateSchemaRecursive(&root_, pointer, document, document, docId_);
+        }
+        else if (const ValueType* v = pointer.Get(document)) {
+            CreateSchema(&root_, pointer, *v, document, docId_);
+        }
+        else {
+            GenericStringBuffer<EncodingType> sb;
+            pointer.StringifyUriFragment(sb);
+            SchemaErrorValue(kSchemaErrorStartUnknown, PointerType(), sb.GetString(), static_cast<SizeType>(sb.GetSize() / sizeof(Ch)));
         }
 
         RAPIDJSON_ASSERT(root_ != 0);
@@ -1653,7 +1902,11 @@ public:
         typeless_(rhs.typeless_),
         schemaMap_(std::move(rhs.schemaMap_)),
         schemaRef_(std::move(rhs.schemaRef_)),
-        uri_(std::move(rhs.uri_))
+        uri_(std::move(rhs.uri_)),
+        docId_(std::move(rhs.docId_)),
+        spec_(rhs.spec_),
+        error_(std::move(rhs.error_)),
+        currentError_(std::move(rhs.currentError_))
     {
         rhs.remoteProvider_ = 0;
         rhs.allocator_ = 0;
@@ -1672,26 +1925,87 @@ public:
             Allocator::Free(typeless_);
         }
 
+        // these may contain some allocator data so clear before deleting ownAllocator_
+        uri_.SetNull();
+        error_.SetNull();
+        currentError_.SetNull();
+
         RAPIDJSON_DELETE(ownAllocator_);
     }
 
-    const URIType& GetURI() const { return uri_; }
+    const GValue& GetURI() const { return uri_; }
+
+    const Specification& GetSpecification() const { return spec_; }
+    bool IsSupportedSpecification() const { return spec_.IsSupported(); }
+
+    //! Static method to get the specification of any schema document
+    //  Returns kDraftNone if document is silent
+    static const Specification GetSpecification(const ValueType& document) {
+      SchemaDraft draft = GetSchemaDraft(document);
+      if (draft != kDraftNone)
+        return Specification(draft);
+      else {
+        OpenApiVersion oapi = GetOpenApiVersion(document);
+        if (oapi != kVersionNone)
+          return Specification(oapi);
+      }
+      return Specification(kDraftNone);
+    }
 
     //! Get the root schema.
     const SchemaType& GetRoot() const { return *root_; }
 
-private:
+    //! Gets the error object.
+    GValue& GetError() { return error_; }
+    const GValue& GetError() const { return error_; }
+
+    static const StringRefType& GetSchemaErrorKeyword(SchemaErrorCode schemaErrorCode) {
+        switch (schemaErrorCode) {
+            case kSchemaErrorStartUnknown:             return GetStartUnknownString();
+            case kSchemaErrorRefPlainName:             return GetRefPlainNameString();
+            case kSchemaErrorRefInvalid:               return GetRefInvalidString();
+            case kSchemaErrorRefPointerInvalid:        return GetRefPointerInvalidString();
+            case kSchemaErrorRefUnknown:               return GetRefUnknownString();
+            case kSchemaErrorRefCyclical:              return GetRefCyclicalString();
+            case kSchemaErrorRefNoRemoteProvider:      return GetRefNoRemoteProviderString();
+            case kSchemaErrorRefNoRemoteSchema:        return GetRefNoRemoteSchemaString();
+            case kSchemaErrorRegexInvalid:             return GetRegexInvalidString();
+            case kSchemaErrorSpecUnknown:              return GetSpecUnknownString();
+            case kSchemaErrorSpecUnsupported:          return GetSpecUnsupportedString();
+            case kSchemaErrorSpecIllegal:              return GetSpecIllegalString();
+            case kSchemaErrorReadOnlyAndWriteOnly:     return GetReadOnlyAndWriteOnlyString();
+            default:                                   return GetNullString();
+        }
+    }
+
+    //! Default error method
+    void SchemaError(const SchemaErrorCode code, const PointerType& location) {
+      currentError_ = GValue(kObjectType);
+      AddCurrentError(code, location);
+    }
+
+    //! Method for error with single string value insert
+    void SchemaErrorValue(const SchemaErrorCode code, const PointerType& location, const Ch* value, SizeType length) {
+      currentError_ = GValue(kObjectType);
+      currentError_.AddMember(GetValueString(), GValue(value, length, *allocator_).Move(), *allocator_);
+      AddCurrentError(code, location);
+    }
+
+    //! Method for error with invalid pointer
+    void SchemaErrorPointer(const SchemaErrorCode code, const PointerType& location, const Ch* value, SizeType length, const PointerType& pointer) {
+      currentError_ = GValue(kObjectType);
+      currentError_.AddMember(GetValueString(), GValue(value, length, *allocator_).Move(), *allocator_);
+      currentError_.AddMember(GetOffsetString(), static_cast<SizeType>(pointer.GetParseErrorOffset() / sizeof(Ch)), *allocator_);
+      AddCurrentError(code, location);
+    }
+
+  private:
     //! Prohibit copying
     GenericSchemaDocument(const GenericSchemaDocument&);
     //! Prohibit assignment
     GenericSchemaDocument& operator=(const GenericSchemaDocument&);
 
-    struct SchemaRefEntry {
-        SchemaRefEntry(const PointerType& s, const PointerType& t, const SchemaType** outSchema, Allocator *allocator) : source(s, allocator), target(t, allocator), schema(outSchema) {}
-        PointerType source;
-        PointerType target;
-        const SchemaType** schema;
-    };
+    typedef const PointerType* SchemaRefPtr; // PR #1393
 
     struct SchemaEntry {
         SchemaEntry(const PointerType& p, SchemaType* s, bool o, Allocator* allocator) : pointer(p, allocator), schema(s), owned(o) {}
@@ -1706,79 +2020,361 @@ private:
         bool owned;
     };
 
-    void CreateSchemaRecursive(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document) {
-        if (schema)
-            *schema = typeless_;
+    void AddErrorInstanceLocation(GValue& result, const PointerType& location) {
+      GenericStringBuffer<EncodingType> sb;
+      location.StringifyUriFragment(sb);
+      GValue instanceRef(sb.GetString(), static_cast<SizeType>(sb.GetSize() / sizeof(Ch)), *allocator_);
+      result.AddMember(GetInstanceRefString(), instanceRef, *allocator_);
+    }
 
+    void AddError(GValue& keyword, GValue& error) {
+      typename GValue::MemberIterator member = error_.FindMember(keyword);
+      if (member == error_.MemberEnd())
+        error_.AddMember(keyword, error, *allocator_);
+      else {
+        if (member->value.IsObject()) {
+          GValue errors(kArrayType);
+          errors.PushBack(member->value, *allocator_);
+          member->value = errors;
+        }
+        member->value.PushBack(error, *allocator_);
+      }
+    }
+
+    void AddCurrentError(const SchemaErrorCode code, const PointerType& location) {
+      RAPIDJSON_SCHEMA_PRINT(InvalidKeyword, GetSchemaErrorKeyword(code));
+      currentError_.AddMember(GetErrorCodeString(), code, *allocator_);
+      AddErrorInstanceLocation(currentError_, location);
+      AddError(GValue(GetSchemaErrorKeyword(code)).Move(), currentError_);
+    }
+
+#define RAPIDJSON_STRING_(name, ...) \
+    static const StringRefType& Get##name##String() {\
+        static const Ch s[] = { __VA_ARGS__, '\0' };\
+        static const StringRefType v(s, static_cast<SizeType>(sizeof(s) / sizeof(Ch) - 1)); \
+        return v;\
+    }
+
+    RAPIDJSON_STRING_(InstanceRef, 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', 'R', 'e', 'f')
+    RAPIDJSON_STRING_(ErrorCode, 'e', 'r', 'r', 'o', 'r', 'C', 'o', 'd', 'e')
+    RAPIDJSON_STRING_(Value, 'v', 'a', 'l', 'u', 'e')
+    RAPIDJSON_STRING_(Offset, 'o', 'f', 'f', 's', 'e', 't')
+
+    RAPIDJSON_STRING_(Null, 'n', 'u', 'l', 'l')
+    RAPIDJSON_STRING_(SpecUnknown, 'S', 'p', 'e', 'c', 'U', 'n', 'k', 'n', 'o', 'w', 'n')
+    RAPIDJSON_STRING_(SpecUnsupported, 'S', 'p', 'e', 'c', 'U', 'n', 's', 'u', 'p', 'p', 'o', 'r', 't', 'e', 'd')
+    RAPIDJSON_STRING_(SpecIllegal, 'S', 'p', 'e', 'c', 'I', 'l', 'l', 'e', 'g', 'a', 'l')
+    RAPIDJSON_STRING_(StartUnknown, 'S', 't', 'a', 'r', 't', 'U', 'n', 'k', 'n', 'o', 'w', 'n')
+    RAPIDJSON_STRING_(RefPlainName, 'R', 'e', 'f', 'P', 'l', 'a', 'i', 'n', 'N', 'a', 'm', 'e')
+    RAPIDJSON_STRING_(RefInvalid, 'R', 'e', 'f', 'I', 'n', 'v', 'a', 'l', 'i', 'd')
+    RAPIDJSON_STRING_(RefPointerInvalid, 'R', 'e', 'f', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'I', 'n', 'v', 'a', 'l', 'i', 'd')
+    RAPIDJSON_STRING_(RefUnknown, 'R', 'e', 'f', 'U', 'n', 'k', 'n', 'o', 'w', 'n')
+    RAPIDJSON_STRING_(RefCyclical, 'R', 'e', 'f', 'C', 'y', 'c', 'l', 'i', 'c', 'a', 'l')
+    RAPIDJSON_STRING_(RefNoRemoteProvider, 'R', 'e', 'f', 'N', 'o', 'R', 'e', 'm', 'o', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r')
+    RAPIDJSON_STRING_(RefNoRemoteSchema, 'R', 'e', 'f', 'N', 'o', 'R', 'e', 'm', 'o', 't', 'e', 'S', 'c', 'h', 'e', 'm', 'a')
+    RAPIDJSON_STRING_(ReadOnlyAndWriteOnly, 'R', 'e', 'a', 'd', 'O', 'n', 'l', 'y', 'A', 'n', 'd', 'W', 'r', 'i', 't', 'e', 'O', 'n', 'l', 'y')
+    RAPIDJSON_STRING_(RegexInvalid, 'R', 'e', 'g', 'e', 'x', 'I', 'n', 'v', 'a', 'l', 'i', 'd')
+
+#undef RAPIDJSON_STRING_
+
+    // Static method to get schema draft of any schema document
+    static SchemaDraft GetSchemaDraft(const ValueType& document) {
+        static const Ch kDraft03String[] = { 'h', 't', 't', 'p', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '-', '0', '3', '/', 's', 'c', 'h', 'e', 'm', 'a', '#', '\0' };
+        static const Ch kDraft04String[] = { 'h', 't', 't', 'p', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '-', '0', '4', '/', 's', 'c', 'h', 'e', 'm', 'a', '#', '\0' };
+        static const Ch kDraft05String[] = { 'h', 't', 't', 'p', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '-', '0', '5', '/', 's', 'c', 'h', 'e', 'm', 'a', '#', '\0' };
+        static const Ch kDraft06String[] = { 'h', 't', 't', 'p', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '-', '0', '6', '/', 's', 'c', 'h', 'e', 'm', 'a', '#', '\0' };
+        static const Ch kDraft07String[] = { 'h', 't', 't', 'p', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '-', '0', '7', '/', 's', 'c', 'h', 'e', 'm', 'a', '#', '\0' };
+        static const Ch kDraft2019_09String[] = { 'h', 't', 't', 'p', 's', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '/', '2', '0', '1', '9', '-', '0', '9', '/', 's', 'c', 'h', 'e', 'm', 'a', '\0' };
+        static const Ch kDraft2020_12String[] = { 'h', 't', 't', 'p', 's', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '/', '2', '0', '2', '0', '-', '1', '2', '/', 's', 'c', 'h', 'e', 'm', 'a', '\0' };
+
+        if (!document.IsObject()) {
+            return kDraftNone;
+        }
+
+        // Get the schema draft from the $schema keyword at the supplied location
+        typename ValueType::ConstMemberIterator itr = document.FindMember(SchemaType::GetSchemaString());
+        if (itr != document.MemberEnd()) {
+            if (!itr->value.IsString()) return kDraftUnknown;
+            const UriType draftUri(itr->value);
+            // Check base uri for match
+            if (draftUri.Match(UriType(kDraft04String), false)) return kDraft04;
+            if (draftUri.Match(UriType(kDraft05String), false)) return kDraft05;
+            if (draftUri.Match(UriType(kDraft06String), false)) return kDraft06;
+            if (draftUri.Match(UriType(kDraft07String), false)) return kDraft07;
+            if (draftUri.Match(UriType(kDraft03String), false)) return kDraft03;
+            if (draftUri.Match(UriType(kDraft2019_09String), false)) return kDraft2019_09;
+            if (draftUri.Match(UriType(kDraft2020_12String), false)) return kDraft2020_12;
+            return kDraftUnknown;
+        }
+        // $schema not found
+        return kDraftNone;
+    }
+
+
+    // Get open api version of any schema document
+    static OpenApiVersion GetOpenApiVersion(const ValueType& document) {
+        static const Ch kVersion20String[] = { '2', '.', '0', '\0' };
+        static const Ch kVersion30String[] = { '3', '.', '0', '.', '\0' }; // ignore patch level
+        static const Ch kVersion31String[] = { '3', '.', '1', '.', '\0' }; // ignore patch level
+        static SizeType len = internal::StrLen<Ch>(kVersion30String);
+
+        if (!document.IsObject()) {
+            return kVersionNone;
+        }
+
+        // Get the open api version from the swagger / openapi keyword at the supplied location
+        typename ValueType::ConstMemberIterator itr = document.FindMember(SchemaType::GetSwaggerString());
+        if (itr == document.MemberEnd()) itr = document.FindMember(SchemaType::GetOpenApiString());
+        if (itr != document.MemberEnd()) {
+            if (!itr->value.IsString()) return kVersionUnknown;
+            const ValueType kVersion20Value(kVersion20String);
+            if (kVersion20Value == itr->value) return kVersion20; // must match 2.0 exactly
+            const ValueType kVersion30Value(kVersion30String);
+            if (itr->value.GetStringLength() > len && kVersion30Value == ValueType(itr->value.GetString(), len)) return kVersion30; // must match 3.0.x
+            const ValueType kVersion31Value(kVersion31String);
+            if (itr->value.GetStringLength() > len && kVersion31Value == ValueType(itr->value.GetString(), len)) return kVersion31; // must match 3.1.x
+            return kVersionUnknown;
+        }
+        // swagger or openapi not found
+        return kVersionNone;
+    }
+
+    // Get the draft of the schema or the open api version (which implies the draft).
+    // Report an error if schema draft or open api version not supported or not recognized, or both in document, and carry on.
+    void SetSchemaSpecification(const ValueType& document) {
+        // Look for '$schema', 'swagger' or 'openapi' keyword at document root
+        SchemaDraft docDraft = GetSchemaDraft(document);
+        OpenApiVersion docOapi = GetOpenApiVersion(document);
+        // Error if both in document
+        if (docDraft != kDraftNone && docOapi != kVersionNone)
+          SchemaError(kSchemaErrorSpecIllegal, PointerType());
+        // Use document draft or open api version if present or use spec from constructor
+        if (docDraft != kDraftNone)
+            spec_ = Specification(docDraft);
+        else if (docOapi != kVersionNone)
+            spec_ = Specification(docOapi);
+        // Error if draft or version unknown
+        if (spec_.draft == kDraftUnknown || spec_.oapi == kVersionUnknown)
+          SchemaError(kSchemaErrorSpecUnknown, PointerType());
+        else if (!spec_.IsSupported())
+            SchemaError(kSchemaErrorSpecUnsupported, PointerType());
+    }
+
+    // Changed by PR #1393
+    void CreateSchemaRecursive(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document, const UriType& id) {
         if (v.GetType() == kObjectType) {
-            const SchemaType* s = GetSchema(pointer);
-            if (!s)
-                CreateSchema(schema, pointer, v, document);
+            UriType newid = UriType(CreateSchema(schema, pointer, v, document, id), allocator_);
 
             for (typename ValueType::ConstMemberIterator itr = v.MemberBegin(); itr != v.MemberEnd(); ++itr)
-                CreateSchemaRecursive(0, pointer.Append(itr->name, allocator_), itr->value, document);
+                CreateSchemaRecursive(0, pointer.Append(itr->name, allocator_), itr->value, document, newid);
         }
         else if (v.GetType() == kArrayType)
             for (SizeType i = 0; i < v.Size(); i++)
-                CreateSchemaRecursive(0, pointer.Append(i, allocator_), v[i], document);
+                CreateSchemaRecursive(0, pointer.Append(i, allocator_), v[i], document, id);
     }
 
-    void CreateSchema(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document) {
+    // Changed by PR #1393
+    const UriType& CreateSchema(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document, const UriType& id) {
         RAPIDJSON_ASSERT(pointer.IsValid());
+        GenericStringBuffer<EncodingType> sb;
+        pointer.StringifyUriFragment(sb);
+        RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaDocument::CreateSchema", sb.GetString(), id.GetString());
         if (v.IsObject()) {
-            if (!HandleRefSchema(pointer, schema, v, document)) {
-                SchemaType* s = new (allocator_->Malloc(sizeof(SchemaType))) SchemaType(this, pointer, v, document, allocator_);
-                new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(pointer, s, true, allocator_);
+            if (const SchemaType* sc = GetSchema(pointer)) {
+                if (schema)
+                    *schema = sc;
+                AddSchemaRefs(const_cast<SchemaType*>(sc));
+            }
+            else if (!HandleRefSchema(pointer, schema, v, document, id)) {
+                // The new schema constructor adds itself and its $ref(s) to schemaMap_
+                SchemaType* s = new (allocator_->Malloc(sizeof(SchemaType))) SchemaType(this, pointer, v, document, allocator_, id);
                 if (schema)
                     *schema = s;
+                return s->GetId();
             }
         }
+        else {
+            if (schema)
+                *schema = typeless_;
+            AddSchemaRefs(typeless_);
+        }
+        return id;
     }
 
-    bool HandleRefSchema(const PointerType& source, const SchemaType** schema, const ValueType& v, const ValueType& document) {
-        static const Ch kRefString[] = { '$', 'r', 'e', 'f', '\0' };
-        static const ValueType kRefValue(kRefString, 4);
-
-        typename ValueType::ConstMemberIterator itr = v.FindMember(kRefValue);
+    // Changed by PR #1393
+    // TODO should this return a UriType& ?
+    bool HandleRefSchema(const PointerType& source, const SchemaType** schema, const ValueType& v, const ValueType& document, const UriType& id) {
+        typename ValueType::ConstMemberIterator itr = v.FindMember(SchemaType::GetRefString());
         if (itr == v.MemberEnd())
             return false;
 
+        GenericStringBuffer<EncodingType> sb;
+        source.StringifyUriFragment(sb);
+        RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaDocument::HandleRefSchema", sb.GetString(), id.GetString());
+        // Resolve the source pointer to the $ref'ed schema (finally)
+        new (schemaRef_.template Push<SchemaRefPtr>()) SchemaRefPtr(&source);
+
         if (itr->value.IsString()) {
             SizeType len = itr->value.GetStringLength();
-            if (len > 0) {
-                const Ch* s = itr->value.GetString();
-                SizeType i = 0;
-                while (i < len && s[i] != '#') // Find the first #
-                    i++;
-
-                if (i > 0) { // Remote reference, resolve immediately
-                    if (remoteProvider_) {
-                        if (const GenericSchemaDocument* remoteDocument = remoteProvider_->GetRemoteDocument(s, i)) {
-                            PointerType pointer(&s[i], len - i, allocator_);
-                            if (pointer.IsValid()) {
-                                if (const SchemaType* sc = remoteDocument->GetSchema(pointer)) {
-                                    if (schema)
-                                        *schema = sc;
-                                    new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(source, const_cast<SchemaType*>(sc), false, allocator_);
-                                    return true;
+            if (len == 0)
+                SchemaError(kSchemaErrorRefInvalid, source);
+            else {
+                // First resolve $ref against the in-scope id
+                UriType scopeId = UriType(id, allocator_);
+                UriType ref = UriType(itr->value, allocator_).Resolve(scopeId, allocator_);
+                RAPIDJSON_SCHEMA_PRINT(SchemaIds, id.GetString(), itr->value.GetString(), ref.GetString());
+                // See if the resolved $ref minus the fragment matches a resolved id in this document
+                // Search from the root. Returns the subschema in the document and its absolute JSON pointer.
+                PointerType basePointer = PointerType();
+                const ValueType *base = FindId(document, ref, basePointer, docId_, false);
+                if (!base) {
+                    // Remote reference - call the remote document provider
+                    if (!remoteProvider_)
+                        SchemaError(kSchemaErrorRefNoRemoteProvider, source);
+                    else {
+                        if (const GenericSchemaDocument* remoteDocument = remoteProvider_->GetRemoteDocument(ref, spec_)) {
+                            const Ch* s = ref.GetFragString();
+                            len = ref.GetFragStringLength();
+                            if (len <= 1 || s[1] == '/') {
+                                // JSON pointer fragment, absolute in the remote schema
+                                const PointerType pointer(s, len, allocator_);
+                                if (!pointer.IsValid())
+                                    SchemaErrorPointer(kSchemaErrorRefPointerInvalid, source, s, len, pointer);
+                                else {
+                                    // Get the subschema
+                                    if (const SchemaType *sc = remoteDocument->GetSchema(pointer)) {
+                                        if (schema)
+                                            *schema = sc;
+                                        AddSchemaRefs(const_cast<SchemaType *>(sc));
+                                        return true;
+                                    } else
+                                        SchemaErrorValue(kSchemaErrorRefUnknown, source, ref.GetString(), ref.GetStringLength());
                                 }
-                            }
-                        }
+                            } else
+                                // Plain name fragment, not allowed in remote schema
+                                SchemaErrorValue(kSchemaErrorRefPlainName, source, s, len);
+                        } else
+                          SchemaErrorValue(kSchemaErrorRefNoRemoteSchema, source, ref.GetString(), ref.GetStringLength());
                     }
                 }
-                else if (s[i] == '#') { // Local reference, defer resolution
-                    PointerType pointer(&s[i], len - i, allocator_);
-                    if (pointer.IsValid()) {
-                        if (const ValueType* nv = pointer.Get(document))
-                            if (HandleRefSchema(source, schema, *nv, document))
+                else { // Local reference
+                    const Ch* s = ref.GetFragString();
+                    len = ref.GetFragStringLength();
+                    if (len <= 1 || s[1] == '/') {
+                        // JSON pointer fragment, relative to the resolved URI
+                        const PointerType relPointer(s, len, allocator_);
+                        if (!relPointer.IsValid())
+                            SchemaErrorPointer(kSchemaErrorRefPointerInvalid, source, s, len, relPointer);
+                        else {
+                            // Get the subschema
+                            if (const ValueType *pv = relPointer.Get(*base)) {
+                                // Now get the absolute JSON pointer by adding relative to base
+                                PointerType pointer(basePointer, allocator_);
+                                for (SizeType i = 0; i < relPointer.GetTokenCount(); i++)
+                                    pointer = pointer.Append(relPointer.GetTokens()[i], allocator_);
+                                if (IsCyclicRef(pointer))
+                                    SchemaErrorValue(kSchemaErrorRefCyclical, source, ref.GetString(), ref.GetStringLength());
+                                else {
+                                    // Call CreateSchema recursively, but first compute the in-scope id for the $ref target as we have jumped there
+                                    // TODO: cache pointer <-> id mapping
+                                    size_t unresolvedTokenIndex;
+                                    scopeId = pointer.GetUri(document, docId_, &unresolvedTokenIndex, allocator_);
+                                    CreateSchema(schema, pointer, *pv, document, scopeId);
+                                    return true;
+                                }
+                            } else
+                                SchemaErrorValue(kSchemaErrorRefUnknown, source, ref.GetString(), ref.GetStringLength());
+                        }
+                    } else {
+                        // Plain name fragment, relative to the resolved URI
+                        // Not supported in open api 2.0 and 3.0
+                        PointerType pointer(allocator_);
+                        if (spec_.oapi == kVersion20 || spec_.oapi == kVersion30)
+                            SchemaErrorValue(kSchemaErrorRefPlainName, source, s, len);
+                        // See if the fragment matches an id in this document.
+                        // Search from the base we just established. Returns the subschema in the document and its absolute JSON pointer.
+                        else if (const ValueType *pv = FindId(*base, ref, pointer, UriType(ref.GetBaseString(), ref.GetBaseStringLength(), allocator_), true, basePointer)) {
+                            if (IsCyclicRef(pointer))
+                                SchemaErrorValue(kSchemaErrorRefCyclical, source, ref.GetString(), ref.GetStringLength());
+                            else {
+                                // Call CreateSchema recursively, but first compute the in-scope id for the $ref target as we have jumped there
+                                // TODO: cache pointer <-> id mapping
+                                size_t unresolvedTokenIndex;
+                                scopeId = pointer.GetUri(document, docId_, &unresolvedTokenIndex, allocator_);
+                                CreateSchema(schema, pointer, *pv, document, scopeId);
                                 return true;
-
-                        new (schemaRef_.template Push<SchemaRefEntry>()) SchemaRefEntry(source, pointer, schema, allocator_);
-                        return true;
+                            }
+                        } else
+                            SchemaErrorValue(kSchemaErrorRefUnknown, source, ref.GetString(), ref.GetStringLength());
                     }
                 }
             }
         }
+
+        // Invalid/Unknown $ref
+        if (schema)
+            *schema = typeless_;
+        AddSchemaRefs(typeless_);
+        return true;
+    }
+
+    //! Find the first subschema with a resolved 'id' that matches the specified URI.
+    // If full specified use all URI else ignore fragment.
+    // If found, return a pointer to the subschema and its JSON pointer.
+    // TODO cache pointer <-> id mapping
+    ValueType* FindId(const ValueType& doc, const UriType& finduri, PointerType& resptr, const UriType& baseuri, bool full, const PointerType& here = PointerType()) const {
+        SizeType i = 0;
+        ValueType* resval = 0;
+        UriType tempuri = UriType(finduri, allocator_);
+        UriType localuri = UriType(baseuri, allocator_);
+        if (doc.GetType() == kObjectType) {
+            // Establish the base URI of this object
+            typename ValueType::ConstMemberIterator m = doc.FindMember(SchemaType::GetIdString());
+            if (m != doc.MemberEnd() && m->value.GetType() == kStringType) {
+                localuri = UriType(m->value, allocator_).Resolve(baseuri, allocator_);
+            }
+            // See if it matches
+            if (localuri.Match(finduri, full)) {
+                RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaDocument::FindId (match)", full ? localuri.GetString() : localuri.GetBaseString());
+                resval = const_cast<ValueType *>(&doc);
+                resptr = here;
+                return resval;
+            }
+            // No match, continue looking
+            for (m = doc.MemberBegin(); m != doc.MemberEnd(); ++m) {
+                if (m->value.GetType() == kObjectType || m->value.GetType() == kArrayType) {
+                    resval = FindId(m->value, finduri, resptr, localuri, full, here.Append(m->name.GetString(), m->name.GetStringLength(), allocator_));
+                }
+                if (resval) break;
+            }
+        } else if (doc.GetType() == kArrayType) {
+            // Continue looking
+            for (typename ValueType::ConstValueIterator v = doc.Begin(); v != doc.End(); ++v) {
+                if (v->GetType() == kObjectType || v->GetType() == kArrayType) {
+                    resval = FindId(*v, finduri, resptr, localuri, full, here.Append(i, allocator_));
+                }
+                if (resval) break;
+                i++;
+            }
+        }
+        return resval;
+    }
+
+    // Added by PR #1393
+    void AddSchemaRefs(SchemaType* schema) {
+        RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaDocument::AddSchemaRefs");
+        while (!schemaRef_.Empty()) {
+            SchemaRefPtr *ref = schemaRef_.template Pop<SchemaRefPtr>(1);
+            SchemaEntry *entry = schemaMap_.template Push<SchemaEntry>();
+            new (entry) SchemaEntry(**ref, schema, false, allocator_);
+        }
+    }
+
+    // Added by PR #1393
+    bool IsCyclicRef(const PointerType& pointer) const {
+        for (const SchemaRefPtr* ref = schemaRef_.template Bottom<SchemaRefPtr>(); ref != schemaRef_.template End<SchemaRefPtr>(); ++ref)
+            if (pointer == **ref)
+                return true;
         return false;
     }
 
@@ -1807,8 +2403,12 @@ private:
     const SchemaType* root_;                //!< Root schema.
     SchemaType* typeless_;
     internal::Stack<Allocator> schemaMap_;  // Stores created Pointer -> Schemas
-    internal::Stack<Allocator> schemaRef_;  // Stores Pointer from $ref and schema which holds the $ref
-    URIType uri_;
+    internal::Stack<Allocator> schemaRef_;  // Stores Pointer(s) from $ref(s) until resolved
+    GValue uri_;                            // Schema document URI
+    UriType docId_;
+    Specification spec_;
+    GValue error_;
+    GValue currentError_;
 };
 
 //! GenericSchemaDocument using Value type.
@@ -1872,11 +2472,10 @@ public:
         currentError_(),
         missingDependents_(),
         valid_(true),
-        flags_(kValidateDefaultFlags)
-#if RAPIDJSON_SCHEMA_VERBOSE
-        , depth_(0)
-#endif
+        flags_(kValidateDefaultFlags),
+        depth_(0)
     {
+        RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::GenericSchemaValidator");
     }
 
     //! Constructor with output handler.
@@ -1904,11 +2503,10 @@ public:
         currentError_(),
         missingDependents_(),
         valid_(true),
-        flags_(kValidateDefaultFlags)
-#if RAPIDJSON_SCHEMA_VERBOSE
-        , depth_(0)
-#endif
+        flags_(kValidateDefaultFlags),
+        depth_(0)
     {
+        RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::GenericSchemaValidator (output handler)");
     }
 
     //! Destructor.
@@ -1941,13 +2539,12 @@ public:
         return flags_;
     }
 
-    //! Checks whether the current state is valid.
-    // Implementation of ISchemaValidator
     virtual bool IsValid() const {
         if (!valid_) return false;
         if (GetContinueOnErrors() && !error_.ObjectEmpty()) return false;
         return true;
     }
+    //! End of Implementation of ISchemaValidator
 
     //! Gets the error object.
     ValueType& GetError() { return error_; }
@@ -1963,7 +2560,7 @@ public:
     //  If reporting all errors, the stack will be empty, so return "errors".
     const Ch* GetInvalidSchemaKeyword() const {
         if (!schemaStack_.Empty()) return CurrentContext().invalidKeyword;
-        if (GetContinueOnErrors() && !error_.ObjectEmpty()) return (const Ch*)GetErrorsString();
+        if (GetContinueOnErrors() && !error_.ObjectEmpty()) return static_cast<const Ch*>(GetErrorsString());
         return 0;
     }
 
@@ -2155,13 +2752,29 @@ public:
     void NoneOf(ISchemaValidator** subvalidators, SizeType count) {
         AddErrorArray(kValidateErrorAnyOf, subvalidators, count);
     }
-    void NotOneOf(ISchemaValidator** subvalidators, SizeType count, bool matched = false) {
-        AddErrorArray(matched ? kValidateErrorOneOfMatch : kValidateErrorOneOf, subvalidators, count);
+    void NotOneOf(ISchemaValidator** subvalidators, SizeType count) {
+        AddErrorArray(kValidateErrorOneOf, subvalidators, count);
+    }
+    void MultipleOneOf(SizeType index1, SizeType index2) {
+        ValueType matches(kArrayType);
+        matches.PushBack(index1, GetStateAllocator());
+        matches.PushBack(index2, GetStateAllocator());
+        currentError_.SetObject();
+        currentError_.AddMember(GetMatchesString(), matches, GetStateAllocator());
+        AddCurrentError(kValidateErrorOneOfMatch);
     }
     void Disallowed() {
         currentError_.SetObject();
         AddCurrentError(kValidateErrorNot);
     }
+    void DisallowedWhenWriting() {
+        currentError_.SetObject();
+        AddCurrentError(kValidateErrorReadOnly);
+    }
+    void DisallowedWhenReading() {
+        currentError_.SetObject();
+        AddCurrentError(kValidateErrorWriteOnly);
+    }
 
 #define RAPIDJSON_STRING_(name, ...) \
     static const StringRefType& Get##name##String() {\
@@ -2180,25 +2793,18 @@ public:
     RAPIDJSON_STRING_(ErrorCode, 'e', 'r', 'r', 'o', 'r', 'C', 'o', 'd', 'e')
     RAPIDJSON_STRING_(ErrorMessage, 'e', 'r', 'r', 'o', 'r', 'M', 'e', 's', 's', 'a', 'g', 'e')
     RAPIDJSON_STRING_(Duplicates, 'd', 'u', 'p', 'l', 'i', 'c', 'a', 't', 'e', 's')
+    RAPIDJSON_STRING_(Matches, 'm', 'a', 't', 'c', 'h', 'e', 's')
 
 #undef RAPIDJSON_STRING_
 
-#if RAPIDJSON_SCHEMA_VERBOSE
-#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_() \
-RAPIDJSON_MULTILINEMACRO_BEGIN\
-    *documentStack_.template Push<Ch>() = '\0';\
-    documentStack_.template Pop<Ch>(1);\
-    internal::PrintInvalidDocument(documentStack_.template Bottom<Ch>());\
-RAPIDJSON_MULTILINEMACRO_END
-#else
-#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_()
-#endif
-
 #define RAPIDJSON_SCHEMA_HANDLE_BEGIN_(method, arg1)\
     if (!valid_) return false; \
     if ((!BeginValue() && !GetContinueOnErrors()) || (!CurrentSchema().method arg1 && !GetContinueOnErrors())) {\
-        RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_();\
-        return valid_ = false;\
+        *documentStack_.template Push<Ch>() = '\0';\
+        documentStack_.template Pop<Ch>(1);\
+        RAPIDJSON_SCHEMA_PRINT(InvalidDocument, documentStack_.template Bottom<Ch>());\
+        valid_ = false;\
+        return valid_;\
     }
 
 #define RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(method, arg2)\
@@ -2235,52 +2841,68 @@ RAPIDJSON_MULTILINEMACRO_END
                                     { RAPIDJSON_SCHEMA_HANDLE_VALUE_(String, (CurrentContext(), str, length, copy), (str, length, copy)); }
 
     bool StartObject() {
+        RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::StartObject");
         RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartObject, (CurrentContext()));
         RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartObject, ());
-        return valid_ = !outputHandler_ || outputHandler_->StartObject();
+        valid_ = !outputHandler_ || outputHandler_->StartObject();
+        return valid_;
     }
     
     bool Key(const Ch* str, SizeType len, bool copy) {
+        RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::Key", str);
         if (!valid_) return false;
         AppendToken(str, len);
-        if (!CurrentSchema().Key(CurrentContext(), str, len, copy) && !GetContinueOnErrors()) return valid_ = false;
+        if (!CurrentSchema().Key(CurrentContext(), str, len, copy) && !GetContinueOnErrors()) {
+            valid_ = false;
+            return valid_;
+        }
         RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(Key, (str, len, copy));
-        return valid_ = !outputHandler_ || outputHandler_->Key(str, len, copy);
+        valid_ = !outputHandler_ || outputHandler_->Key(str, len, copy);
+        return valid_;
     }
     
     bool EndObject(SizeType memberCount) {
+        RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::EndObject");
         if (!valid_) return false;
         RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndObject, (memberCount));
-        if (!CurrentSchema().EndObject(CurrentContext(), memberCount) && !GetContinueOnErrors()) return valid_ = false;
+        if (!CurrentSchema().EndObject(CurrentContext(), memberCount) && !GetContinueOnErrors()) { 
+            valid_ = false; 
+            return valid_; 
+        }
         RAPIDJSON_SCHEMA_HANDLE_END_(EndObject, (memberCount));
     }
 
     bool StartArray() {
+        RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::StartArray");
         RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartArray, (CurrentContext()));
         RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartArray, ());
-        return valid_ = !outputHandler_ || outputHandler_->StartArray();
+        valid_ = !outputHandler_ || outputHandler_->StartArray();
+        return valid_;
     }
     
     bool EndArray(SizeType elementCount) {
+        RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::EndArray");
         if (!valid_) return false;
         RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndArray, (elementCount));
-        if (!CurrentSchema().EndArray(CurrentContext(), elementCount) && !GetContinueOnErrors()) return valid_ = false;
+        if (!CurrentSchema().EndArray(CurrentContext(), elementCount) && !GetContinueOnErrors()) {
+            valid_ = false;
+            return valid_;
+        }
         RAPIDJSON_SCHEMA_HANDLE_END_(EndArray, (elementCount));
     }
 
-#undef RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_
 #undef RAPIDJSON_SCHEMA_HANDLE_BEGIN_
 #undef RAPIDJSON_SCHEMA_HANDLE_PARALLEL_
 #undef RAPIDJSON_SCHEMA_HANDLE_VALUE_
 
     // Implementation of ISchemaStateFactory<SchemaType>
     virtual ISchemaValidator* CreateSchemaValidator(const SchemaType& root, const bool inheritContinueOnErrors) {
+        *documentStack_.template Push<Ch>() = '\0';
+        documentStack_.template Pop<Ch>(1);
         ISchemaValidator* sv = new (GetStateAllocator().Malloc(sizeof(GenericSchemaValidator))) GenericSchemaValidator(*schemaDocument_, root, documentStack_.template Bottom<char>(), documentStack_.GetSize(),
-#if RAPIDJSON_SCHEMA_VERBOSE
         depth_ + 1,
-#endif
         &GetStateAllocator());
-        sv->SetValidateFlags(inheritContinueOnErrors ? GetValidateFlags() : GetValidateFlags() & ~(unsigned)kValidateContinueOnErrorFlag);
+        sv->SetValidateFlags(inheritContinueOnErrors ? GetValidateFlags() : GetValidateFlags() & ~static_cast<unsigned>(kValidateContinueOnErrorFlag));
         return sv;
     }
 
@@ -2311,6 +2933,7 @@ RAPIDJSON_MULTILINEMACRO_END
     virtual void FreeState(void* p) {
         StateAllocator::Free(p);
     }
+    // End of implementation of ISchemaStateFactory<SchemaType>
 
 private:
     typedef typename SchemaType::Context Context;
@@ -2321,9 +2944,7 @@ private:
         const SchemaDocumentType& schemaDocument,
         const SchemaType& root,
         const char* basePath, size_t basePathSize,
-#if RAPIDJSON_SCHEMA_VERBOSE
         unsigned depth,
-#endif
         StateAllocator* allocator = 0,
         size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
         size_t documentStackCapacity = kDefaultDocumentStackCapacity)
@@ -2339,11 +2960,10 @@ private:
         currentError_(),
         missingDependents_(),
         valid_(true),
-        flags_(kValidateDefaultFlags)
-#if RAPIDJSON_SCHEMA_VERBOSE
-        , depth_(depth)
-#endif
+        flags_(kValidateDefaultFlags),
+        depth_(depth)
     {
+        RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::GenericSchemaValidator (internal)", basePath && basePathSize ? basePath : "");
         if (basePath && basePathSize)
             memcpy(documentStack_.template Push<char>(basePathSize), basePath, basePathSize);
     }
@@ -2359,6 +2979,7 @@ private:
     }
 
     bool BeginValue() {
+        RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::BeginValue");
         if (schemaStack_.Empty())
             PushSchema(root_);
         else {
@@ -2380,6 +3001,7 @@ private:
                 ISchemaValidator**& va = CurrentContext().patternPropertiesValidators;
                 SizeType& validatorCount = CurrentContext().patternPropertiesValidatorCount;
                 va = static_cast<ISchemaValidator**>(MallocState(sizeof(ISchemaValidator*) * count));
+                std::memset(va, 0, sizeof(ISchemaValidator*) * count);
                 for (SizeType i = 0; i < count; i++)
                     va[validatorCount++] = CreateSchemaValidator(*sa[i], true);  // Inherit continueOnError
             }
@@ -2390,17 +3012,15 @@ private:
     }
 
     bool EndValue() {
+        RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::EndValue");
         if (!CurrentSchema().EndValue(CurrentContext()) && !GetContinueOnErrors())
             return false;
 
-#if RAPIDJSON_SCHEMA_VERBOSE
         GenericStringBuffer<EncodingType> sb;
-        schemaDocument_->GetPointer(&CurrentSchema()).Stringify(sb);
-
+        schemaDocument_->GetPointer(&CurrentSchema()).StringifyUriFragment(sb);
         *documentStack_.template Push<Ch>() = '\0';
         documentStack_.template Pop<Ch>(1);
-        internal::PrintValidatorPointers(depth_, sb.GetString(), documentStack_.template Bottom<Ch>());
-#endif
+        RAPIDJSON_SCHEMA_PRINT(ValidatorPointers, sb.GetString(), documentStack_.template Bottom<Ch>(), depth_);
         void* hasher = CurrentContext().hasher;
         uint64_t h = hasher && CurrentContext().arrayUniqueness ? static_cast<HasherType*>(hasher)->GetHashCode() : 0;
         
@@ -2451,7 +3071,7 @@ private:
         }
     }
 
-    RAPIDJSON_FORCEINLINE void PushSchema(const SchemaType& schema) { new (schemaStack_.template Push<Context>()) Context(*this, *this, &schema); }
+    RAPIDJSON_FORCEINLINE void PushSchema(const SchemaType& schema) { new (schemaStack_.template Push<Context>()) Context(*this, *this, &schema, flags_); }
     
     RAPIDJSON_FORCEINLINE void PopSchema() {
         Context* c = schemaStack_.template Pop<Context>(1);
@@ -2553,9 +3173,7 @@ private:
     ValueType missingDependents_;
     bool valid_;
     unsigned flags_;
-#if RAPIDJSON_SCHEMA_VERBOSE
     unsigned depth_;
-#endif
 };
 
 typedef GenericSchemaValidator<SchemaDocument> SchemaValidator;
diff --git a/contrib/rapidjson/include/rapidjson/uri.h b/contrib/rapidjson/include/rapidjson/uri.h
new file mode 100644
index 000000000..f93e508a4
--- /dev/null
+++ b/contrib/rapidjson/include/rapidjson/uri.h
@@ -0,0 +1,481 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+//
+// (C) Copyright IBM Corporation 2021
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// 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 RAPIDJSON_URI_H_
+#define RAPIDJSON_URI_H_
+
+#include "internal/strfunc.h"
+
+#if defined(__clang__)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(c++98-compat)
+#elif defined(_MSC_VER)
+RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericUri
+
+template <typename ValueType, typename Allocator=CrtAllocator>
+class GenericUri {
+public:
+    typedef typename ValueType::Ch Ch;
+#if RAPIDJSON_HAS_STDSTRING
+    typedef std::basic_string<Ch> String;
+#endif
+
+    //! Constructors
+    GenericUri(Allocator* allocator = 0) : uri_(), base_(), scheme_(), auth_(), path_(), query_(), frag_(), allocator_(allocator), ownAllocator_() {
+    }
+
+    GenericUri(const Ch* uri, SizeType len, Allocator* allocator = 0) : uri_(), base_(), scheme_(), auth_(), path_(), query_(), frag_(), allocator_(allocator), ownAllocator_() {
+        Parse(uri, len);
+    }
+
+    GenericUri(const Ch* uri, Allocator* allocator = 0) : uri_(), base_(), scheme_(), auth_(), path_(), query_(), frag_(), allocator_(allocator), ownAllocator_() {
+        Parse(uri, internal::StrLen<Ch>(uri));
+    }
+
+    // Use with specializations of GenericValue
+    template<typename T> GenericUri(const T& uri, Allocator* allocator = 0) : uri_(), base_(), scheme_(), auth_(), path_(), query_(), frag_(), allocator_(allocator), ownAllocator_() {
+        const Ch* u = uri.template Get<const Ch*>(); // TypeHelper from document.h
+        Parse(u, internal::StrLen<Ch>(u));
+    }
+
+#if RAPIDJSON_HAS_STDSTRING
+    GenericUri(const String& uri, Allocator* allocator = 0) : uri_(), base_(), scheme_(), auth_(), path_(), query_(), frag_(), allocator_(allocator), ownAllocator_() {
+        Parse(uri.c_str(), internal::StrLen<Ch>(uri.c_str()));
+    }
+#endif
+
+    //! Copy constructor
+    GenericUri(const GenericUri& rhs) : uri_(), base_(), scheme_(), auth_(), path_(), query_(), frag_(), allocator_(), ownAllocator_() {
+        *this = rhs;
+    }
+
+    //! Copy constructor
+    GenericUri(const GenericUri& rhs, Allocator* allocator) : uri_(), base_(), scheme_(), auth_(), path_(), query_(), frag_(), allocator_(allocator), ownAllocator_() {
+        *this = rhs;
+    }
+
+    //! Destructor.
+    ~GenericUri() {
+        Free();
+        RAPIDJSON_DELETE(ownAllocator_);
+    }
+
+    //! Assignment operator
+    GenericUri& operator=(const GenericUri& rhs) {
+        if (this != &rhs) {
+            // Do not delete ownAllocator
+            Free();
+            Allocate(rhs.GetStringLength());
+            auth_ = CopyPart(scheme_, rhs.scheme_, rhs.GetSchemeStringLength());
+            path_ = CopyPart(auth_, rhs.auth_, rhs.GetAuthStringLength());
+            query_ = CopyPart(path_, rhs.path_, rhs.GetPathStringLength());
+            frag_ = CopyPart(query_, rhs.query_, rhs.GetQueryStringLength());
+            base_ = CopyPart(frag_, rhs.frag_, rhs.GetFragStringLength());
+            uri_ = CopyPart(base_, rhs.base_, rhs.GetBaseStringLength());
+            CopyPart(uri_, rhs.uri_, rhs.GetStringLength());
+        }
+        return *this;
+    }
+
+    //! Getters
+    // Use with specializations of GenericValue
+    template<typename T> void Get(T& uri, Allocator& allocator) {
+        uri.template Set<const Ch*>(this->GetString(), allocator); // TypeHelper from document.h
+    }
+
+    const Ch* GetString() const { return uri_; }
+    SizeType GetStringLength() const { return uri_ == 0 ? 0 : internal::StrLen<Ch>(uri_); }
+    const Ch* GetBaseString() const { return base_; }
+    SizeType GetBaseStringLength() const { return base_ == 0 ? 0 : internal::StrLen<Ch>(base_); }
+    const Ch* GetSchemeString() const { return scheme_; }
+    SizeType GetSchemeStringLength() const { return scheme_ == 0 ? 0 : internal::StrLen<Ch>(scheme_); }
+    const Ch* GetAuthString() const { return auth_; }
+    SizeType GetAuthStringLength() const { return auth_ == 0 ? 0 : internal::StrLen<Ch>(auth_); }
+    const Ch* GetPathString() const { return path_; }
+    SizeType GetPathStringLength() const { return path_ == 0 ? 0 : internal::StrLen<Ch>(path_); }
+    const Ch* GetQueryString() const { return query_; }
+    SizeType GetQueryStringLength() const { return query_ == 0 ? 0 : internal::StrLen<Ch>(query_); }
+    const Ch* GetFragString() const { return frag_; }
+    SizeType GetFragStringLength() const { return frag_ == 0 ? 0 : internal::StrLen<Ch>(frag_); }
+
+#if RAPIDJSON_HAS_STDSTRING
+    static String Get(const GenericUri& uri) { return String(uri.GetString(), uri.GetStringLength()); }
+    static String GetBase(const GenericUri& uri) { return String(uri.GetBaseString(), uri.GetBaseStringLength()); }
+    static String GetScheme(const GenericUri& uri) { return String(uri.GetSchemeString(), uri.GetSchemeStringLength()); }
+    static String GetAuth(const GenericUri& uri) { return String(uri.GetAuthString(), uri.GetAuthStringLength()); }
+    static String GetPath(const GenericUri& uri) { return String(uri.GetPathString(), uri.GetPathStringLength()); }
+    static String GetQuery(const GenericUri& uri) { return String(uri.GetQueryString(), uri.GetQueryStringLength()); }
+    static String GetFrag(const GenericUri& uri) { return String(uri.GetFragString(), uri.GetFragStringLength()); }
+#endif
+
+    //! Equality operators
+    bool operator==(const GenericUri& rhs) const {
+        return Match(rhs, true);
+    }
+
+    bool operator!=(const GenericUri& rhs) const {
+        return !Match(rhs, true);
+    }
+
+    bool Match(const GenericUri& uri, bool full = true) const {
+        Ch* s1;
+        Ch* s2;
+        if (full) {
+            s1 = uri_;
+            s2 = uri.uri_;
+        } else {
+            s1 = base_;
+            s2 = uri.base_;
+        }
+        if (s1 == s2) return true;
+        if (s1 == 0 || s2 == 0) return false;
+        return internal::StrCmp<Ch>(s1, s2) == 0;
+    }
+
+    //! Resolve this URI against another (base) URI in accordance with URI resolution rules.
+    // See https://tools.ietf.org/html/rfc3986
+    // Use for resolving an id or $ref with an in-scope id.
+    // Returns a new GenericUri for the resolved URI.
+    GenericUri Resolve(const GenericUri& baseuri, Allocator* allocator = 0) {
+        GenericUri resuri;
+        resuri.allocator_ = allocator;
+        // Ensure enough space for combining paths
+        resuri.Allocate(GetStringLength() + baseuri.GetStringLength() + 1); // + 1 for joining slash
+
+        if (!(GetSchemeStringLength() == 0)) {
+            // Use all of this URI
+            resuri.auth_ = CopyPart(resuri.scheme_, scheme_, GetSchemeStringLength());
+            resuri.path_ = CopyPart(resuri.auth_, auth_, GetAuthStringLength());
+            resuri.query_ = CopyPart(resuri.path_, path_, GetPathStringLength());
+            resuri.frag_ = CopyPart(resuri.query_, query_, GetQueryStringLength());
+            resuri.RemoveDotSegments();
+        } else {
+            // Use the base scheme
+            resuri.auth_ = CopyPart(resuri.scheme_, baseuri.scheme_, baseuri.GetSchemeStringLength());
+            if (!(GetAuthStringLength() == 0)) {
+                // Use this auth, path, query
+                resuri.path_ = CopyPart(resuri.auth_, auth_, GetAuthStringLength());
+                resuri.query_ = CopyPart(resuri.path_, path_, GetPathStringLength());
+                resuri.frag_ = CopyPart(resuri.query_, query_, GetQueryStringLength());
+                resuri.RemoveDotSegments();
+            } else {
+                // Use the base auth
+                resuri.path_ = CopyPart(resuri.auth_, baseuri.auth_, baseuri.GetAuthStringLength());
+                if (GetPathStringLength() == 0) {
+                    // Use the base path
+                    resuri.query_ = CopyPart(resuri.path_, baseuri.path_, baseuri.GetPathStringLength());
+                    if (GetQueryStringLength() == 0) {
+                        // Use the base query
+                        resuri.frag_ = CopyPart(resuri.query_, baseuri.query_, baseuri.GetQueryStringLength());
+                    } else {
+                        // Use this query
+                        resuri.frag_ = CopyPart(resuri.query_, query_, GetQueryStringLength());
+                    }
+                } else {
+                    if (path_[0] == '/') {
+                        // Absolute path - use all of this path
+                        resuri.query_ = CopyPart(resuri.path_, path_, GetPathStringLength());
+                        resuri.RemoveDotSegments();
+                    } else {
+                        // Relative path - append this path to base path after base path's last slash
+                        size_t pos = 0;
+                        if (!(baseuri.GetAuthStringLength() == 0) && baseuri.GetPathStringLength() == 0) {
+                            resuri.path_[pos] = '/';
+                            pos++;
+                        }
+                        size_t lastslashpos = baseuri.GetPathStringLength();
+                        while (lastslashpos > 0) {
+                            if (baseuri.path_[lastslashpos - 1] == '/') break;
+                            lastslashpos--;
+                        }
+                        std::memcpy(&resuri.path_[pos], baseuri.path_, lastslashpos * sizeof(Ch));
+                        pos += lastslashpos;
+                        resuri.query_ = CopyPart(&resuri.path_[pos], path_, GetPathStringLength());
+                        resuri.RemoveDotSegments();
+                    }
+                    // Use this query
+                    resuri.frag_ = CopyPart(resuri.query_, query_, GetQueryStringLength());
+                }
+            }
+        }
+        // Always use this frag
+        resuri.base_ = CopyPart(resuri.frag_, frag_, GetFragStringLength());
+
+        // Re-constitute base_ and uri_
+        resuri.SetBase();
+        resuri.uri_ = resuri.base_ + resuri.GetBaseStringLength() + 1;
+        resuri.SetUri();
+        return resuri;
+    }
+
+    //! Get the allocator of this GenericUri.
+    Allocator& GetAllocator() { return *allocator_; }
+
+private:
+    // Allocate memory for a URI
+    // Returns total amount allocated
+    std::size_t Allocate(std::size_t len) {
+        // Create own allocator if user did not supply.
+        if (!allocator_)
+            ownAllocator_ =  allocator_ = RAPIDJSON_NEW(Allocator)();
+
+        // Allocate one block containing each part of the URI (5) plus base plus full URI, all null terminated.
+        // Order: scheme, auth, path, query, frag, base, uri
+        // Note need to set, increment, assign in 3 stages to avoid compiler warning bug.
+        size_t total = (3 * len + 7) * sizeof(Ch);
+        scheme_ = static_cast<Ch*>(allocator_->Malloc(total));
+        *scheme_ = '\0';
+        auth_ = scheme_;
+        auth_++;
+        *auth_ = '\0';
+        path_ = auth_;
+        path_++;
+        *path_ = '\0';
+        query_ = path_;
+        query_++;
+        *query_ = '\0';
+        frag_ = query_;
+        frag_++;
+        *frag_ = '\0';
+        base_ = frag_;
+        base_++;
+        *base_ = '\0';
+        uri_ = base_;
+        uri_++;
+        *uri_ = '\0';
+        return total;
+    }
+
+    // Free memory for a URI
+    void Free() {
+        if (scheme_) {
+            Allocator::Free(scheme_);
+            scheme_ = 0;
+        }
+    }
+
+    // Parse a URI into constituent scheme, authority, path, query, & fragment parts
+    // Supports URIs that match regex ^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))? as per
+    // https://tools.ietf.org/html/rfc3986
+    void Parse(const Ch* uri, std::size_t len) {
+        std::size_t start = 0, pos1 = 0, pos2 = 0;
+        Allocate(len);
+
+        // Look for scheme ([^:/?#]+):)?
+        if (start < len) {
+            while (pos1 < len) {
+                if (uri[pos1] == ':') break;
+                pos1++;
+            }
+            if (pos1 != len) {
+                while (pos2 < len) {
+                    if (uri[pos2] == '/') break;
+                    if (uri[pos2] == '?') break;
+                    if (uri[pos2] == '#') break;
+                    pos2++;
+                }
+                if (pos1 < pos2) {
+                    pos1++;
+                    std::memcpy(scheme_, &uri[start], pos1 * sizeof(Ch));
+                    scheme_[pos1] = '\0';
+                    start = pos1;
+                }
+            }
+        }
+        // Look for auth (//([^/?#]*))?
+        // Note need to set, increment, assign in 3 stages to avoid compiler warning bug.
+        auth_ = scheme_ + GetSchemeStringLength();
+        auth_++;
+        *auth_ = '\0';
+        if (start < len - 1 && uri[start] == '/' && uri[start + 1] == '/') {
+            pos2 = start + 2;
+            while (pos2 < len) {
+                if (uri[pos2] == '/') break;
+                if (uri[pos2] == '?') break;
+                if (uri[pos2] == '#') break;
+                pos2++;
+            }
+            std::memcpy(auth_, &uri[start], (pos2 - start) * sizeof(Ch));
+            auth_[pos2 - start] = '\0';
+            start = pos2;
+        }
+        // Look for path ([^?#]*)
+        // Note need to set, increment, assign in 3 stages to avoid compiler warning bug.
+        path_ = auth_ + GetAuthStringLength();
+        path_++;
+        *path_ = '\0';
+        if (start < len) {
+            pos2 = start;
+            while (pos2 < len) {
+                if (uri[pos2] == '?') break;
+                if (uri[pos2] == '#') break;
+                pos2++;
+            }
+            if (start != pos2) {
+                std::memcpy(path_, &uri[start], (pos2 - start) * sizeof(Ch));
+                path_[pos2 - start] = '\0';
+                if (path_[0] == '/')
+                    RemoveDotSegments();   // absolute path - normalize
+                start = pos2;
+            }
+        }
+        // Look for query (\?([^#]*))?
+        // Note need to set, increment, assign in 3 stages to avoid compiler warning bug.
+        query_ = path_ + GetPathStringLength();
+        query_++;
+        *query_ = '\0';
+        if (start < len && uri[start] == '?') {
+            pos2 = start + 1;
+            while (pos2 < len) {
+                if (uri[pos2] == '#') break;
+                pos2++;
+            }
+            if (start != pos2) {
+                std::memcpy(query_, &uri[start], (pos2 - start) * sizeof(Ch));
+                query_[pos2 - start] = '\0';
+                start = pos2;
+            }
+        }
+        // Look for fragment (#(.*))?
+        // Note need to set, increment, assign in 3 stages to avoid compiler warning bug.
+        frag_ = query_ + GetQueryStringLength();
+        frag_++;
+        *frag_ = '\0';
+        if (start < len && uri[start] == '#') {
+            std::memcpy(frag_, &uri[start], (len - start) * sizeof(Ch));
+            frag_[len - start] = '\0';
+        }
+
+        // Re-constitute base_ and uri_
+        base_ = frag_ + GetFragStringLength() + 1;
+        SetBase();
+        uri_ = base_ + GetBaseStringLength() + 1;
+        SetUri();
+    }
+
+    // Reconstitute base
+    void SetBase() {
+        Ch* next = base_;
+        std::memcpy(next, scheme_, GetSchemeStringLength() * sizeof(Ch));
+        next+= GetSchemeStringLength();
+        std::memcpy(next, auth_, GetAuthStringLength() * sizeof(Ch));
+        next+= GetAuthStringLength();
+        std::memcpy(next, path_, GetPathStringLength() * sizeof(Ch));
+        next+= GetPathStringLength();
+        std::memcpy(next, query_, GetQueryStringLength() * sizeof(Ch));
+        next+= GetQueryStringLength();
+        *next = '\0';
+    }
+
+    // Reconstitute uri
+    void SetUri() {
+        Ch* next = uri_;
+        std::memcpy(next, base_, GetBaseStringLength() * sizeof(Ch));
+        next+= GetBaseStringLength();
+        std::memcpy(next, frag_, GetFragStringLength() * sizeof(Ch));
+        next+= GetFragStringLength();
+        *next = '\0';
+    }
+
+    // Copy a part from one GenericUri to another
+    // Return the pointer to the next part to be copied to
+    Ch* CopyPart(Ch* to, Ch* from, std::size_t len) {
+        RAPIDJSON_ASSERT(to != 0);
+        RAPIDJSON_ASSERT(from != 0);
+        std::memcpy(to, from, len * sizeof(Ch));
+        to[len] = '\0';
+        Ch* next = to + len + 1;
+        return next;
+    }
+
+    // Remove . and .. segments from the path_ member.
+    // https://tools.ietf.org/html/rfc3986
+    // This is done in place as we are only removing segments.
+    void RemoveDotSegments() {
+        std::size_t pathlen = GetPathStringLength();
+        std::size_t pathpos = 0;  // Position in path_
+        std::size_t newpos = 0;   // Position in new path_
+
+        // Loop through each segment in original path_
+        while (pathpos < pathlen) {
+            // Get next segment, bounded by '/' or end
+            size_t slashpos = 0;
+            while ((pathpos + slashpos) < pathlen) {
+                if (path_[pathpos + slashpos] == '/') break;
+                slashpos++;
+            }
+            // Check for .. and . segments
+            if (slashpos == 2 && path_[pathpos] == '.' && path_[pathpos + 1] == '.') {
+                // Backup a .. segment in the new path_
+                // We expect to find a previously added slash at the end or nothing
+                RAPIDJSON_ASSERT(newpos == 0 || path_[newpos - 1] == '/');
+                size_t lastslashpos = newpos;
+                // Make sure we don't go beyond the start segment
+                if (lastslashpos > 1) {
+                    // Find the next to last slash and back up to it
+                    lastslashpos--;
+                    while (lastslashpos > 0) {
+                        if (path_[lastslashpos - 1] == '/') break;
+                        lastslashpos--;
+                    }
+                    // Set the new path_ position
+                    newpos = lastslashpos;
+                }
+            } else if (slashpos == 1 && path_[pathpos] == '.') {
+                // Discard . segment, leaves new path_ unchanged
+            } else {
+                // Move any other kind of segment to the new path_
+                RAPIDJSON_ASSERT(newpos <= pathpos);
+                std::memmove(&path_[newpos], &path_[pathpos], slashpos * sizeof(Ch));
+                newpos += slashpos;
+                // Add slash if not at end
+                if ((pathpos + slashpos) < pathlen) {
+                    path_[newpos] = '/';
+                    newpos++;
+                }
+            }
+            // Move to next segment
+            pathpos += slashpos + 1;
+        }
+        path_[newpos] = '\0';
+    }
+
+    Ch* uri_;    // Everything
+    Ch* base_;   // Everything except fragment
+    Ch* scheme_; // Includes the :
+    Ch* auth_;   // Includes the //
+    Ch* path_;   // Absolute if starts with /
+    Ch* query_;  // Includes the ?
+    Ch* frag_;   // Includes the #
+
+    Allocator* allocator_;      //!< The current allocator. It is either user-supplied or equal to ownAllocator_.
+    Allocator* ownAllocator_;   //!< Allocator owned by this Uri.
+};
+
+//! GenericUri for Value (UTF-8, default allocator).
+typedef GenericUri<Value> Uri;
+
+RAPIDJSON_NAMESPACE_END
+
+#if defined(__clang__)
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_URI_H_
diff --git a/contrib/rapidjson/include/rapidjson/writer.h b/contrib/rapidjson/include/rapidjson/writer.h
index 8b389219a..632e02ce7 100644
--- a/contrib/rapidjson/include/rapidjson/writer.h
+++ b/contrib/rapidjson/include/rapidjson/writer.h
@@ -67,6 +67,7 @@ enum WriteFlag {
     kWriteNoFlags = 0,              //!< No flags are set.
     kWriteValidateEncodingFlag = 1, //!< Validate encoding of JSON strings.
     kWriteNanAndInfFlag = 2,        //!< Allow writing of Infinity, -Infinity and NaN.
+    kWriteNanAndInfNullFlag = 4,    //!< Allow writing of Infinity, -Infinity and NaN as null.
     kWriteDefaultFlags = RAPIDJSON_WRITE_DEFAULT_FLAGS  //!< Default write flags. Can be customized by defining RAPIDJSON_WRITE_DEFAULT_FLAGS
 };
 
@@ -348,8 +349,13 @@ protected:
 
     bool WriteDouble(double d) {
         if (internal::Double(d).IsNanOrInf()) {
-            if (!(writeFlags & kWriteNanAndInfFlag))
+            if (!(writeFlags & kWriteNanAndInfFlag) && !(writeFlags & kWriteNanAndInfNullFlag))
                 return false;
+            if (writeFlags & kWriteNanAndInfNullFlag) {
+                PutReserve(*os_, 4);
+                PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'u'); PutUnsafe(*os_, 'l'); PutUnsafe(*os_, 'l');
+                return true;
+            }
             if (internal::Double(d).IsNan()) {
                 PutReserve(*os_, 3);
                 PutUnsafe(*os_, 'N'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'N');
@@ -548,6 +554,11 @@ inline bool Writer<StringBuffer>::WriteDouble(double d) {
         // Note: This code path can only be reached if (RAPIDJSON_WRITE_DEFAULT_FLAGS & kWriteNanAndInfFlag).
         if (!(kWriteDefaultFlags & kWriteNanAndInfFlag))
             return false;
+        if (kWriteDefaultFlags & kWriteNanAndInfNullFlag) {
+            PutReserve(*os_, 4);
+            PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'u'); PutUnsafe(*os_, 'l'); PutUnsafe(*os_, 'l');
+            return true;
+        }
         if (internal::Double(d).IsNan()) {
             PutReserve(*os_, 3);
             PutUnsafe(*os_, 'N'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'N');
diff --git a/contrib/rapidjson/readme.md b/contrib/rapidjson/readme.md
index b833a98e8..ac683b051 100644
--- a/contrib/rapidjson/readme.md
+++ b/contrib/rapidjson/readme.md
@@ -6,7 +6,7 @@
 
 Tencent is pleased to support the open source community by making RapidJSON available.
 
-Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 
 * [RapidJSON GitHub](https://github.com/Tencent/rapidjson/)
 * RapidJSON Documentation
@@ -43,7 +43,7 @@ RapidJSON is a JSON parser and generator for C++. It was inspired by [RapidXml](
 
 More features can be read [here](doc/features.md).
 
-JSON(JavaScript Object Notation) is a light-weight data exchange format. RapidJSON should be in fully compliance with RFC7159/ECMA-404, with optional support of relaxed syntax. More information about JSON can be obtained at
+JSON(JavaScript Object Notation) is a light-weight data exchange format. RapidJSON should be in full compliance with RFC7159/ECMA-404, with optional support of relaxed syntax. More information about JSON can be obtained at
 * [Introducing JSON](http://json.org/)
 * [RFC7159: The JavaScript Object Notation (JSON) Data Interchange Format](https://tools.ietf.org/html/rfc7159)
 * [Standard ECMA-404: The JSON Data Interchange Format](https://www.ecma-international.org/publications/standards/Ecma-404.htm)
@@ -72,6 +72,9 @@ Users can build and run the unit tests on their platform/compiler.
 
 RapidJSON is a header-only C++ library. Just copy the `include/rapidjson` folder to system or project's include path.
 
+Alternatively, if you are using the [vcpkg](https://github.com/Microsoft/vcpkg/) dependency manager you can download and install rapidjson with CMake integration in a single command:
+* vcpkg install rapidjson
+
 RapidJSON uses following software as its dependencies:
 * [CMake](https://cmake.org/) as a general build tool
 * (optional) [Doxygen](http://www.doxygen.org) to build documentation
@@ -158,3 +161,50 @@ More [examples](https://github.com/Tencent/rapidjson/tree/master/example) are av
   * [parsebyparts](https://github.com/Tencent/rapidjson/blob/master/example/parsebyparts/parsebyparts.cpp): Implements an `AsyncDocumentParser` which can parse JSON in parts, using C++11 thread.
   * [filterkey](https://github.com/Tencent/rapidjson/blob/master/example/filterkey/filterkey.cpp): A command line tool to remove all values with user-specified key.
   * [filterkeydom](https://github.com/Tencent/rapidjson/blob/master/example/filterkeydom/filterkeydom.cpp): Same tool as above, but it demonstrates how to use a generator to populate a `Document`.
+
+## Contributing
+
+RapidJSON welcomes contributions. When contributing, please follow the code below.
+
+### Issues
+
+Feel free to submit issues and enhancement requests.
+
+Please help us by providing **minimal reproducible examples**, because source code is easier to let other people understand what happens.
+For crash problems on certain platforms, please bring stack dump content with the detail of the OS, compiler, etc.
+
+Please try breakpoint debugging first, tell us what you found, see if we can start exploring based on more information been prepared.
+
+### Workflow
+
+In general, we follow the "fork-and-pull" Git workflow.
+
+ 1. **Fork** the repo on GitHub
+ 2. **Clone** the project to your own machine
+ 3. **Checkout** a new branch on your fork, start developing on the branch
+ 4. **Test** the change before commit, Make sure the changes pass all the tests, including `unittest` and `preftest`, please add test case for each new feature or bug-fix if needed.
+ 5. **Commit** changes to your own branch
+ 6. **Push** your work back up to your fork
+ 7. Submit a **Pull request** so that we can review your changes
+
+NOTE: Be sure to merge the latest from "upstream" before making a pull request!
+
+### Copyright and Licensing
+
+You can copy and paste the license summary from below.
+
+```
+Tencent is pleased to support the open source community by making RapidJSON available.
+
+Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+
+Licensed under the MIT License (the "License"); you may not use this file except
+in compliance with the License. You may obtain a copy of the License at
+
+http://opensource.org/licenses/MIT
+
+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/contrib/stb/stb_image.h b/contrib/stb/stb_image.h
index 5e807a0a6..a632d5435 100644
--- a/contrib/stb/stb_image.h
+++ b/contrib/stb/stb_image.h
@@ -1,4 +1,4 @@
-/* stb_image - v2.28 - public domain image loader - http://nothings.org/stb
+/* stb_image - v2.29 - public domain image loader - http://nothings.org/stb
                                   no warranty implied; use at your own risk
 
    Do this:
@@ -48,6 +48,7 @@ LICENSE
 
 RECENT REVISION HISTORY:
 
+      2.29  (2023-05-xx) optimizations
       2.28  (2023-01-29) many error fixes, security errors, just tons of stuff
       2.27  (2021-07-11) document stbi_info better, 16-bit PNM support, bug fixes
       2.26  (2020-07-13) many minor fixes
@@ -1072,8 +1073,8 @@ static int stbi__addints_valid(int a, int b)
    return a <= INT_MAX - b;
 }
 
-// returns 1 if the product of two signed shorts is valid, 0 on overflow.
-static int stbi__mul2shorts_valid(short a, short b)
+// returns 1 if the product of two ints fits in a signed short, 0 on overflow.
+static int stbi__mul2shorts_valid(int a, int b)
 {
    if (b == 0 || b == -1) return 1; // multiplication by 0 is always 0; check for -1 so SHRT_MIN/b doesn't overflow
    if ((a >= 0) == (b >= 0)) return a <= SHRT_MAX/b; // product is positive, so similar to mul2sizes_valid
@@ -3384,13 +3385,13 @@ static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan)
    return 1;
 }
 
-static int stbi__skip_jpeg_junk_at_end(stbi__jpeg *j)
+static stbi_uc stbi__skip_jpeg_junk_at_end(stbi__jpeg *j)
 {
    // some JPEGs have junk at end, skip over it but if we find what looks
    // like a valid marker, resume there
    while (!stbi__at_eof(j->s)) {
-      int x = stbi__get8(j->s);
-      while (x == 255) { // might be a marker
+      stbi_uc x = stbi__get8(j->s);
+      while (x == 0xff) { // might be a marker
          if (stbi__at_eof(j->s)) return STBI__MARKER_none;
          x = stbi__get8(j->s);
          if (x != 0x00 && x != 0xff) {
@@ -4176,6 +4177,7 @@ typedef struct
 {
    stbi_uc *zbuffer, *zbuffer_end;
    int num_bits;
+   int hit_zeof_once;
    stbi__uint32 code_buffer;
 
    char *zout;
@@ -4242,9 +4244,20 @@ stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z)
    int b,s;
    if (a->num_bits < 16) {
       if (stbi__zeof(a)) {
-         return -1;   /* report error for unexpected end of data. */
+         if (!a->hit_zeof_once) {
+            // This is the first time we hit eof, insert 16 extra padding btis
+            // to allow us to keep going; if we actually consume any of them
+            // though, that is invalid data. This is caught later.
+            a->hit_zeof_once = 1;
+            a->num_bits += 16; // add 16 implicit zero bits
+         } else {
+            // We already inserted our extra 16 padding bits and are again
+            // out, this stream is actually prematurely terminated.
+            return -1;
+         }
+      } else {
+         stbi__fill_bits(a);
       }
-      stbi__fill_bits(a);
    }
    b = z->fast[a->code_buffer & STBI__ZFAST_MASK];
    if (b) {
@@ -4309,6 +4322,13 @@ static int stbi__parse_huffman_block(stbi__zbuf *a)
          int len,dist;
          if (z == 256) {
             a->zout = zout;
+            if (a->hit_zeof_once && a->num_bits < 16) {
+               // The first time we hit zeof, we inserted 16 extra zero bits into our bit
+               // buffer so the decoder can just do its speculative decoding. But if we
+               // actually consumed any of those bits (which is the case when num_bits < 16),
+               // the stream actually read past the end so it is malformed.
+               return stbi__err("unexpected end","Corrupt PNG");
+            }
             return 1;
          }
          if (z >= 286) return stbi__err("bad huffman code","Corrupt PNG"); // per DEFLATE, length codes 286 and 287 must not appear in compressed data
@@ -4320,7 +4340,7 @@ static int stbi__parse_huffman_block(stbi__zbuf *a)
          dist = stbi__zdist_base[z];
          if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]);
          if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG");
-         if (zout + len > a->zout_end) {
+         if (len > a->zout_end - zout) {
             if (!stbi__zexpand(a, zout, len)) return 0;
             zout = a->zout;
          }
@@ -4464,6 +4484,7 @@ static int stbi__parse_zlib(stbi__zbuf *a, int parse_header)
       if (!stbi__parse_zlib_header(a)) return 0;
    a->num_bits = 0;
    a->code_buffer = 0;
+   a->hit_zeof_once = 0;
    do {
       final = stbi__zreceive(a,1);
       type = stbi__zreceive(a,2);
@@ -4619,9 +4640,8 @@ enum {
    STBI__F_up=2,
    STBI__F_avg=3,
    STBI__F_paeth=4,
-   // synthetic filters used for first scanline to avoid needing a dummy row of 0s
-   STBI__F_avg_first,
-   STBI__F_paeth_first
+   // synthetic filter used for first scanline to avoid needing a dummy row of 0s
+   STBI__F_avg_first
 };
 
 static stbi_uc first_row_filter[5] =
@@ -4630,29 +4650,56 @@ static stbi_uc first_row_filter[5] =
    STBI__F_sub,
    STBI__F_none,
    STBI__F_avg_first,
-   STBI__F_paeth_first
+   STBI__F_sub // Paeth with b=c=0 turns out to be equivalent to sub
 };
 
 static int stbi__paeth(int a, int b, int c)
 {
-   int p = a + b - c;
-   int pa = abs(p-a);
-   int pb = abs(p-b);
-   int pc = abs(p-c);
-   if (pa <= pb && pa <= pc) return a;
-   if (pb <= pc) return b;
-   return c;
+   // This formulation looks very different from the reference in the PNG spec, but is
+   // actually equivalent and has favorable data dependencies and admits straightforward
+   // generation of branch-free code, which helps performance significantly.
+   int thresh = c*3 - (a + b);
+   int lo = a < b ? a : b;
+   int hi = a < b ? b : a;
+   int t0 = (hi <= thresh) ? lo : c;
+   int t1 = (thresh <= lo) ? hi : t0;
+   return t1;
 }
 
 static const stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 };
 
+// adds an extra all-255 alpha channel
+// dest == src is legal
+// img_n must be 1 or 3
+static void stbi__create_png_alpha_expand8(stbi_uc *dest, stbi_uc *src, stbi__uint32 x, int img_n)
+{
+   int i;
+   // must process data backwards since we allow dest==src
+   if (img_n == 1) {
+      for (i=x-1; i >= 0; --i) {
+         dest[i*2+1] = 255;
+         dest[i*2+0] = src[i];
+      }
+   } else {
+      STBI_ASSERT(img_n == 3);
+      for (i=x-1; i >= 0; --i) {
+         dest[i*4+3] = 255;
+         dest[i*4+2] = src[i*3+2];
+         dest[i*4+1] = src[i*3+1];
+         dest[i*4+0] = src[i*3+0];
+      }
+   }
+}
+
 // create the png data from post-deflated data
 static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color)
 {
-   int bytes = (depth == 16? 2 : 1);
+   int bytes = (depth == 16 ? 2 : 1);
    stbi__context *s = a->s;
    stbi__uint32 i,j,stride = x*out_n*bytes;
    stbi__uint32 img_len, img_width_bytes;
+   stbi_uc *filter_buf;
+   int all_ok = 1;
    int k;
    int img_n = s->img_n; // copy it into a local for later
 
@@ -4664,8 +4711,11 @@ static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 r
    a->out = (stbi_uc *) stbi__malloc_mad3(x, y, output_bytes, 0); // extra bytes to write off the end into
    if (!a->out) return stbi__err("outofmem", "Out of memory");
 
+   // note: error exits here don't need to clean up a->out individually,
+   // stbi__do_png always does on error.
    if (!stbi__mad3sizes_valid(img_n, x, depth, 7)) return stbi__err("too large", "Corrupt PNG");
    img_width_bytes = (((img_n * x * depth) + 7) >> 3);
+   if (!stbi__mad2sizes_valid(img_width_bytes, y, img_width_bytes)) return stbi__err("too large", "Corrupt PNG");
    img_len = (img_width_bytes + 1) * y;
 
    // we used to check for exact match between raw_len and img_len on non-interlaced PNGs,
@@ -4673,189 +4723,137 @@ static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 r
    // so just check for raw_len < img_len always.
    if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG");
 
+   // Allocate two scan lines worth of filter workspace buffer.
+   filter_buf = (stbi_uc *) stbi__malloc_mad2(img_width_bytes, 2, 0);
+   if (!filter_buf) return stbi__err("outofmem", "Out of memory");
+
+   // Filtering for low-bit-depth images
+   if (depth < 8) {
+      filter_bytes = 1;
+      width = img_width_bytes;
+   }
+
    for (j=0; j < y; ++j) {
-      stbi_uc *cur = a->out + stride*j;
-      stbi_uc *prior;
+      // cur/prior filter buffers alternate
+      stbi_uc *cur = filter_buf + (j & 1)*img_width_bytes;
+      stbi_uc *prior = filter_buf + (~j & 1)*img_width_bytes;
+      stbi_uc *dest = a->out + stride*j;
+      int nk = width * filter_bytes;
       int filter = *raw++;
 
-      if (filter > 4)
-         return stbi__err("invalid filter","Corrupt PNG");
-
-      if (depth < 8) {
-         if (img_width_bytes > x) return stbi__err("invalid width","Corrupt PNG");
-         cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place
-         filter_bytes = 1;
-         width = img_width_bytes;
+      // check filter type
+      if (filter > 4) {
+         all_ok = stbi__err("invalid filter","Corrupt PNG");
+         break;
       }
-      prior = cur - stride; // bugfix: need to compute this after 'cur +=' computation above
 
       // if first row, use special filter that doesn't sample previous row
       if (j == 0) filter = first_row_filter[filter];
 
-      // handle first byte explicitly
-      for (k=0; k < filter_bytes; ++k) {
-         switch (filter) {
-            case STBI__F_none       : cur[k] = raw[k]; break;
-            case STBI__F_sub        : cur[k] = raw[k]; break;
-            case STBI__F_up         : cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break;
-            case STBI__F_avg        : cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); break;
-            case STBI__F_paeth      : cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(0,prior[k],0)); break;
-            case STBI__F_avg_first  : cur[k] = raw[k]; break;
-            case STBI__F_paeth_first: cur[k] = raw[k]; break;
-         }
+      // perform actual filtering
+      switch (filter) {
+      case STBI__F_none:
+         memcpy(cur, raw, nk);
+         break;
+      case STBI__F_sub:
+         memcpy(cur, raw, filter_bytes);
+         for (k = filter_bytes; k < nk; ++k)
+            cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]);
+         break;
+      case STBI__F_up:
+         for (k = 0; k < nk; ++k)
+            cur[k] = STBI__BYTECAST(raw[k] + prior[k]);
+         break;
+      case STBI__F_avg:
+         for (k = 0; k < filter_bytes; ++k)
+            cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1));
+         for (k = filter_bytes; k < nk; ++k)
+            cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1));
+         break;
+      case STBI__F_paeth:
+         for (k = 0; k < filter_bytes; ++k)
+            cur[k] = STBI__BYTECAST(raw[k] + prior[k]); // prior[k] == stbi__paeth(0,prior[k],0)
+         for (k = filter_bytes; k < nk; ++k)
+            cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes], prior[k], prior[k-filter_bytes]));
+         break;
+      case STBI__F_avg_first:
+         memcpy(cur, raw, filter_bytes);
+         for (k = filter_bytes; k < nk; ++k)
+            cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1));
+         break;
       }
 
-      if (depth == 8) {
-         if (img_n != out_n)
-            cur[img_n] = 255; // first pixel
-         raw += img_n;
-         cur += out_n;
-         prior += out_n;
-      } else if (depth == 16) {
-         if (img_n != out_n) {
-            cur[filter_bytes]   = 255; // first pixel top byte
-            cur[filter_bytes+1] = 255; // first pixel bottom byte
-         }
-         raw += filter_bytes;
-         cur += output_bytes;
-         prior += output_bytes;
-      } else {
-         raw += 1;
-         cur += 1;
-         prior += 1;
-      }
+      raw += nk;
 
-      // this is a little gross, so that we don't switch per-pixel or per-component
-      if (depth < 8 || img_n == out_n) {
-         int nk = (width - 1)*filter_bytes;
-         #define STBI__CASE(f) \
-             case f:     \
-                for (k=0; k < nk; ++k)
-         switch (filter) {
-            // "none" filter turns into a memcpy here; make that explicit.
-            case STBI__F_none:         memcpy(cur, raw, nk); break;
-            STBI__CASE(STBI__F_sub)          { cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); } break;
-            STBI__CASE(STBI__F_up)           { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break;
-            STBI__CASE(STBI__F_avg)          { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); } break;
-            STBI__CASE(STBI__F_paeth)        { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); } break;
-            STBI__CASE(STBI__F_avg_first)    { cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); } break;
-            STBI__CASE(STBI__F_paeth_first)  { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); } break;
-         }
-         #undef STBI__CASE
-         raw += nk;
-      } else {
-         STBI_ASSERT(img_n+1 == out_n);
-         #define STBI__CASE(f) \
-             case f:     \
-                for (i=x-1; i >= 1; --i, cur[filter_bytes]=255,raw+=filter_bytes,cur+=output_bytes,prior+=output_bytes) \
-                   for (k=0; k < filter_bytes; ++k)
-         switch (filter) {
-            STBI__CASE(STBI__F_none)         { cur[k] = raw[k]; } break;
-            STBI__CASE(STBI__F_sub)          { cur[k] = STBI__BYTECAST(raw[k] + cur[k- output_bytes]); } break;
-            STBI__CASE(STBI__F_up)           { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break;
-            STBI__CASE(STBI__F_avg)          { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k- output_bytes])>>1)); } break;
-            STBI__CASE(STBI__F_paeth)        { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],prior[k],prior[k- output_bytes])); } break;
-            STBI__CASE(STBI__F_avg_first)    { cur[k] = STBI__BYTECAST(raw[k] + (cur[k- output_bytes] >> 1)); } break;
-            STBI__CASE(STBI__F_paeth_first)  { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],0,0)); } break;
-         }
-         #undef STBI__CASE
-
-         // the loop above sets the high byte of the pixels' alpha, but for
-         // 16 bit png files we also need the low byte set. we'll do that here.
-         if (depth == 16) {
-            cur = a->out + stride*j; // start at the beginning of the row again
-            for (i=0; i < x; ++i,cur+=output_bytes) {
-               cur[filter_bytes+1] = 255;
-            }
-         }
-      }
-   }
-
-   // we make a separate pass to expand bits to pixels; for performance,
-   // this could run two scanlines behind the above code, so it won't
-   // intefere with filtering but will still be in the cache.
-   if (depth < 8) {
-      for (j=0; j < y; ++j) {
-         stbi_uc *cur = a->out + stride*j;
-         stbi_uc *in  = a->out + stride*j + x*out_n - img_width_bytes;
-         // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit
-         // png guarante byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop
+      // expand decoded bits in cur to dest, also adding an extra alpha channel if desired
+      if (depth < 8) {
          stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range
+         stbi_uc *in = cur;
+         stbi_uc *out = dest;
+         stbi_uc inb = 0;
+         stbi__uint32 nsmp = x*img_n;
 
-         // note that the final byte might overshoot and write more data than desired.
-         // we can allocate enough data that this never writes out of memory, but it
-         // could also overwrite the next scanline. can it overwrite non-empty data
-         // on the next scanline? yes, consider 1-pixel-wide scanlines with 1-bit-per-pixel.
-         // so we need to explicitly clamp the final ones
-
+         // expand bits to bytes first
          if (depth == 4) {
-            for (k=x*img_n; k >= 2; k-=2, ++in) {
-               *cur++ = scale * ((*in >> 4)       );
-               *cur++ = scale * ((*in     ) & 0x0f);
+            for (i=0; i < nsmp; ++i) {
+               if ((i & 1) == 0) inb = *in++;
+               *out++ = scale * (inb >> 4);
+               inb <<= 4;
             }
-            if (k > 0) *cur++ = scale * ((*in >> 4)       );
          } else if (depth == 2) {
-            for (k=x*img_n; k >= 4; k-=4, ++in) {
-               *cur++ = scale * ((*in >> 6)       );
-               *cur++ = scale * ((*in >> 4) & 0x03);
-               *cur++ = scale * ((*in >> 2) & 0x03);
-               *cur++ = scale * ((*in     ) & 0x03);
+            for (i=0; i < nsmp; ++i) {
+               if ((i & 3) == 0) inb = *in++;
+               *out++ = scale * (inb >> 6);
+               inb <<= 2;
             }
-            if (k > 0) *cur++ = scale * ((*in >> 6)       );
-            if (k > 1) *cur++ = scale * ((*in >> 4) & 0x03);
-            if (k > 2) *cur++ = scale * ((*in >> 2) & 0x03);
-         } else if (depth == 1) {
-            for (k=x*img_n; k >= 8; k-=8, ++in) {
-               *cur++ = scale * ((*in >> 7)       );
-               *cur++ = scale * ((*in >> 6) & 0x01);
-               *cur++ = scale * ((*in >> 5) & 0x01);
-               *cur++ = scale * ((*in >> 4) & 0x01);
-               *cur++ = scale * ((*in >> 3) & 0x01);
-               *cur++ = scale * ((*in >> 2) & 0x01);
-               *cur++ = scale * ((*in >> 1) & 0x01);
-               *cur++ = scale * ((*in     ) & 0x01);
+         } else {
+            STBI_ASSERT(depth == 1);
+            for (i=0; i < nsmp; ++i) {
+               if ((i & 7) == 0) inb = *in++;
+               *out++ = scale * (inb >> 7);
+               inb <<= 1;
             }
-            if (k > 0) *cur++ = scale * ((*in >> 7)       );
-            if (k > 1) *cur++ = scale * ((*in >> 6) & 0x01);
-            if (k > 2) *cur++ = scale * ((*in >> 5) & 0x01);
-            if (k > 3) *cur++ = scale * ((*in >> 4) & 0x01);
-            if (k > 4) *cur++ = scale * ((*in >> 3) & 0x01);
-            if (k > 5) *cur++ = scale * ((*in >> 2) & 0x01);
-            if (k > 6) *cur++ = scale * ((*in >> 1) & 0x01);
          }
-         if (img_n != out_n) {
-            int q;
-            // insert alpha = 255
-            cur = a->out + stride*j;
+
+         // insert alpha=255 values if desired
+         if (img_n != out_n)
+            stbi__create_png_alpha_expand8(dest, dest, x, img_n);
+      } else if (depth == 8) {
+         if (img_n == out_n)
+            memcpy(dest, cur, x*img_n);
+         else
+            stbi__create_png_alpha_expand8(dest, cur, x, img_n);
+      } else if (depth == 16) {
+         // convert the image data from big-endian to platform-native
+         stbi__uint16 *dest16 = (stbi__uint16*)dest;
+         stbi__uint32 nsmp = x*img_n;
+
+         if (img_n == out_n) {
+            for (i = 0; i < nsmp; ++i, ++dest16, cur += 2)
+               *dest16 = (cur[0] << 8) | cur[1];
+         } else {
+            STBI_ASSERT(img_n+1 == out_n);
             if (img_n == 1) {
-               for (q=x-1; q >= 0; --q) {
-                  cur[q*2+1] = 255;
-                  cur[q*2+0] = cur[q];
+               for (i = 0; i < x; ++i, dest16 += 2, cur += 2) {
+                  dest16[0] = (cur[0] << 8) | cur[1];
+                  dest16[1] = 0xffff;
                }
             } else {
                STBI_ASSERT(img_n == 3);
-               for (q=x-1; q >= 0; --q) {
-                  cur[q*4+3] = 255;
-                  cur[q*4+2] = cur[q*3+2];
-                  cur[q*4+1] = cur[q*3+1];
-                  cur[q*4+0] = cur[q*3+0];
+               for (i = 0; i < x; ++i, dest16 += 4, cur += 6) {
+                  dest16[0] = (cur[0] << 8) | cur[1];
+                  dest16[1] = (cur[2] << 8) | cur[3];
+                  dest16[2] = (cur[4] << 8) | cur[5];
+                  dest16[3] = 0xffff;
                }
             }
          }
       }
-   } else if (depth == 16) {
-      // force the image data from big-endian to platform-native.
-      // this is done in a separate pass due to the decoding relying
-      // on the data being untouched, but could probably be done
-      // per-line during decode if care is taken.
-      stbi_uc *cur = a->out;
-      stbi__uint16 *cur16 = (stbi__uint16*)cur;
-
-      for(i=0; i < x*y*out_n; ++i,cur16++,cur+=2) {
-         *cur16 = (cur[0] << 8) | cur[1];
-      }
    }
 
+   STBI_FREE(filter_buf);
+   if (!all_ok) return 0;
+
    return 1;
 }
 
diff --git a/contrib/tinyusdz/README.md b/contrib/tinyusdz/README.md
new file mode 100644
index 000000000..87b595993
--- /dev/null
+++ b/contrib/tinyusdz/README.md
@@ -0,0 +1,13 @@
+# tinyusdz
+"tinyusdz" C++ project provides USD/USDA/UDSC/UDSZ 3D model file format suport
+
+## Automatic repo clone
+tinyusdz repo is automatically cloned.  Users who haven't opted-in to USD support
+won't be burdened with the extra download volume.
+
+To update the git commit hash pulled down, modify `TINYUSDZ_GIT_TAG` in file
+    `code/CMakeLists.txt`
+
+## Notes
+Couldn't leverage tinyusdz CMakeLists.txt.  Fell back to compiling source files specified in
+"android" example.
diff --git a/contrib/tinyusdz/assimp_tinyusdz_logging.inc b/contrib/tinyusdz/assimp_tinyusdz_logging.inc
new file mode 100644
index 000000000..d1e8dd2b6
--- /dev/null
+++ b/contrib/tinyusdz/assimp_tinyusdz_logging.inc
@@ -0,0 +1,57 @@
+/**
+ * Usage
+ *   Add line below all other #include statements:
+ *     #include "../../../assimp_tinyusdz_logging.inc"
+ *   to files:
+ *    - contrib/tinyusdz/tinyusdz_repo/src/tydra/render-data.cc
+ *    - contrib/tinyusdz/tinyusdz_repo/src/tydra/scene-access.cc
+ */
+#pragma once
+
+#if defined(__ANDROID__)
+#include <sstream>
+#include <android/log.h>
+
+#define TINYUSDZLOGT(tag, ...)  ((void)__android_log_print(ANDROID_LOG_DEBUG,   tag, __VA_ARGS__))
+#define TINYUSDZLOG0(tag, ...)  ((void)__android_log_print(ANDROID_LOG_DEFAULT, tag, __VA_ARGS__))
+#define TINYUSDZLOGD(tag, ...)  ((void)__android_log_print(ANDROID_LOG_DEBUG,   tag, __VA_ARGS__))
+#define TINYUSDZLOGI(tag, ...)  ((void)__android_log_print(ANDROID_LOG_INFO,    tag, __VA_ARGS__))
+#define TINYUSDZLOGW(tag, ...)  ((void)__android_log_print(ANDROID_LOG_WARN,    tag, __VA_ARGS__))
+#define TINYUSDZLOGE(tag, ...)  ((void)__android_log_print(ANDROID_LOG_ERROR,   tag, __VA_ARGS__))
+#else
+#define TINYUSDZLOGT(tag, ...)
+#define TINYUSDZLOG0(tag, ...)
+#define TINYUSDZLOGD(tag, ...)
+#define TINYUSDZLOGI(tag, ...)
+#define TINYUSDZLOGW(tag, ...)
+#define TINYUSDZLOGE(tag, ...)
+#endif // #if defined(__ANDROID__)
+
+#if defined(TINYUSDZ_LOCAL_DEBUG_PRINT)
+#if defined(__ANDROID__)
+#if defined(ASSIMP_USD_VERBOSE_LOGS)
+// Works well but _extremely_ verbose
+#define DCOUT(x)                                               \
+  do {                                                         \
+    std::stringstream ss;                                      \
+    ss << __FILE__ << ":" << __func__ << ":"                   \
+              << std::to_string(__LINE__) << " " << x << "\n"; \
+    TINYUSDZLOGE("tinyusdz", "%s", ss.str().c_str());          \
+  } while (false)
+#else // defined(ASSIMP_USD_VERBOSE_LOGS)
+// Silent version
+#define DCOUT(x)                                               \
+  do {                                                         \
+    std::stringstream ss;                                      \
+    ss << __FILE__ << ":" << __func__ << ":"                   \
+              << std::to_string(__LINE__) << " " << x << "\n"; \
+  } while (false)
+#endif // defined(ASSIMP_USD_VERBOSE_LOGS)
+#else // defined(__ANDROID__)
+#define DCOUT(x)                                               \
+  do {                                                         \
+    std::cout << __FILE__ << ":" << __func__ << ":"            \
+              << std::to_string(__LINE__) << " " << x << "\n"; \
+  } while (false)
+#endif // #if defined(__ANDROID__)
+#endif // #if defined(TINYUSDZ_LOCAL_DEBUG_PRINT)
\ No newline at end of file
diff --git a/contrib/tinyusdz/patches/README.md b/contrib/tinyusdz/patches/README.md
new file mode 100644
index 000000000..a6b2040c3
--- /dev/null
+++ b/contrib/tinyusdz/patches/README.md
@@ -0,0 +1,40 @@
+# Tinyusdz patch files
+
+Pending acceptance of proposed changes upstream, need to resort to patching to keep things moving
+
+## Tinyusdz files needing patches
+
+### `tinyusdz_repo/src/external/stb_image_resize2.h`
+Without patch, build will fail for armeabi-v7a ABI via android NDK
+
+Add `#elif` block as indicated below around line `2407`
+```
+#elif defined(STBIR_WASM) || (defined(STBIR_NEON) && defined(_MSC_VER) && defined(_M_ARM)) // WASM or 32-bit ARM on MSVC/clang
+...
+#elif defined(STBIR_NEON) && (defined(__ANDROID__) && defined(__arm__)) // 32-bit ARM on android NDK
+
+  static stbir__inline void stbir__half_to_float_SIMD(float * output, stbir__FP16 const * input)
+  {
+    // TODO: this stub is just to allow build on armeabi-v7a via android NDK
+  }
+
+  static stbir__inline void stbir__float_to_half_SIMD(stbir__FP16 * output, float const * input)
+  {
+    // TODO: this stub is just to allow build on armeabi-v7a via android NDK
+  }
+
+  static stbir__inline float stbir__half_to_float( stbir__FP16 h )
+  {
+    // TODO: this stub is just to allow build on armeabi-v7a via android NDK
+    return 0;
+  }
+
+  static stbir__inline stbir__FP16 stbir__float_to_half( float f )
+  {
+    // TODO: this stub is just to allow build on armeabi-v7a via android NDK
+    return 0;
+  }
+
+#elif defined(STBIR_NEON) && defined(_MSC_VER) && defined(_M_ARM64) && !defined(__clang__) // 64-bit ARM on MSVC (not clang)
+```
+
diff --git a/contrib/tinyusdz/patches/tinyusdz.patch b/contrib/tinyusdz/patches/tinyusdz.patch
new file mode 100644
index 000000000..2a883d16a
--- /dev/null
+++ b/contrib/tinyusdz/patches/tinyusdz.patch
@@ -0,0 +1,42 @@
+diff -rupN -x .git autoclone/tinyusdz_repo-src/src/external/stb_image_resize2.h tinyusdz_repo_patch/src/external/stb_image_resize2.h
+--- autoclone/tinyusdz_repo-src/src/external/stb_image_resize2.h	2024-10-27 03:26:45.457163600 -0700
++++ tinyusdz_repo_patch/src/external/stb_image_resize2.h	2024-10-27 03:31:09.255211100 -0700
+@@ -2500,6 +2500,38 @@ static stbir__inline stbir_uint8 stbir__
+     }
+   }
+ 
++#elif defined(STBIR_NEON) && (defined(__ANDROID__) && defined(__arm__)) // 32-bit ARM on android NDK
++
++  // TODO  As of Apr 2024, tinyusdz doesn't support building on armeabi-v7a (32 bit arm) for android
++  //  (falls through to arm64 block and build fails)
++  //
++  //  For assimp integration, the image processing utilities aren't used at all, so it's safe to
++  //  essentially replace the functions with dummy no-ops.
++  //
++  //  This will need to be done manually whenever the tinyusdz source files are updated in assimp,
++  //  as it seems unlikely this will be fixed in the tinyusdz project
++  static stbir__inline void stbir__half_to_float_SIMD(float * output, stbir__FP16 const * input)
++  {
++    // TODO: this stub is just to allow build on armeabi-v7a via android NDK
++  }
++
++  static stbir__inline void stbir__float_to_half_SIMD(stbir__FP16 * output, float const * input)
++  {
++    // TODO: this stub is just to allow build on armeabi-v7a via android NDK
++  }
++
++  static stbir__inline float stbir__half_to_float( stbir__FP16 h )
++  {
++    // TODO: this stub is just to allow build on armeabi-v7a via android NDK
++    return 0;
++  }
++
++  static stbir__inline stbir__FP16 stbir__float_to_half( float f )
++  {
++    // TODO: this stub is just to allow build on armeabi-v7a via android NDK
++    return 0;
++  }
++
+ #endif
+ 
+ 
diff --git a/contrib/unzip/crypt.h b/contrib/unzip/crypt.h
index 1cc41f19d..f4b93b78d 100644
--- a/contrib/unzip/crypt.h
+++ b/contrib/unzip/crypt.h
@@ -32,8 +32,7 @@
 /***********************************************************************
  * Return the next byte in the pseudo-random sequence
  */
-static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab)
-{
+static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab) {
     unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
                      * unpredictable manner on 16-bit systems; not a problem
                      * with any known compiler so far, though */
@@ -46,8 +45,7 @@ static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab)
 /***********************************************************************
  * Update the encryption keys with the next byte of plain text
  */
-static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c)
-{
+static int update_keys(unsigned long* pkeys, const z_crc_t* pcrc_32_tab, int c) {
     (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
     (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
     (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
@@ -63,8 +61,7 @@ static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c)
  * Initialize the encryption keys and the random header according to
  * the given password.
  */
-static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcrc_32_tab)
-{
+static void init_keys(const char* passwd, unsigned long* pkeys, const z_crc_t* pcrc_32_tab) {
     *(pkeys+0) = 305419896L;
     *(pkeys+1) = 591751049L;
     *(pkeys+2) = 878082192L;
@@ -93,8 +90,7 @@ static unsigned crypthead(const char* passwd,       /* password string */
                           int bufSize,
                           unsigned long* pkeys,
                           const z_crc_t* pcrc_32_tab,
-                          unsigned long crcForCrypting)
-{
+                          unsigned long crcForCrypting) {
     unsigned n;                  /* index in random header */
     int t;                       /* temporary */
     int c;                       /* random byte */
diff --git a/contrib/unzip/ioapi.c b/contrib/unzip/ioapi.c
index 0ca29db6a..782d32469 100644
--- a/contrib/unzip/ioapi.c
+++ b/contrib/unzip/ioapi.c
@@ -14,7 +14,7 @@
         #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#if defined(__APPLE__) || defined(IOAPI_NO_64)
+#if defined(__APPLE__) || defined(IOAPI_NO_64) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_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)
@@ -28,8 +28,7 @@
 
 #include "ioapi.h"
 
-voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)
-{
+voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc, const void*filename, int mode) {
     if (pfilefunc->zfile_func64.zopen64_file != NULL)
         return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode);
     else
@@ -38,8 +37,7 @@ voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename
     }
 }
 
-long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)
-{
+long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin) {
     if (pfilefunc->zfile_func64.zseek64_file != NULL)
         return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
     else
@@ -52,8 +50,7 @@ long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZP
     }
 }
 
-ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)
-{
+ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc, voidpf filestream) {
     if (pfilefunc->zfile_func64.zseek64_file != NULL)
         return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
     else
@@ -66,11 +63,9 @@ ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream
     }
 }
 
-void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32)
-{
+void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32, const zlib_filefunc_def* p_filefunc32) {
     p_filefunc64_32->zfile_func64.zopen64_file = NULL;
     p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
-    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
     p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
     p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
     p_filefunc64_32->zfile_func64.ztell64_file = NULL;
@@ -84,16 +79,7 @@ void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filef
 
 
 
-static voidpf  ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode));
-static uLong   ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-static uLong   ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
-static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
-static long    ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
-static int     ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
-static int     ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
-
-static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
-{
+static voidpf ZCALLBACK fopen_file_func(voidpf opaque, const char* filename, int mode) {
     FILE* file = NULL;
     const char* mode_fopen = NULL;
     (void)opaque;
@@ -111,8 +97,7 @@ static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, in
     return file;
 }
 
-static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
-{
+static voidpf ZCALLBACK fopen64_file_func(voidpf opaque, const void* filename, int mode) {
     FILE* file = NULL;
     const char* mode_fopen = NULL;
     (void)opaque;
@@ -131,24 +116,21 @@ static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename,
 }
 
 
-static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
-{
+static uLong ZCALLBACK fread_file_func(voidpf opaque, voidpf stream, void* buf, uLong size) {
     uLong ret;
     (void)opaque;
     ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
 }
 
-static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
-{
+static uLong ZCALLBACK fwrite_file_func(voidpf opaque, voidpf stream, const void* buf, uLong size) {
     uLong ret;
     (void)opaque;
     ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
 }
 
-static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
-{
+static long ZCALLBACK ftell_file_func(voidpf opaque, voidpf stream) {
     long ret;
     (void)opaque;
     ret = ftell((FILE *)stream);
@@ -156,16 +138,14 @@ static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
 }
 
 
-static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
-{
+static ZPOS64_T ZCALLBACK ftell64_file_func(voidpf opaque, voidpf stream) {
     ZPOS64_T ret;
     (void)opaque;
     ret = (ZPOS64_T)FTELLO_FUNC((FILE *)stream);
     return ret;
 }
 
-static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offset, int origin)
-{
+static long ZCALLBACK fseek_file_func(voidpf opaque, voidpf stream, uLong offset, int origin) {
     int fseek_origin=0;
     long ret;
     (void)opaque;
@@ -188,8 +168,7 @@ static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offs
     return ret;
 }
 
-static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T offset, int origin)
-{
+static long ZCALLBACK fseek64_file_func(voidpf opaque, voidpf stream, ZPOS64_T offset, int origin) {
     int fseek_origin=0;
     long ret;
     (void)opaque;
@@ -208,31 +187,28 @@ static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T
     }
     ret = 0;
 
-    if(FSEEKO_FUNC((FILE *)stream, (z_off_t)offset, fseek_origin) != 0)
+    if(FSEEKO_FUNC((FILE *)stream, (z_off64_t)offset, fseek_origin) != 0)
                         ret = -1;
 
     return ret;
 }
 
 
-static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
-{
+static int ZCALLBACK fclose_file_func(voidpf opaque, voidpf stream) {
     int ret;
     (void)opaque;
     ret = fclose((FILE *)stream);
     return ret;
 }
 
-static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
-{
+static int ZCALLBACK ferror_file_func(voidpf opaque, voidpf stream) {
     int ret;
     (void)opaque;
     ret = ferror((FILE *)stream);
     return ret;
 }
 
-void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
-{
+void fill_fopen_filefunc(zlib_filefunc_def* pzlib_filefunc_def) {
     pzlib_filefunc_def->zopen_file = fopen_file_func;
     pzlib_filefunc_def->zread_file = fread_file_func;
     pzlib_filefunc_def->zwrite_file = fwrite_file_func;
@@ -243,8 +219,7 @@ void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
     pzlib_filefunc_def->opaque = NULL;
 }
 
-void fill_fopen64_filefunc (zlib_filefunc64_def*  pzlib_filefunc_def)
-{
+void fill_fopen64_filefunc(zlib_filefunc64_def* pzlib_filefunc_def) {
     pzlib_filefunc_def->zopen64_file = fopen64_file_func;
     pzlib_filefunc_def->zread_file = fread_file_func;
     pzlib_filefunc_def->zwrite_file = fwrite_file_func;
diff --git a/contrib/unzip/ioapi.h b/contrib/unzip/ioapi.h
index 548dafb5e..a2d2e6e60 100644
--- a/contrib/unzip/ioapi.h
+++ b/contrib/unzip/ioapi.h
@@ -50,7 +50,7 @@
 #define ftello64 ftell
 #define fseeko64 fseek
 #else
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64)
 #define fopen64 fopen
 #define ftello64 ftello
 #define fseeko64 fseeko
@@ -82,7 +82,7 @@
 #include "mz64conf.h"
 #endif
 
-/* a type choosen by DEFINE */
+/* a type chosen by DEFINE */
 #ifdef HAVE_64BIT_INT_CUSTOM
 typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;
 #else
@@ -134,17 +134,17 @@ extern "C" {
 
 
 
-typedef voidpf   (ZCALLBACK *open_file_func)      OF((voidpf opaque, const char* filename, int mode));
-typedef uLong    (ZCALLBACK *read_file_func)      OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-typedef uLong    (ZCALLBACK *write_file_func)     OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-typedef int      (ZCALLBACK *close_file_func)     OF((voidpf opaque, voidpf stream));
-typedef int      (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
+typedef voidpf   (ZCALLBACK *open_file_func)      (voidpf opaque, const char* filename, int mode);
+typedef uLong    (ZCALLBACK *read_file_func)      (voidpf opaque, voidpf stream, void* buf, uLong size);
+typedef uLong    (ZCALLBACK *write_file_func)     (voidpf opaque, voidpf stream, const void* buf, uLong size);
+typedef int      (ZCALLBACK *close_file_func)     (voidpf opaque, voidpf stream);
+typedef int      (ZCALLBACK *testerror_file_func) (voidpf opaque, voidpf stream);
 
-typedef long     (ZCALLBACK *tell_file_func)      OF((voidpf opaque, voidpf stream));
-typedef long     (ZCALLBACK *seek_file_func)      OF((voidpf opaque, voidpf stream, uLong offset, int origin));
+typedef long     (ZCALLBACK *tell_file_func)      (voidpf opaque, voidpf stream);
+typedef long     (ZCALLBACK *seek_file_func)      (voidpf opaque, voidpf stream, uLong offset, int origin);
 
 
-/* here is the "old" 32 bits structure structure */
+/* here is the "old" 32 bits structure */
 typedef struct zlib_filefunc_def_s
 {
     open_file_func      zopen_file;
@@ -157,9 +157,9 @@ typedef struct zlib_filefunc_def_s
     voidpf              opaque;
 } zlib_filefunc_def;
 
-typedef ZPOS64_T (ZCALLBACK *tell64_file_func)    OF((voidpf opaque, voidpf stream));
-typedef long     (ZCALLBACK *seek64_file_func)    OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
-typedef voidpf   (ZCALLBACK *open64_file_func)    OF((voidpf opaque, const void* filename, int mode));
+typedef ZPOS64_T (ZCALLBACK *tell64_file_func)    (voidpf opaque, voidpf stream);
+typedef long     (ZCALLBACK *seek64_file_func)    (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin);
+typedef voidpf   (ZCALLBACK *open64_file_func)    (voidpf opaque, const void* filename, int mode);
 
 typedef struct zlib_filefunc64_def_s
 {
@@ -173,8 +173,8 @@ typedef struct zlib_filefunc64_def_s
     voidpf              opaque;
 } zlib_filefunc64_def;
 
-void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+void fill_fopen64_filefunc(zlib_filefunc64_def* pzlib_filefunc_def);
+void fill_fopen_filefunc(zlib_filefunc_def* pzlib_filefunc_def);
 
 /* now internal definition, only for zip.c and unzip.h */
 typedef struct zlib_filefunc64_32_def_s
@@ -193,11 +193,11 @@ typedef struct zlib_filefunc64_32_def_s
 #define ZCLOSE64(filefunc,filestream)             ((*((filefunc).zfile_func64.zclose_file))  ((filefunc).zfile_func64.opaque,filestream))
 #define ZERROR64(filefunc,filestream)             ((*((filefunc).zfile_func64.zerror_file))  ((filefunc).zfile_func64.opaque,filestream))
 
-voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode));
-long    call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin));
-ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream));
+voidpf call_zopen64(const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode);
+long call_zseek64(const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin);
+ZPOS64_T call_ztell64(const zlib_filefunc64_32_def* pfilefunc,voidpf filestream);
 
-void    fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
+void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
 
 #define ZOPEN64(filefunc,filename,mode)         (call_zopen64((&(filefunc)),(filename),(mode)))
 #define ZTELL64(filefunc,filestream)            (call_ztell64((&(filefunc)),(filestream)))
diff --git a/contrib/unzip/unzip.c b/contrib/unzip/unzip.c
index e703549d2..ea05b7d62 100644
--- a/contrib/unzip/unzip.c
+++ b/contrib/unzip/unzip.c
@@ -49,12 +49,12 @@
         Copyright (C) 2007-2008 Even Rouault
 
 
-        Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again).
+  Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again).
   Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
                                 should only read the compressed/uncompressed size from the Zip64 format if
                                 the size from normal header was 0xFFFFFFFF
-  Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
-        Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)
+  Oct-2009 - Mathias Svensson - Applied some bug fixes from patches received from Gilles Vollant
+  Oct-2009 - Mathias Svensson - Applied support to unzip files with compression method BZIP2 (bzip2 lib is required)
                                 Patch created by Daniel Borca
 
   Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
@@ -77,8 +77,6 @@
 
 #ifdef STDC
 #  include <stddef.h>
-#  include <string.h>
-#  include <stdlib.h>
 #endif
 #ifdef NO_ERRNO_H
     extern int errno;
@@ -111,9 +109,6 @@
 #ifndef ALLOC
 # define ALLOC(size) (malloc(size))
 #endif
-#ifndef TRYFREE
-# define TRYFREE(p) { free(p);}
-#endif
 
 #define SIZECENTRALDIRITEM (0x2e)
 #define SIZEZIPLOCALHEADER (0x1e)
@@ -122,7 +117,7 @@
 const char unz_copyright[] =
    " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
 
-/* unz_file_info_interntal contain internal info about a file in zipfile*/
+/* unz_file_info64_internal contain internal info about a file in zipfile*/
 typedef struct unz_file_info64_internal_s
 {
     ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
@@ -153,7 +148,7 @@ typedef struct
     ZPOS64_T rest_read_compressed; /* number of byte to be decompressed */
     ZPOS64_T rest_read_uncompressed;/*number of byte to be obtained after decomp*/
     zlib_filefunc64_32_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
+    voidpf filestream;        /* io structure of the zipfile */
     uLong compression_method;   /* compression method (0==store) */
     ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
     int   raw;
@@ -166,7 +161,7 @@ typedef struct
 {
     zlib_filefunc64_32_def z_filefunc;
     int is64bitOpenFunction;
-    voidpf filestream;        /* io structore of the zipfile */
+    voidpf filestream;        /* io structure of the zipfile */
     unz_global_info64 gi;       /* public global information */
     ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
     ZPOS64_T num_file;             /* number of the current file in the zipfile*/
@@ -197,29 +192,44 @@ typedef struct
 #include "crypt.h"
 #endif
 
+
 /* ===========================================================================
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-   for end of file.
-   IN assertion: the stream s has been successfully opened for reading.
+   Reads a long in LSB order from the given gz_stream. Sets
 */
 
-
-local int unz64local_getByte OF((
-    const zlib_filefunc64_32_def* pzlib_filefunc_def,
-    voidpf filestream,
-    int *pi));
-
-local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi)
-{
-    unsigned char c;
-    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
-    if (err==1)
+local int unz64local_getShort(const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                              voidpf filestream,
+                              uLong *pX) {
+    unsigned char c[2];
+    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,c,2);
+    if (err==2)
     {
-        *pi = (int)c;
+        *pX = c[0] | ((uLong)c[1] << 8);
         return UNZ_OK;
     }
     else
     {
+        *pX = 0;
+        if (ZERROR64(*pzlib_filefunc_def,filestream))
+            return UNZ_ERRNO;
+        else
+            return UNZ_EOF;
+    }
+}
+
+local int unz64local_getLong(const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                             voidpf filestream,
+                             uLong *pX) {
+    unsigned char c[4];
+    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,c,4);
+    if (err==4)
+    {
+        *pX = c[0] | ((uLong)c[1] << 8) | ((uLong)c[2] << 16) | ((uLong)c[3] << 24);
+        return UNZ_OK;
+    }
+    else
+    {
+        *pX = 0;
         if (ZERROR64(*pzlib_filefunc_def,filestream))
             return UNZ_ERRNO;
         else
@@ -228,126 +238,29 @@ local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, v
 }
 
 
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets
-*/
-local int unz64local_getShort OF((
-    const zlib_filefunc64_32_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int unz64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                             voidpf filestream,
-                             uLong *pX)
-{
-    uLong x ;
-    int i = 0;
-    int err;
-
-    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        *pX = x;
+local int unz64local_getLong64(const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                               voidpf filestream,
+                               ZPOS64_T *pX) {
+    unsigned char c[8];
+    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,c,8);
+    if (err==8)
+    {
+        *pX = c[0] | ((ZPOS64_T)c[1] << 8) | ((ZPOS64_T)c[2] << 16) | ((ZPOS64_T)c[3] << 24)
+            | ((ZPOS64_T)c[4] << 32) | ((ZPOS64_T)c[5] << 40) | ((ZPOS64_T)c[6] << 48) | ((ZPOS64_T)c[7] << 56);
+        return UNZ_OK;
+    }
     else
+    {
         *pX = 0;
-    return err;
-}
-
-local int unz64local_getLong OF((
-    const zlib_filefunc64_32_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int unz64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                            voidpf filestream,
-                            uLong *pX)
-{
-    uLong x ;
-    int i = 0;
-    int err;
-
-    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((uLong)i)<<16;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<24;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-local int unz64local_getLong64 OF((
-    const zlib_filefunc64_32_def* pzlib_filefunc_def,
-    voidpf filestream,
-    ZPOS64_T *pX));
-
-
-local int unz64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                            voidpf filestream,
-                            ZPOS64_T *pX)
-{
-    ZPOS64_T x ;
-    int i = 0;
-    int err;
-
-    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (ZPOS64_T)i;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<8;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<16;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<24;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<32;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<40;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<48;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<56;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
+        if (ZERROR64(*pzlib_filefunc_def,filestream))
+            return UNZ_ERRNO;
+        else
+            return UNZ_EOF;
+    }
 }
 
 /* My own strcmpi / strcasecmp */
-local int strcmpcasenosensitive_internal (const char* fileName1, const char* fileName2)
-{
+local int strcmpcasenosensitive_internal(const char* fileName1, const char* fileName2) {
     for (;;)
     {
         char c1=*(fileName1++);
@@ -379,19 +292,17 @@ local int strcmpcasenosensitive_internal (const char* fileName1, const char* fil
 #endif
 
 /*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+   Compare two filenames (fileName1,fileName2).
+   If iCaseSensitivity = 1, comparison is case sensitive (like strcmp)
+   If iCaseSensitivity = 2, comparison is not case sensitive (like strcmpi
                                                                 or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+   If iCaseSensitivity = 0, case sensitivity is default of your operating system
         (like 1 on Unix, 2 on Windows)
 
 */
 extern int ZEXPORT unzStringFileNameCompare (const char*  fileName1,
-                                                 const char*  fileName2,
-                                                 int iCaseSensitivity)
-
-{
+                                             const char*  fileName2,
+                                             int iCaseSensitivity) {
     if (iCaseSensitivity==0)
         iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
 
@@ -405,21 +316,23 @@ extern int ZEXPORT unzStringFileNameCompare (const char*  fileName1,
 #define BUFREADCOMMENT (0x400)
 #endif
 
+#ifndef CENTRALDIRINVALID
+#define CENTRALDIRINVALID ((ZPOS64_T)(-1))
+#endif
+
 /*
   Locate the Central directory of a zipfile (at the end, just before
     the global comment)
 */
-local ZPOS64_T unz64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
-local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
-{
+local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream) {
     unsigned char* buf;
     ZPOS64_T uSizeFile;
     ZPOS64_T uBackRead;
     ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
-    ZPOS64_T uPosFound=0;
+    ZPOS64_T uPosFound=CENTRALDIRINVALID;
 
     if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-        return 0;
+        return CENTRALDIRINVALID;
 
 
     uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
@@ -429,7 +342,7 @@ local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f
 
     buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
     if (buf==NULL)
-        return 0;
+        return CENTRALDIRINVALID;
 
     uBackRead = 4;
     while (uBackRead<uMaxBack)
@@ -459,10 +372,10 @@ local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f
                 break;
             }
 
-        if (uPosFound!=0)
+        if (uPosFound!=CENTRALDIRINVALID)
             break;
     }
-    TRYFREE(buf);
+    free(buf);
     return uPosFound;
 }
 
@@ -471,23 +384,18 @@ local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f
   Locate the Central directory 64 of a zipfile (at the end, just before
     the global comment)
 */
-local ZPOS64_T unz64local_SearchCentralDir64 OF((
-    const zlib_filefunc64_32_def* pzlib_filefunc_def,
-    voidpf filestream));
-
 local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                                      voidpf filestream)
-{
+                                             voidpf filestream) {
     unsigned char* buf;
     ZPOS64_T uSizeFile;
     ZPOS64_T uBackRead;
     ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
-    ZPOS64_T uPosFound=0;
+    ZPOS64_T uPosFound=CENTRALDIRINVALID;
     uLong uL;
                 ZPOS64_T relativeOffset;
 
     if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-        return 0;
+        return CENTRALDIRINVALID;
 
 
     uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
@@ -497,7 +405,7 @@ local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib
 
     buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
     if (buf==NULL)
-        return 0;
+        return CENTRALDIRINVALID;
 
     uBackRead = 4;
     while (uBackRead<uMaxBack)
@@ -527,47 +435,47 @@ local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib
                 break;
             }
 
-        if (uPosFound!=0)
+        if (uPosFound!=CENTRALDIRINVALID)
             break;
     }
-    TRYFREE(buf);
-    if (uPosFound == 0)
-        return 0;
+    free(buf);
+    if (uPosFound == CENTRALDIRINVALID)
+        return CENTRALDIRINVALID;
 
     /* Zip64 end of central directory locator */
     if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return 0;
+        return CENTRALDIRINVALID;
 
     /* the signature, already checked */
     if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return 0;
+        return CENTRALDIRINVALID;
 
-    /* number of the disk with the start of the zip64 end of  central directory */
+    /* number of the disk with the start of the zip64 end of central directory */
     if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return 0;
+        return CENTRALDIRINVALID;
     if (uL != 0)
-        return 0;
+        return CENTRALDIRINVALID;
 
     /* relative offset of the zip64 end of central directory record */
     if (unz64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=UNZ_OK)
-        return 0;
+        return CENTRALDIRINVALID;
 
     /* total number of disks */
     if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return 0;
+        return CENTRALDIRINVALID;
     if (uL != 1)
-        return 0;
+        return CENTRALDIRINVALID;
 
     /* Goto end of central directory record */
     if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return 0;
+        return CENTRALDIRINVALID;
 
      /* the signature */
     if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return 0;
+        return CENTRALDIRINVALID;
 
     if (uL != 0x06064b50)
-        return 0;
+        return CENTRALDIRINVALID;
 
     return relativeOffset;
 }
@@ -581,19 +489,18 @@ local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib
      Else, the return value is a unzFile Handle, usable with other function
        of this unzip package.
 */
-local unzFile unzOpenInternal (const void *path,
-                               zlib_filefunc64_32_def* pzlib_filefunc64_32_def,
-                               int is64bitOpenFunction)
-{
+local unzFile unzOpenInternal(const void *path,
+                              zlib_filefunc64_32_def* pzlib_filefunc64_32_def,
+                              int is64bitOpenFunction) {
     unz64_s us;
     unz64_s *s;
     ZPOS64_T central_pos;
     uLong   uL;
 
-    uLong number_disk;          /* number of the current dist, used for
-                                   spaning ZIP, unsupported, always 0*/
-    uLong number_disk_with_CD;  /* number the the disk with central dir, used
-                                   for spaning ZIP, unsupported, always 0*/
+    uLong number_disk;          /* number of the current disk, used for
+                                   spanning ZIP, unsupported, always 0*/
+    uLong number_disk_with_CD;  /* number the disk with central dir, used
+                                   for spanning ZIP, unsupported, always 0*/
     ZPOS64_T number_entry_CD;      /* total number of entries in
                                    the central dir
                                    (same than number_entry on nospan) */
@@ -621,7 +528,7 @@ local unzFile unzOpenInternal (const void *path,
         return NULL;
 
     central_pos = unz64local_SearchCentralDir64(&us.z_filefunc,us.filestream);
-    if (central_pos)
+    if (central_pos!=CENTRALDIRINVALID)
     {
         uLong uS;
         ZPOS64_T uL64;
@@ -683,7 +590,7 @@ local unzFile unzOpenInternal (const void *path,
     else
     {
         central_pos = unz64local_SearchCentralDir(&us.z_filefunc,us.filestream);
-        if (central_pos==0)
+        if (central_pos==CENTRALDIRINVALID)
             err=UNZ_ERRNO;
 
         us.isZip64 = 0;
@@ -762,9 +669,8 @@ local unzFile unzOpenInternal (const void *path,
 }
 
 
-extern unzFile ZEXPORT unzOpen2 (const char *path,
-                                        zlib_filefunc_def* pzlib_filefunc32_def)
-{
+extern unzFile ZEXPORT unzOpen2(const char *path,
+                                zlib_filefunc_def* pzlib_filefunc32_def) {
     if (pzlib_filefunc32_def != NULL)
     {
         zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
@@ -775,9 +681,8 @@ extern unzFile ZEXPORT unzOpen2 (const char *path,
         return unzOpenInternal(path, NULL, 0);
 }
 
-extern unzFile ZEXPORT unzOpen2_64 (const void *path,
-                                     zlib_filefunc64_def* pzlib_filefunc_def)
-{
+extern unzFile ZEXPORT unzOpen2_64(const void *path,
+                                   zlib_filefunc64_def* pzlib_filefunc_def) {
     if (pzlib_filefunc_def != NULL)
     {
         zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
@@ -790,13 +695,11 @@ extern unzFile ZEXPORT unzOpen2_64 (const void *path,
         return unzOpenInternal(path, NULL, 1);
 }
 
-extern unzFile ZEXPORT unzOpen (const char *path)
-{
+extern unzFile ZEXPORT unzOpen(const char *path) {
     return unzOpenInternal(path, NULL, 0);
 }
 
-extern unzFile ZEXPORT unzOpen64 (const void *path)
-{
+extern unzFile ZEXPORT unzOpen64(const void *path) {
     return unzOpenInternal(path, NULL, 1);
 }
 
@@ -805,8 +708,7 @@ extern unzFile ZEXPORT unzOpen64 (const void *path)
   If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
     these files MUST be closed with unzCloseCurrentFile before call unzClose.
   return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzClose (unzFile file)
-{
+extern int ZEXPORT unzClose(unzFile file) {
     unz64_s* s;
     if (file==NULL)
         return UNZ_PARAMERROR;
@@ -816,7 +718,7 @@ extern int ZEXPORT unzClose (unzFile file)
         unzCloseCurrentFile(file);
 
     ZCLOSE64(s->z_filefunc, s->filestream);
-    TRYFREE(s);
+    free(s);
     return UNZ_OK;
 }
 
@@ -825,8 +727,7 @@ extern int ZEXPORT unzClose (unzFile file)
   Write info about the ZipFile in the *pglobal_info structure.
   No preparation of the structure is needed
   return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzGetGlobalInfo64 (unzFile file, unz_global_info64* pglobal_info)
-{
+extern int ZEXPORT unzGetGlobalInfo64(unzFile file, unz_global_info64* pglobal_info) {
     unz64_s* s;
     if (file==NULL)
         return UNZ_PARAMERROR;
@@ -835,8 +736,7 @@ extern int ZEXPORT unzGetGlobalInfo64 (unzFile file, unz_global_info64* pglobal_
     return UNZ_OK;
 }
 
-extern int ZEXPORT unzGetGlobalInfo (unzFile file, unz_global_info* pglobal_info32)
-{
+extern int ZEXPORT unzGetGlobalInfo(unzFile file, unz_global_info* pglobal_info32) {
     unz64_s* s;
     if (file==NULL)
         return UNZ_PARAMERROR;
@@ -847,10 +747,9 @@ extern int ZEXPORT unzGetGlobalInfo (unzFile file, unz_global_info* pglobal_info
     return UNZ_OK;
 }
 /*
-   Translate date/time from Dos format to tm_unz (readable more easilty)
+   Translate date/time from Dos format to tm_unz (readable more easily)
 */
-local void unz64local_DosDateToTmuDate (ZPOS64_T ulDosDate, tm_unz* ptm)
-{
+local void unz64local_DosDateToTmuDate(ZPOS64_T ulDosDate, tm_unz* ptm) {
     ZPOS64_T uDate;
     uDate = (ZPOS64_T)(ulDosDate>>16);
     ptm->tm_mday = (int)(uDate&0x1f) ;
@@ -865,28 +764,16 @@ local void unz64local_DosDateToTmuDate (ZPOS64_T ulDosDate, tm_unz* ptm)
 /*
   Get Info about the current file in the zipfile, with internal only info
 */
-local int unz64local_GetCurrentFileInfoInternal OF((unzFile file,
-                                                  unz_file_info64 *pfile_info,
-                                                  unz_file_info64_internal
-                                                  *pfile_info_internal,
-                                                  char *szFileName,
-                                                  uLong fileNameBufferSize,
-                                                  void *extraField,
-                                                  uLong extraFieldBufferSize,
-                                                  char *szComment,
-                                                  uLong commentBufferSize));
-
-local int unz64local_GetCurrentFileInfoInternal (unzFile file,
-                                                  unz_file_info64 *pfile_info,
-                                                  unz_file_info64_internal
-                                                  *pfile_info_internal,
-                                                  char *szFileName,
-                                                  uLong fileNameBufferSize,
-                                                  void *extraField,
-                                                  uLong extraFieldBufferSize,
-                                                  char *szComment,
-                                                  uLong commentBufferSize)
-{
+local int unz64local_GetCurrentFileInfoInternal(unzFile file,
+                                                unz_file_info64 *pfile_info,
+                                                unz_file_info64_internal
+                                                *pfile_info_internal,
+                                                char *szFileName,
+                                                uLong fileNameBufferSize,
+                                                void *extraField,
+                                                uLong extraFieldBufferSize,
+                                                char *szComment,
+                                                uLong commentBufferSize) {
     unz64_s* s;
     unz_file_info64 file_info;
     unz_file_info64_internal file_info_internal;
@@ -1038,33 +925,31 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file,
             /* ZIP64 extra fields */
             if (headerId == 0x0001)
             {
-                                                        uLong uL1;
+                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.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.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_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,&uL1) != UNZ_OK)
-                                                                                err=UNZ_ERRNO;
-                                                                }
+                if(file_info.disk_num_start == 0xffff)
+                {
+                    /* Disk Start Number */
+                    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
+                        err=UNZ_ERRNO;
+                }
 
             }
             else
@@ -1121,24 +1006,22 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file,
   No preparation of the structure is needed
   return UNZ_OK if there is no problem.
 */
-extern int ZEXPORT unzGetCurrentFileInfo64 (unzFile file,
-                                          unz_file_info64 * pfile_info,
-                                          char * szFileName, uLong fileNameBufferSize,
-                                          void *extraField, uLong extraFieldBufferSize,
-                                          char* szComment,  uLong commentBufferSize)
-{
+extern int ZEXPORT unzGetCurrentFileInfo64(unzFile file,
+                                           unz_file_info64 * pfile_info,
+                                           char * szFileName, uLong fileNameBufferSize,
+                                           void *extraField, uLong extraFieldBufferSize,
+                                           char* szComment,  uLong commentBufferSize) {
     return unz64local_GetCurrentFileInfoInternal(file,pfile_info,NULL,
-                                                szFileName,fileNameBufferSize,
-                                                extraField,extraFieldBufferSize,
-                                                szComment,commentBufferSize);
+                                                 szFileName,fileNameBufferSize,
+                                                 extraField,extraFieldBufferSize,
+                                                 szComment,commentBufferSize);
 }
 
-extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
-                                          unz_file_info * pfile_info,
-                                          char * szFileName, uLong fileNameBufferSize,
-                                          void *extraField, uLong extraFieldBufferSize,
-                                          char* szComment,  uLong commentBufferSize)
-{
+extern int ZEXPORT unzGetCurrentFileInfo(unzFile file,
+                                         unz_file_info * pfile_info,
+                                         char * szFileName, uLong fileNameBufferSize,
+                                         void *extraField, uLong extraFieldBufferSize,
+                                         char* szComment,  uLong commentBufferSize) {
     int err;
     unz_file_info64 file_info64;
     err = unz64local_GetCurrentFileInfoInternal(file,&file_info64,NULL,
@@ -1162,7 +1045,7 @@ extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
         pfile_info->internal_fa = file_info64.internal_fa;
         pfile_info->external_fa = file_info64.external_fa;
 
-        pfile_info->tmu_date = file_info64.tmu_date,
+        pfile_info->tmu_date = file_info64.tmu_date;
 
 
         pfile_info->compressed_size = (uLong)file_info64.compressed_size;
@@ -1175,8 +1058,7 @@ extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
   Set the current file of the zipfile to the first file.
   return UNZ_OK if there is no problem
 */
-extern int ZEXPORT unzGoToFirstFile (unzFile file)
-{
+extern int ZEXPORT unzGoToFirstFile(unzFile file) {
     int err=UNZ_OK;
     unz64_s* s;
     if (file==NULL)
@@ -1196,8 +1078,7 @@ extern int ZEXPORT unzGoToFirstFile (unzFile file)
   return UNZ_OK if there is no problem
   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
 */
-extern int ZEXPORT unzGoToNextFile (unzFile  file)
-{
+extern int ZEXPORT unzGoToNextFile(unzFile file) {
     unz64_s* s;
     int err;
 
@@ -1229,8 +1110,7 @@ extern int ZEXPORT unzGoToNextFile (unzFile  file)
   UNZ_OK if the file is found. It becomes the current file.
   UNZ_END_OF_LIST_OF_FILE if the file is not found
 */
-extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity)
-{
+extern int ZEXPORT unzLocateFile(unzFile file, const char *szFileName, int iCaseSensitivity) {
     unz64_s* s;
     int err;
 
@@ -1305,8 +1185,7 @@ typedef struct unz_file_pos_s
 } unz_file_pos;
 */
 
-extern int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos*  file_pos)
-{
+extern int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos* file_pos) {
     unz64_s* s;
 
     if (file==NULL || file_pos==NULL)
@@ -1321,10 +1200,7 @@ extern int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos*  file_pos)
     return UNZ_OK;
 }
 
-extern int ZEXPORT unzGetFilePos(
-    unzFile file,
-    unz_file_pos* file_pos)
-{
+extern int ZEXPORT unzGetFilePos(unzFile file, unz_file_pos* file_pos) {
     unz64_file_pos file_pos64;
     int err = unzGetFilePos64(file,&file_pos64);
     if (err==UNZ_OK)
@@ -1335,8 +1211,7 @@ extern int ZEXPORT unzGetFilePos(
     return err;
 }
 
-extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_pos)
-{
+extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_pos) {
     unz64_s* s;
     int err;
 
@@ -1357,10 +1232,7 @@ extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_pos
     return err;
 }
 
-extern int ZEXPORT unzGoToFilePos(
-    unzFile file,
-    unz_file_pos* file_pos)
-{
+extern int ZEXPORT unzGoToFilePos(unzFile file, unz_file_pos* file_pos) {
     unz64_file_pos file_pos64;
     if (file_pos == NULL)
         return UNZ_PARAMERROR;
@@ -1382,10 +1254,9 @@ extern int ZEXPORT unzGoToFilePos(
   store in *piSizeVar the size of extra info in local header
         (filename and size of extra field data)
 */
-local int unz64local_CheckCurrentFileCoherencyHeader (unz64_s* s, uInt* piSizeVar,
-                                                    ZPOS64_T * poffset_local_extrafield,
-                                                    uInt  * psize_local_extrafield)
-{
+local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar,
+                                                     ZPOS64_T * poffset_local_extrafield,
+                                                     uInt  * psize_local_extrafield) {
     uLong uMagic,uData,uFlags;
     uLong size_filename;
     uLong size_extra_field;
@@ -1469,9 +1340,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader (unz64_s* s, uInt* piSizeVa
   Open for reading data the current file in the zipfile.
   If there is no error and the file is opened, the return value is UNZ_OK.
 */
-extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
-                                            int* level, int raw, const char* password)
-{
+extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int* method,
+                                       int* level, int raw, const char* password) {
     int err=UNZ_OK;
     uInt iSizeVar;
     unz64_s* s;
@@ -1509,7 +1379,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
 
     if (pfile_in_zip_read_info->read_buffer==NULL)
     {
-        TRYFREE(pfile_in_zip_read_info);
+        free(pfile_in_zip_read_info);
         return UNZ_INTERNALERROR;
     }
 
@@ -1566,8 +1436,8 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
         pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED;
       else
       {
-        TRYFREE(pfile_in_zip_read_info->read_buffer);
-        TRYFREE(pfile_in_zip_read_info);
+        free(pfile_in_zip_read_info->read_buffer);
+        free(pfile_in_zip_read_info);
         return err;
       }
 #else
@@ -1587,8 +1457,8 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
         pfile_in_zip_read_info->stream_initialised=Z_DEFLATED;
       else
       {
-        TRYFREE(pfile_in_zip_read_info->read_buffer);
-        TRYFREE(pfile_in_zip_read_info);
+        free(pfile_in_zip_read_info->read_buffer);
+        free(pfile_in_zip_read_info);
         return err;
       }
         /* windowBits is passed < 0 to tell that there is no zlib header.
@@ -1640,25 +1510,21 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
     return UNZ_OK;
 }
 
-extern int ZEXPORT unzOpenCurrentFile (unzFile file)
-{
+extern int ZEXPORT unzOpenCurrentFile(unzFile file) {
     return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
 }
 
-extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file, const char*  password)
-{
+extern int ZEXPORT unzOpenCurrentFilePassword(unzFile file, const char* password) {
     return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
 }
 
-extern int ZEXPORT unzOpenCurrentFile2 (unzFile file, int* method, int* level, int raw)
-{
+extern int ZEXPORT unzOpenCurrentFile2(unzFile file, int* method, int* level, int raw) {
     return unzOpenCurrentFile3(file, method, level, raw, NULL);
 }
 
 /** Addition for GDAL : START */
 
-extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64( unzFile file)
-{
+extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64(unzFile file) {
     unz64_s* s;
     file_in_zip64_read_info_s* pfile_in_zip_read_info;
     s=(unz64_s*)file;
@@ -1678,13 +1544,12 @@ extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64( unzFile file)
   buf contain buffer where data must be copied
   len the size of buf.
 
-  return the number of byte copied if somes bytes are copied
+  return the number of byte copied if some bytes are copied
   return 0 if the end of file was reached
   return <0 with error code if there is an error
     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
 */
-extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)
-{
+extern int ZEXPORT unzReadCurrentFile(unzFile file, voidp buf, unsigned len) {
     int err=UNZ_OK;
     uInt iRead = 0;
     unz64_s* s;
@@ -1891,8 +1756,7 @@ extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)
 /*
   Give the current position in uncompressed data
 */
-extern z_off_t ZEXPORT unztell (unzFile file)
-{
+extern z_off_t ZEXPORT unztell(unzFile file) {
     unz64_s* s;
     file_in_zip64_read_info_s* pfile_in_zip_read_info;
     if (file==NULL)
@@ -1906,8 +1770,7 @@ extern z_off_t ZEXPORT unztell (unzFile file)
     return (z_off_t)pfile_in_zip_read_info->stream.total_out;
 }
 
-extern ZPOS64_T ZEXPORT unztell64 (unzFile file)
-{
+extern ZPOS64_T ZEXPORT unztell64(unzFile file) {
 
     unz64_s* s;
     file_in_zip64_read_info_s* pfile_in_zip_read_info;
@@ -1926,8 +1789,7 @@ extern ZPOS64_T ZEXPORT unztell64 (unzFile file)
 /*
   return 1 if the end of file was reached, 0 elsewhere
 */
-extern int ZEXPORT unzeof (unzFile file)
-{
+extern int ZEXPORT unzeof(unzFile file) {
     unz64_s* s;
     file_in_zip64_read_info_s* pfile_in_zip_read_info;
     if (file==NULL)
@@ -1958,8 +1820,7 @@ more info in the local-header version than in the central-header)
   the return value is the number of bytes copied in buf, or (if <0)
     the error code
 */
-extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len)
-{
+extern int ZEXPORT unzGetLocalExtrafield(unzFile file, voidp buf, unsigned len) {
     unz64_s* s;
     file_in_zip64_read_info_s* pfile_in_zip_read_info;
     uInt read_now;
@@ -2006,8 +1867,7 @@ extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len)
   Close the file in zip opened with unzOpenCurrentFile
   Return UNZ_CRCERROR if all the file was read but the CRC is not good
 */
-extern int ZEXPORT unzCloseCurrentFile (unzFile file)
-{
+extern int ZEXPORT unzCloseCurrentFile(unzFile file) {
     int err=UNZ_OK;
 
     unz64_s* s;
@@ -2029,7 +1889,7 @@ extern int ZEXPORT unzCloseCurrentFile (unzFile file)
     }
 
 
-    TRYFREE(pfile_in_zip_read_info->read_buffer);
+    free(pfile_in_zip_read_info->read_buffer);
     pfile_in_zip_read_info->read_buffer = NULL;
     if (pfile_in_zip_read_info->stream_initialised == Z_DEFLATED)
         inflateEnd(&pfile_in_zip_read_info->stream);
@@ -2040,7 +1900,7 @@ extern int ZEXPORT unzCloseCurrentFile (unzFile file)
 
 
     pfile_in_zip_read_info->stream_initialised = 0;
-    TRYFREE(pfile_in_zip_read_info);
+    free(pfile_in_zip_read_info);
 
     s->pfile_in_zip_read=NULL;
 
@@ -2053,8 +1913,7 @@ extern int ZEXPORT unzCloseCurrentFile (unzFile file)
   uSizeBuf is the size of the szComment buffer.
   return the number of byte copied or an error code <0
 */
-extern int ZEXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong uSizeBuf)
-{
+extern int ZEXPORT unzGetGlobalComment(unzFile file, char * szComment, uLong uSizeBuf) {
     unz64_s* s;
     uLong uReadThis ;
     if (file==NULL)
@@ -2081,8 +1940,7 @@ extern int ZEXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong uS
 }
 
 /* Additions by RX '2004 */
-extern ZPOS64_T ZEXPORT unzGetOffset64(unzFile file)
-{
+extern ZPOS64_T ZEXPORT unzGetOffset64(unzFile file) {
     unz64_s* s;
 
     if (file==NULL)
@@ -2096,8 +1954,7 @@ extern ZPOS64_T ZEXPORT unzGetOffset64(unzFile file)
     return s->pos_in_central_dir;
 }
 
-extern uLong ZEXPORT unzGetOffset (unzFile file)
-{
+extern uLong ZEXPORT unzGetOffset(unzFile file) {
     ZPOS64_T offset64;
 
     if (file==NULL)
@@ -2106,8 +1963,7 @@ extern uLong ZEXPORT unzGetOffset (unzFile file)
     return (uLong)offset64;
 }
 
-extern int ZEXPORT unzSetOffset64(unzFile file, ZPOS64_T pos)
-{
+extern int ZEXPORT unzSetOffset64(unzFile file, ZPOS64_T pos) {
     unz64_s* s;
     int err;
 
@@ -2124,7 +1980,6 @@ extern int ZEXPORT unzSetOffset64(unzFile file, ZPOS64_T pos)
     return err;
 }
 
-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos)
-{
+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos) {
     return unzSetOffset64(file,pos);
 }
diff --git a/contrib/unzip/unzip.h b/contrib/unzip/unzip.h
index 6f95e94d7..5cfc9c627 100644
--- a/contrib/unzip/unzip.h
+++ b/contrib/unzip/unzip.h
@@ -150,21 +150,21 @@ typedef struct unz_file_info_s
     tm_unz tmu_date;
 } unz_file_info;
 
-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-                                                 const char* fileName2,
-                                                 int iCaseSensitivity));
+extern int ZEXPORT unzStringFileNameCompare(const char* fileName1,
+                                            const char* fileName2,
+                                            int iCaseSensitivity);
 /*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+   Compare two filenames (fileName1,fileName2).
+   If iCaseSensitivity = 1, comparison is case sensitive (like strcmp)
+   If iCaseSensitivity = 2, comparison is not case sensitive (like strcmpi
                                 or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+   If iCaseSensitivity = 0, case sensitivity is default of your operating system
     (like 1 on Unix, 2 on Windows)
 */
 
 
-extern unzFile ZEXPORT unzOpen OF((const char *path));
-extern unzFile ZEXPORT unzOpen64 OF((const void *path));
+extern unzFile ZEXPORT unzOpen(const char *path);
+extern unzFile ZEXPORT unzOpen64(const void *path);
 /*
   Open a Zip file. path contain the full pathname (by example,
      on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
@@ -181,41 +181,41 @@ extern unzFile ZEXPORT unzOpen64 OF((const void *path));
 */
 
 
-extern unzFile ZEXPORT unzOpen2 OF((const char *path,
-                                    zlib_filefunc_def* pzlib_filefunc_def));
+extern unzFile ZEXPORT unzOpen2(const char *path,
+                                zlib_filefunc_def* pzlib_filefunc_def);
 /*
    Open a Zip file, like unzOpen, but provide a set of file low level API
       for read/write the zip file (see ioapi.h)
 */
 
-extern unzFile ZEXPORT unzOpen2_64 OF((const void *path,
-                                    zlib_filefunc64_def* pzlib_filefunc_def));
+extern unzFile ZEXPORT unzOpen2_64(const void *path,
+                                   zlib_filefunc64_def* pzlib_filefunc_def);
 /*
    Open a Zip file, like unz64Open, but provide a set of file low level API
       for read/write the zip file (see ioapi.h)
 */
 
-extern int ZEXPORT unzClose OF((unzFile file));
+extern int ZEXPORT unzClose(unzFile file);
 /*
   Close a ZipFile opened with unzOpen.
   If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
     these files MUST be closed with unzCloseCurrentFile before call unzClose.
   return UNZ_OK if there is no problem. */
 
-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
-                                        unz_global_info *pglobal_info));
+extern int ZEXPORT unzGetGlobalInfo(unzFile file,
+                                    unz_global_info *pglobal_info);
 
-extern int ZEXPORT unzGetGlobalInfo64 OF((unzFile file,
-                                        unz_global_info64 *pglobal_info));
+extern int ZEXPORT unzGetGlobalInfo64(unzFile file,
+                                      unz_global_info64 *pglobal_info);
 /*
   Write info about the ZipFile in the *pglobal_info structure.
   No preparation of the structure is needed
   return UNZ_OK if there is no problem. */
 
 
-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-                                           char *szComment,
-                                           uLong uSizeBuf));
+extern int ZEXPORT unzGetGlobalComment(unzFile file,
+                                       char *szComment,
+                                       uLong uSizeBuf);
 /*
   Get the global comment string of the ZipFile, in the szComment buffer.
   uSizeBuf is the size of the szComment buffer.
@@ -226,22 +226,22 @@ extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
 /***************************************************************************/
 /* Unzip package allow you browse the directory of the zipfile */
 
-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
+extern int ZEXPORT unzGoToFirstFile(unzFile file);
 /*
   Set the current file of the zipfile to the first file.
   return UNZ_OK if there is no problem
 */
 
-extern int ZEXPORT unzGoToNextFile OF((unzFile file));
+extern int ZEXPORT unzGoToNextFile(unzFile file);
 /*
   Set the current file of the zipfile to the next file.
   return UNZ_OK if there is no problem
   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
 */
 
-extern int ZEXPORT unzLocateFile OF((unzFile file,
-                     const char *szFileName,
-                     int iCaseSensitivity));
+extern int ZEXPORT unzLocateFile(unzFile file,
+                                 const char *szFileName,
+                                 int iCaseSensitivity);
 /*
   Try locate the file szFileName in the zipfile.
   For the iCaseSensitivity signification, see unzStringFileNameCompare
@@ -285,28 +285,28 @@ extern int ZEXPORT unzGoToFilePos64(
 
 /* ****************************************** */
 
-extern int ZEXPORT unzGetCurrentFileInfo64 OF((unzFile file,
-                         unz_file_info64 *pfile_info,
-                         char *szFileName,
-                         uLong fileNameBufferSize,
-                         void *extraField,
-                         uLong extraFieldBufferSize,
-                         char *szComment,
-                         uLong commentBufferSize));
+extern int ZEXPORT unzGetCurrentFileInfo64(unzFile file,
+                                           unz_file_info64 *pfile_info,
+                                           char *szFileName,
+                                           uLong fileNameBufferSize,
+                                           void *extraField,
+                                           uLong extraFieldBufferSize,
+                                           char *szComment,
+                                           uLong commentBufferSize);
 
-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-                         unz_file_info *pfile_info,
-                         char *szFileName,
-                         uLong fileNameBufferSize,
-                         void *extraField,
-                         uLong extraFieldBufferSize,
-                         char *szComment,
-                         uLong commentBufferSize));
+extern int ZEXPORT unzGetCurrentFileInfo(unzFile file,
+                                         unz_file_info *pfile_info,
+                                         char *szFileName,
+                                         uLong fileNameBufferSize,
+                                         void *extraField,
+                                         uLong extraFieldBufferSize,
+                                         char *szComment,
+                                         uLong commentBufferSize);
 /*
   Get Info about the current file
-  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
+  if pfile_info!=NULL, the *pfile_info structure will contain some info about
         the current file
-  if szFileName!=NULL, the filemane string will be copied in szFileName
+  if szFileName!=NULL, the filename string will be copied in szFileName
             (fileNameBufferSize is the size of the buffer)
   if extraField!=NULL, the extra field information will be copied in extraField
             (extraFieldBufferSize is the size of the buffer).
@@ -318,7 +318,7 @@ extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
 
 /** Addition for GDAL : START */
 
-extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
+extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64(unzFile file);
 
 /** Addition for GDAL : END */
 
@@ -328,24 +328,24 @@ extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
    from it, and close it (you can close it before reading all the file)
    */
 
-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
+extern int ZEXPORT unzOpenCurrentFile(unzFile file);
 /*
   Open for reading data the current file in the zipfile.
   If there is no error, the return value is UNZ_OK.
 */
 
-extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
-                                                  const char* password));
+extern int ZEXPORT unzOpenCurrentFilePassword(unzFile file,
+                                              const char* password);
 /*
   Open for reading data the current file in the zipfile.
   password is a crypting password
   If there is no error, the return value is UNZ_OK.
 */
 
-extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw));
+extern int ZEXPORT unzOpenCurrentFile2(unzFile file,
+                                       int* method,
+                                       int* level,
+                                       int raw);
 /*
   Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
     if raw==1
@@ -355,11 +355,11 @@ extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
          but you CANNOT set method parameter as NULL
 */
 
-extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw,
-                                           const char* password));
+extern int ZEXPORT unzOpenCurrentFile3(unzFile file,
+                                       int* method,
+                                       int* level,
+                                       int raw,
+                                       const char* password);
 /*
   Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
     if raw==1
@@ -370,41 +370,41 @@ extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
 */
 
 
-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
+extern int ZEXPORT unzCloseCurrentFile(unzFile file);
 /*
   Close the file in zip opened with unzOpenCurrentFile
   Return UNZ_CRCERROR if all the file was read but the CRC is not good
 */
 
-extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
-                      voidp buf,
-                      unsigned len));
+extern int ZEXPORT unzReadCurrentFile(unzFile file,
+                                      voidp buf,
+                                      unsigned len);
 /*
   Read bytes from the current file (opened by unzOpenCurrentFile)
   buf contain buffer where data must be copied
   len the size of buf.
 
-  return the number of byte copied if somes bytes are copied
+  return the number of byte copied if some bytes are copied
   return 0 if the end of file was reached
   return <0 with error code if there is an error
     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
 */
 
-extern z_off_t ZEXPORT unztell OF((unzFile file));
+extern z_off_t ZEXPORT unztell(unzFile file);
 
-extern ZPOS64_T ZEXPORT unztell64 OF((unzFile file));
+extern ZPOS64_T ZEXPORT unztell64(unzFile file);
 /*
   Give the current position in uncompressed data
 */
 
-extern int ZEXPORT unzeof OF((unzFile file));
+extern int ZEXPORT unzeof(unzFile file);
 /*
   return 1 if the end of file was reached, 0 elsewhere
 */
 
-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-                                             voidp buf,
-                                             unsigned len));
+extern int ZEXPORT unzGetLocalExtrafield(unzFile file,
+                                         voidp buf,
+                                         unsigned len);
 /*
   Read extra field from the current file (opened by unzOpenCurrentFile)
   This is the local-header version of the extra field (sometimes, there is
diff --git a/contrib/zip/.gitattributes b/contrib/zip/.gitattributes
new file mode 100644
index 000000000..15a5c5809
--- /dev/null
+++ b/contrib/zip/.gitattributes
@@ -0,0 +1 @@
+*.h linguist-language=C
diff --git a/contrib/zip/.gitignore b/contrib/zip/.gitignore
new file mode 100644
index 000000000..a5900dbcd
--- /dev/null
+++ b/contrib/zip/.gitignore
@@ -0,0 +1,60 @@
+/build/
+/test/build/
+/xcodeproj/
+/infer-out/
+.vscode/
+Testing/
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+*.suo
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Temporary
+*.swp
+.DS_Store
+
+# CMake
+CMakeScripts
+*.cmake
+
+# Xcode
+*.build
+*.xcodeproj
+zip.sln
+zip.vcxproj.filters
+zip.vcxproj
+ALL_BUILD.vcxproj.filters
+ALL_BUILD.vcxproj
+CMakeFiles/
+zip.dir/
+test/test.exe.vcxproj.filters
+test/test.exe.vcxproj
+test/test.exe.dir/
+
diff --git a/contrib/zip/.travis.sh b/contrib/zip/.travis.sh
deleted file mode 100755
index 9cb03ee87..000000000
--- a/contrib/zip/.travis.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# Build script for travis-ci.org builds.
-#
-if [ $ANALYZE = "true" ] && [ "$CC" = "clang" ]; then
-    # scan-build -h
-    scan-build cmake -G "Unix Makefiles"
-    scan-build -enable-checker security.FloatLoopCounter \
-        -enable-checker security.insecureAPI.UncheckedReturn \
-        --status-bugs -v \
-        make -j 8 \
-        make -j 8 test
-else
-    cmake -DCMAKE_BUILD_TYPE=Debug -DSANITIZE_ADDRESS=On -DCMAKE_INSTALL_PREFIX=_install
-    make -j 8
-    make install
-    ASAN_OPTIONS=detect_leaks=0 LSAN_OPTIONS=verbosity=1:log_threads=1 ctest -V
-fi
diff --git a/contrib/zip/.travis.yml b/contrib/zip/.travis.yml
deleted file mode 100644
index 42f84dd25..000000000
--- a/contrib/zip/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: c
-addons:
-  apt:
-    packages: &1
-    - lcov
-# Compiler selection
-compiler:
-  - clang
-  - gcc
-env:
-  - ANALYZE=false
-  - ANALYZE=true
-# Build steps
-script:
-  - ./.travis.sh
-after_success:
-  # Creating report
-  - cmake -DENABLE_COVERAGE=ON
-  - make
-  - make test
-  # Uploading report to CodeCov
-  - bash <(curl -s https://codecov.io/bash)
diff --git a/contrib/zip/CMakeLists.txt b/contrib/zip/CMakeLists.txt
index bba4e7bde..8f10e0c10 100644
--- a/contrib/zip/CMakeLists.txt
+++ b/contrib/zip/CMakeLists.txt
@@ -1,27 +1,47 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.14)
 
 project(zip
   LANGUAGES C
-  VERSION "0.1.19")
+  VERSION "0.3.0")
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 set(CMAKE_VERBOSE_MAKEFILE ON)
-option(CMAKE_DISABLE_TESTING "Disable test creation" OFF)
+
+# Enable building tests only if the project is being built as a standalone one
+if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+    option(CMAKE_DISABLE_TESTING "Disable test creation" OFF)
+else ()
+    option(CMAKE_DISABLE_TESTING "Disable test creation" ON)
+endif ()
+
+option(CMAKE_ENABLE_SANITIZERS "Enable zip sanitizers" OFF)
+option(ZIP_STATIC_PIC "Build static zip with PIC" ON)
+option(ZIP_BUILD_DOCS "Generate API documentation with Doxygen" OFF)
+
+if(ZIP_ENABLE_SHARABLE_FILE_OPEN)
+	add_definitions(-DZIP_ENABLE_SHARABLE_FILE_OPEN)
+endif()
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+	# large file support
+	add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64)
+endif()
 
 # zip
 set(SRC src/miniz.h src/zip.h src/zip.c)
 
-# this is the "object library" target: compiles the sources only once
-add_library(OBJLIB OBJECT ${SRC})
-# shared libraries need PIC
-set_property(TARGET OBJLIB PROPERTY POSITION_INDEPENDENT_CODE 1)
+add_library(${PROJECT_NAME} ${SRC})
+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
-# static and shared libraries built from the same object files
-if (BUILD_SHARED_LIBS)
-  add_library(${PROJECT_NAME} SHARED $<TARGET_OBJECTS:OBJLIB>)
-  include(GenerateExportHeader)
-  generate_export_header(${PROJECT_NAME})
-else()
-  add_library(${PROJECT_NAME} STATIC $<TARGET_OBJECTS:OBJLIB>)
+if(ZIP_STATIC_PIC)
+  set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE 1)
+endif()
+
+set_property(TARGET ${PROJECT_NAME} PROPERTY C_VISIBILITY_PRESET hidden)
+if(BUILD_SHARED_LIBS)
+  target_compile_definitions(${PROJECT_NAME}
+    PUBLIC ZIP_SHARED
+    PRIVATE ZIP_BUILD_SHARED
+  )
 endif()
 
 target_include_directories(${PROJECT_NAME} PUBLIC
@@ -33,24 +53,26 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 if (NOT CMAKE_DISABLE_TESTING)
   enable_testing()
   add_subdirectory(test)
+endif()
+if (CMAKE_ENABLE_SANITIZERS)
   find_package(Sanitizers)
-  add_sanitizers(${PROJECT_NAME} ${test_out})
+  add_sanitizers(${PROJECT_NAME})
 endif()
 
+set(CMAKE_C_STANDARD 90)
 if (MSVC)
   # Use secure functions by default and suppress warnings about "deprecated" functions
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_NONSTDC_NO_WARNINGS=1 /D _CRT_SECURE_NO_WARNINGS=1")
+
 elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR
         "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR
         "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra -Werror -pedantic -Wno-deprecated")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -pedantic")
 endif (MSVC)
 
 ####
-# Installation (https://github.com/forexample/package-example) {
-
 set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}")
 set(INCLUDE_INSTALL_DIR "include")
 
@@ -62,7 +84,7 @@ set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake")
 set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
 set(NAMESPACE "${PROJECT_NAME}::")
 
-# Include module with fuction 'write_basic_package_version_file'
+# Include module with function 'write_basic_package_version_file'
 include(CMakePackageConfigHelpers)
 
 # Note: PROJECT_VERSION is used as a VERSION
@@ -90,8 +112,6 @@ install(
     DESTINATION "${CONFIG_INSTALL_DIR}"
 )
 
-# }
-
 install(TARGETS ${PROJECT_NAME}
         EXPORT ${TARGETS_EXPORT_NAME}
         RUNTIME DESTINATION bin
@@ -112,8 +132,8 @@ if(NOT TARGET uninstall)
         COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake)
 endif()
 
-find_package(Doxygen)
-if(DOXYGEN_FOUND)
+if(ZIP_BUILD_DOCS)
+    find_package(Doxygen REQUIRED)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
     add_custom_target(doc
         ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
diff --git a/contrib/zip/CONTRIBUTING.md b/contrib/zip/CONTRIBUTING.md
new file mode 100644
index 000000000..bec8e0971
--- /dev/null
+++ b/contrib/zip/CONTRIBUTING.md
@@ -0,0 +1,9 @@
+# Contribution Rules/Coding Standards
+No need to throw away your coding style, just do your best to follow default clang-format style.
+Apply `clang-format` to the source files before commit:
+```sh
+for file in $(git ls-files | \grep -E '\.(c|h)$' | \grep -v -- '#')
+do
+    clang-format -i $file
+done
+```
diff --git a/contrib/zip/Doxyfile.in b/contrib/zip/Doxyfile.in
new file mode 100644
index 000000000..7f03b1833
--- /dev/null
+++ b/contrib/zip/Doxyfile.in
@@ -0,0 +1,2480 @@
+# Doxyfile 1.8.14
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = zip
+
+# 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
+# control system is used.
+
+PROJECT_NUMBER         = @ZIP_VERSION@
+
+# 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
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = 
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# 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
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = doc
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    = @CMAKE_CURRENT_SOURCE_DIR@/src
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# 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.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines (in the resulting output). You can put ^^ in the value part of an
+# alias to insert a newline as if a physical newline was in the original file.
+
+ALIASES                = 
+
+# 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              = 
+
+# 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
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# 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,
+# C#, C, C++, D, PHP, Objective-C, Python, 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. 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.
+
+EXTENSION_MAPPING      = 
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# 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
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = YES
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = YES
+
+# 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.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = YES
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = YES
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = YES
+
+# 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
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = YES
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    = 
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            = 
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/src
+
+# 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.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# 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 and *.qsf.
+
+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 \
+                         *.f \
+                         *.for \
+                         *.tcl \
+                         *.vhd \
+                         *.vhdl \
+                         *.ucf \
+                         *.qsf
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = 
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS = 
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (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
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = NO
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = NO
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see https://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: 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
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        = 
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  = 
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       = 
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+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
+# 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,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+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/tools/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/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+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 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
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               = 
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           = 
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     = 
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+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: http://doc.qt.io/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.
+
+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: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+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: http://doc.qt.io/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: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+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.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           = 
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# 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
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# 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
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# 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) 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.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# 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.2/.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     = 
+
+# 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) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       = 
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = NO
+
+# 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
+# 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
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# 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.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# 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.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       = 
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     = 
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           = 
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           = 
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET = 
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+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.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    = 
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             = 
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = 
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = NO
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            = 
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               = 
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# 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.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           = 
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# 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.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# 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,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           = 
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           = 
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           = 
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      = 
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      = 
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  = 
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/contrib/zip/README.md b/contrib/zip/README.md
index 308327a3f..7550c7c5e 100644
--- a/contrib/zip/README.md
+++ b/contrib/zip/README.md
@@ -1,23 +1,25 @@
-### A portable (OSX/Linux/Windows), simple zip library written in C
-This is done by hacking awesome [miniz](https://code.google.com/p/miniz) library and layering functions on top of the miniz v1.15 API.
+## A portable (OSX/Linux/Windows/Android/iOS), simple zip library written in C
+
+This is done by hacking awesome [miniz](https://github.com/richgel999/miniz) library and layering functions on top of the miniz v3.0.2 API.
 
 [![Build](https://github.com/kuba--/zip/workflows/build/badge.svg)](https://github.com/kuba--/zip/actions?query=workflow%3Abuild)
 
+### The Idea
 
-# The Idea
 <img src="zip.png" name="zip" />
 ... Some day, I was looking for zip library written in C for my project, but I could not find anything simple enough and lightweight.
 Everything what I tried required 'crazy mental gymnastics' to integrate or had some limitations or was too heavy.
 I hate frameworks, factories and adding new dependencies. If I must to install all those dependencies and link new library, I'm getting almost sick.
-I wanted something powerfull and small enough, so I could add just a few files and compile them into my project.
+I wanted something powerful and small enough, so I could add just a few files and compile them into my project.
 And finally I found miniz.
 Miniz is a lossless, high performance data compression library in a single source file. I only needed simple interface to append buffers or files to the current zip-entry. Thanks to this feature I'm able to merge many files/buffers and compress them on-the-fly.
 
 It was the reason, why I decided to write zip module on top of the miniz. It required a little bit hacking and wrapping some functions, but I kept simplicity. So, you can grab these 3 files and compile them into your project. I hope that interface is also extremely simple, so you will not have any problems to understand it.
 
-# Examples
+### Examples
 
 * Create a new zip archive with default compression level.
+
 ```c
 struct zip_t *zip = zip_open("foo.zip", ZIP_DEFAULT_COMPRESSION_LEVEL, 'w');
 {
@@ -41,6 +43,7 @@ zip_close(zip);
 ```
 
 * Append to the existing zip archive.
+
 ```c
 struct zip_t *zip = zip_open("foo.zip", ZIP_DEFAULT_COMPRESSION_LEVEL, 'a');
 {
@@ -55,6 +58,7 @@ zip_close(zip);
 ```
 
 * Extract a zip archive into a folder.
+
 ```c
 int on_extract_entry(const char *filename, void *arg) {
     static int i = 0;
@@ -69,6 +73,7 @@ zip_extract("foo.zip", "/tmp", on_extract_entry, &arg);
 ```
 
 * Extract a zip entry into memory.
+
 ```c
 void *buf = NULL;
 size_t bufsize;
@@ -87,6 +92,7 @@ free(buf);
 ```
 
 * Extract a zip entry into memory (no internal allocation).
+
 ```c
 unsigned char *buf;
 size_t bufsize;
@@ -108,6 +114,7 @@ free(buf);
 ```
 
 * Extract a zip entry into memory using callback.
+
 ```c
 struct buffer_t {
     char *data;
@@ -140,8 +147,8 @@ zip_close(zip);
 free(buf.data);
 ```
 
-
 * Extract a zip entry into a file.
+
 ```c
 struct zip_t *zip = zip_open("foo.zip", 0, 'r');
 {
@@ -181,7 +188,7 @@ free(outbuf);
 
 ```c
 char *buf = NULL;
-ssize_t bufsize = 0;
+size_t bufsize = 0;
 
 struct zip_t *zip = zip_stream_open(zipstream, zipstreamsize, 0, 'r');
 {
@@ -197,6 +204,7 @@ free(buf);
 ```
 
 * List of all zip entries
+
 ```c
 struct zip_t *zip = zip_open("foo.zip", 0, 'r');
 int i, n = zip_entries_total(zip);
@@ -214,6 +222,7 @@ zip_close(zip);
 ```
 
 * Compress folder (recursively)
+
 ```c
 void zip_walk(struct zip_t *zip, const char *path) {
     DIR *dir;
@@ -245,27 +254,36 @@ void zip_walk(struct zip_t *zip, const char *path) {
 }
 ```
 
-* Deletes zip archive entries.
+* Delete zip archive entries.
+
 ```c
 char *entries[] = {"unused.txt", "remove.ini", "delete.me"};
+// size_t indices[] = {0, 1, 2};
 
 struct zip_t *zip = zip_open("foo.zip", 0, 'd');
 {
     zip_entries_delete(zip, entries, 3);
+
+    // you can also delete by index, instead of by name
+    // zip_entries_deletebyindex(zip, indices, 3);
 }
 zip_close(zip);
 ```
 
-# Bindings
+### Bindings
+
 Compile zip library as a dynamic library.
+
 ```shell
 $ mkdir build
 $ cd build
 $ cmake -DBUILD_SHARED_LIBS=true ..
-$ make
+$ cmake --build .
 ```
 
-### [Go](https://golang.org) (cgo)
+#### [Go](https://golang.org) (cgo)
+> Third party binding: [kuba--/c-go-zip](https://github.com/kuba--/c-go-zip)
+
 ```go
 package main
 
@@ -278,24 +296,25 @@ import "C"
 import "unsafe"
 
 func main() {
-	path := C.CString("/tmp/go.zip")
-	zip := C.zip_open(path, 6, 'w')
+    path := C.CString("/tmp/go.zip")
+    zip := C.zip_open(path, 6, 'w')
 
-	entryname := C.CString("test")
-	C.zip_entry_open(zip, entryname)
+    entryname := C.CString("test")
+    C.zip_entry_open(zip, entryname)
 
-	content := "test content"
-	buf := unsafe.Pointer(C.CString(content))
-	bufsize := C.size_t(len(content))
-	C.zip_entry_write(zip, buf, bufsize)
+    content := "test content"
+    buf := unsafe.Pointer(C.CString(content))
+    bufsize := C.size_t(len(content))
+    C.zip_entry_write(zip, buf, bufsize)
 
-	C.zip_entry_close(zip)
+    C.zip_entry_close(zip)
 
-	C.zip_close(zip)
+    C.zip_close(zip)
 }
 ```
 
-### [Rust](https://www.rust-lang.org) (ffi)
+#### [Rust](https://www.rust-lang.org) (ffi)
+
 ```rust
 extern crate libc;
 use std::ffi::CString;
@@ -342,13 +361,16 @@ fn main() {
 }
 ```
 
-### [Ruby](http://www.ruby-lang.org) (ffi)
+#### [Ruby](http://www.ruby-lang.org) (ffi)
+
 Install _ffi_ gem.
+
 ```shell
 $ gem install ffi
 ```
 
 Bind in your module.
+
 ```ruby
 require 'ffi'
 
@@ -375,13 +397,16 @@ Zip.zip_entry_close(ptr)
 Zip.zip_close(ptr)
 ```
 
-### [Python](https://www.python.org) (cffi)
+#### [Python](https://www.python.org) (cffi)
+
 Install _cffi_ package
+
 ```shell
 $ pip install cffi
 ```
 
 Bind in your package.
+
 ```python
 import ctypes.util
 from cffi import FFI
@@ -409,7 +434,8 @@ Zip.zip_entry_close(ptr)
 Zip.zip_close(ptr)
 ```
 
-### [Never](https://never-lang.readthedocs.io/) (ffi)
+#### [Never](https://never-lang.readthedocs.io/) (ffi)
+
 ```never
 extern "libzip.so" func zip_open(zipname: string, level: int, mode: char) -> c_ptr
 extern "libzip.so" func zip_close(zip: c_ptr) -> void
@@ -438,8 +464,10 @@ func main() -> int
 }
 ```
 
-### [Ring](http://ring-lang.net)
+#### [Ring](http://ring-lang.net)
+
 The language comes with RingZip based on this library
+
 ```ring
 load "ziplib.ring"
 
@@ -455,15 +483,159 @@ new Zip {
 }
 ```
 
-# Check out more cool projects which use this library:
-- [Filament](https://github.com/google/filament): Filament is a real-time physically based rendering engine for Android, iOS, Linux, macOS, Windows, and WebGL. It is designed to be as small as possible and as efficient as possible on Android.
-- [Hermes JS Engine](https://github.com/facebook/hermes): Hermes is a JavaScript engine optimized for fast start-up of React Native apps on Android. It features ahead-of-time static optimization and compact bytecode.
-- [Open Asset Import Library](https://github.com/assimp/assimp): A library to import and export various 3d-model-formats including scene-post-processing to generate missing render data.
-- [PowerToys](https://github.com/microsoft/PowerToys): Set of utilities for power users to tune and streamline their Windows 10 experience for greater productivity.
-- [The Ring Programming Language](https://ring-lang.github.io): Innovative and practical general-purpose multi-paradigm language.
-- [The V Programming Language](https://github.com/vlang/v): Simple, fast, safe, compiled. For developing maintainable software.
-- [TIC-80](https://github.com/nesbox/TIC-80): TIC-80 is a FREE and OPEN SOURCE fantasy computer for making, playing and sharing tiny games.
-- [Urho3D](https://github.com/urho3d/Urho3D): 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.
-- [Vcpkg](https://github.com/microsoft/vcpkg): Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS.
-- [and more...](https://grep.app/search?q=kuba--/zip)
+#### [Zig](https://ziglang.org)
 
+```shell
+$ zig build-exe main.zig -lc -lzip
+```
+
+```zig
+const c = @cImport({
+    @cInclude("zip.h");
+});
+
+pub fn main() void {
+    var zip = c.zip_open("/tmp/zig.zip", 6, 'w');
+    defer c.zip_close(zip);
+
+    _ = c.zip_entry_open(zip, "test");
+    defer _ = c.zip_entry_close(zip);
+
+    const content = "test content";
+    _ = c.zip_entry_write(zip, content, content.len);
+}
+```
+
+#### [Odin](https://odin-lang.org)
+> Third party binding: [thechampagne/zip-odin](https://github.com/thechampagne/zip-odin)
+
+```odin
+package main
+
+foreign import lib "system:zip"
+
+import "core:c"
+
+foreign lib {
+    zip_open :: proc(zipname : cstring, level : c.int, mode : c.char) -> rawptr ---
+
+    zip_close :: proc(zip : rawptr) ---
+
+    zip_entry_open :: proc(zip : rawptr, entryname : cstring) -> c.int ---
+
+    zip_entry_close :: proc(zip : rawptr) -> c.int ---
+
+    zip_entry_write :: proc(zip : rawptr, buf : rawptr, bufsize : c.size_t) -> c.int ---
+}
+
+main :: proc() {
+    zip_file := zip_open("odin.zip", 6, 'w')
+    defer zip_close(zip_file)
+
+    zip_entry_open(zip_file, "test")
+    defer zip_entry_close(zip_file)
+
+    content := "test content"
+    zip_entry_write(zip_file, &content, len(content))
+}
+```
+
+#### [Nim](https://nim-lang.org)
+> Third party binding: [thechampagne/nimzip](https://github.com/thechampagne/nimzip)
+
+```shell
+$ nim c --passL:-lzip main.nim
+```
+
+```nim
+proc zip_open(zipname: cstring, level: cint, mode: char): pointer {.importc.}
+proc zip_close(zip: pointer) {.importc.}
+proc zip_entry_open(zip: pointer, entryname: cstring): cint {.importc.}
+proc zip_entry_close(zip: pointer): cint {.importc.}
+proc zip_entry_write(zip: pointer, buf: pointer, bufsize: csize_t): cint {.importc.}
+
+when isMainModule:
+  var zip = zip_open("/tmp/nim.zip", 6, 'w')
+
+  discard zip_entry_open(zip, "test")
+
+  let content: cstring = "test content"
+  discard zip_entry_write(zip, content, csize_t(len(content)))
+
+  discard zip_entry_close(zip)
+  zip_close(zip)
+```
+
+#### [D](https://dlang.org)
+> Third party binding: [thechampagne/zip-d](https://github.com/thechampagne/zip-d)
+
+```shell
+$ dmd -L-lzip main.d
+```
+
+```d
+extern(C) void* zip_open(const(char)* zipname, int level, char mode);
+extern(C) void zip_close(void* zip);
+extern(C) int zip_entry_open(void* zip, const(char)* entryname);
+extern(C) int zip_entry_close(void* zip);
+extern(C) int zip_entry_write(void* zip, const(void)* buf, size_t bufsize);
+
+void main()
+{
+  void* zip = zip_open("/tmp/d.zip", 6, 'w');
+  scope(exit) zip_close(zip);
+
+  zip_entry_open(zip, "test");
+  scope(exit) zip_entry_close(zip);
+
+  string content = "test content";
+  zip_entry_write(zip, content.ptr, content.length);
+}
+```
+
+#### [Pascal](https://en.wikipedia.org/wiki/Pascal_(programming_language))
+> Third party binding: [thechampagne/zip-pascal](https://github.com/thechampagne/zip-pascal)
+
+```pas
+program main;
+
+{$linklib c}
+{$linklib zip}
+
+uses ctypes;
+
+function zip_open(zipname:Pchar; level:longint; mode:char):pointer;cdecl;external;
+procedure zip_close(zip:pointer);cdecl;external;
+function zip_entry_open(zip:pointer; entryname:Pchar):longint;cdecl;external;
+function zip_entry_close(zip:pointer):longint;cdecl;external;
+function zip_entry_write(zip:pointer; buf:pointer; bufsize:csize_t):longint;cdecl;external;
+
+const
+   content: Pchar = 'test content';
+var
+   zip : pointer;
+
+begin
+   zip := zip_open('/tmp/pascal.zip', 6, 'w');
+
+   zip_entry_open(zip, 'test');
+
+   zip_entry_write(zip, content, strlen(content));
+   zip_entry_close(zip);
+   zip_close(zip);
+end.
+```
+
+### Check out more cool projects which use this library
+
+* [Filament](https://github.com/google/filament): Filament is a real-time physically based rendering engine for Android, iOS, Linux, macOS, Windows, and WebGL. It is designed to be as small as possible and as efficient as possible on Android.
+* [Hermes JS Engine](https://github.com/facebook/hermes): Hermes is a JavaScript engine optimized for fast start-up of React Native apps on Android. It features ahead-of-time static optimization and compact bytecode.
+* [Monster Mash](https://github.com/google/monster-mash): New Sketch-Based Modeling and Animation Tool.
+* [Object-Oriented Graphics Rendering Engine](https://github.com/OGRECave/ogre): OGRE is a scene-oriented, flexible 3D engine written in C++ designed to make it easier and more intuitive for developers to produce games and demos utilising 3D hardware.
+* [Open Asset Import Library](https://github.com/assimp/assimp): A library to import and export various 3d-model-formats including scene-post-processing to generate missing render data.
+* [PowerToys](https://github.com/microsoft/PowerToys): Set of utilities for power users to tune and streamline their Windows 10 experience for greater productivity.
+* [The Ring Programming Language](https://ring-lang.github.io): Innovative and practical general-purpose multi-paradigm language.
+* [The V Programming Language](https://github.com/vlang/v): Simple, fast, safe, compiled. For developing maintainable software.
+* [TIC-80](https://github.com/nesbox/TIC-80): TIC-80 is a FREE and OPEN SOURCE fantasy computer for making, playing and sharing tiny games.
+* [Urho3D](https://github.com/urho3d/Urho3D): 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.
+* [and more...](https://grep.app/search?q=kuba--/zip)
diff --git a/contrib/zip/appveyor.yml b/contrib/zip/appveyor.yml
deleted file mode 100644
index ea17f5de9..000000000
--- a/contrib/zip/appveyor.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-version: zip-0.1.15.{build}
-build_script:
-- cmd: >-
-    cd c:\projects\zip
-
-    mkdir build
-
-    cd build
-
-    cmake -G"Visual Studio 14" -DCMAKE_BUILD_TYPE=Debug ..
-
-    cmake --build . --config %CMAKE_BUILD_TYPE%
-
-    ctest --verbose -C "Debug"
diff --git a/contrib/zip/cmake/Config.cmake.in b/contrib/zip/cmake/Config.cmake.in
new file mode 100644
index 000000000..38bbde7b3
--- /dev/null
+++ b/contrib/zip/cmake/Config.cmake.in
@@ -0,0 +1,4 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
+check_required_components("@PROJECT_NAME@")
diff --git a/contrib/zip/src/miniz.h b/contrib/zip/src/miniz.h
index 7a6ff8d1a..ad5850ce1 100644
--- a/contrib/zip/src/miniz.h
+++ b/contrib/zip/src/miniz.h
@@ -1,5 +1,7 @@
-/*
-   miniz.c v1.15 - public domain deflate/inflate, zlib-subset, ZIP
+#ifndef MINIZ_EXPORT
+#define MINIZ_EXPORT
+#endif
+/* miniz.c 3.0.0 - public domain deflate/inflate, zlib-subset, ZIP
    reading/writing/appending, PNG writing See "unlicense" statement at the end
    of this file. Rich Geldreich <richgel99@gmail.com>, last updated Oct. 13,
    2013 Implements RFC 1950: http://www.ietf.org/rfc/rfc1950.txt and RFC 1951:
@@ -9,87 +11,6 @@
    archive related functions just define MINIZ_NO_ARCHIVE_APIS, or to get rid of
    all stdio usage define MINIZ_NO_STDIO (see the list below for more macros).
 
-   * Change History
-     10/13/13 v1.15 r4 - Interim bugfix release while I work on the next major
-   release with Zip64 support (almost there!):
-       - Critical fix for the MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY bug
-   (thanks kahmyong.moon@hp.com) which could cause locate files to not find
-   files. This bug would only have occured in earlier versions if you explicitly
-   used this flag, OR if you used mz_zip_extract_archive_file_to_heap() or
-   mz_zip_add_mem_to_archive_file_in_place() (which used this flag). If you
-   can't switch to v1.15 but want to fix this bug, just remove the uses of this
-   flag from both helper funcs (and of course don't use the flag).
-       - Bugfix in mz_zip_reader_extract_to_mem_no_alloc() from kymoon when
-   pUser_read_buf is not NULL and compressed size is > uncompressed size
-       - Fixing mz_zip_reader_extract_*() funcs so they don't try to extract
-   compressed data from directory entries, to account for weird zipfiles which
-   contain zero-size compressed data on dir entries. Hopefully this fix won't
-   cause any issues on weird zip archives, because it assumes the low 16-bits of
-   zip external attributes are DOS attributes (which I believe they always are
-   in practice).
-       - Fixing mz_zip_reader_is_file_a_directory() so it doesn't check the
-   internal attributes, just the filename and external attributes
-       - mz_zip_reader_init_file() - missing MZ_FCLOSE() call if the seek failed
-       - Added cmake support for Linux builds which builds all the examples,
-   tested with clang v3.3 and gcc v4.6.
-       - Clang fix for tdefl_write_image_to_png_file_in_memory() from toffaletti
-       - Merged MZ_FORCEINLINE fix from hdeanclark
-       - Fix <time.h> include before config #ifdef, thanks emil.brink
-       - Added tdefl_write_image_to_png_file_in_memory_ex(): supports Y flipping
-   (super useful for OpenGL apps), and explicit control over the compression
-   level (so you can set it to 1 for real-time compression).
-       - Merged in some compiler fixes from paulharris's github repro.
-       - Retested this build under Windows (VS 2010, including static analysis),
-   tcc  0.9.26, gcc v4.6 and clang v3.3.
-       - Added example6.c, which dumps an image of the mandelbrot set to a PNG
-   file.
-       - Modified example2 to help test the
-   MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY flag more.
-       - In r3: Bugfix to mz_zip_writer_add_file() found during merge: Fix
-   possible src file fclose() leak if alignment bytes+local header file write
-   faiiled
-   - In r4: Minor bugfix to mz_zip_writer_add_from_zip_reader(): Was pushing the
-   wrong central dir header offset, appears harmless in this release, but it
-   became a problem in the zip64 branch 5/20/12 v1.14 - MinGW32/64 GCC 4.6.1
-   compiler fixes: added MZ_FORCEINLINE, #include <time.h> (thanks fermtect).
-     5/19/12 v1.13 - From jason@cornsyrup.org and kelwert@mtu.edu - Fix
-   mz_crc32() so it doesn't compute the wrong CRC-32's when mz_ulong is 64-bit.
-       - Temporarily/locally slammed in "typedef unsigned long mz_ulong" and
-   re-ran a randomized regression test on ~500k files.
-       - Eliminated a bunch of warnings when compiling with GCC 32-bit/64.
-       - Ran all examples, miniz.c, and tinfl.c through MSVC 2008's /analyze
-   (static analysis) option and fixed all warnings (except for the silly "Use of
-   the comma-operator in a tested expression.." analysis warning, which I
-   purposely use to work around a MSVC compiler warning).
-       - Created 32-bit and 64-bit Codeblocks projects/workspace. Built and
-   tested Linux executables. The codeblocks workspace is compatible with
-   Linux+Win32/x64.
-       - Added miniz_tester solution/project, which is a useful little app
-   derived from LZHAM's tester app that I use as part of the regression test.
-       - Ran miniz.c and tinfl.c through another series of regression testing on
-   ~500,000 files and archives.
-       - Modified example5.c so it purposely disables a bunch of high-level
-   functionality (MINIZ_NO_STDIO, etc.). (Thanks to corysama for the
-   MINIZ_NO_STDIO bug report.)
-       - Fix ftell() usage in examples so they exit with an error on files which
-   are too large (a limitation of the examples, not miniz itself). 4/12/12 v1.12
-   - More comments, added low-level example5.c, fixed a couple minor
-   level_and_flags issues in the archive API's. level_and_flags can now be set
-   to MZ_DEFAULT_COMPRESSION. Thanks to Bruce Dawson <bruced@valvesoftware.com>
-   for the feedback/bug report. 5/28/11 v1.11 - Added statement from
-   unlicense.org 5/27/11 v1.10 - Substantial compressor optimizations:
-      - Level 1 is now ~4x faster than before. The L1 compressor's throughput
-   now varies between 70-110MB/sec. on a
-      - Core i7 (actual throughput varies depending on the type of data, and x64
-   vs. x86).
-      - Improved baseline L2-L9 compression perf. Also, greatly improved
-   compression perf. issues on some file types.
-      - Refactored the compression code for better readability and
-   maintainability.
-      - Added level 10 compression level (L10 has slightly better ratio than
-   level 9, but could have a potentially large drop in throughput on some
-   files). 5/15/11 v1.09 - Initial stable release.
-
    * Low-level Deflate/Inflate implementation notes:
 
      Compression: Use the "tdefl" API's. The compressor supports raw, static,
@@ -111,7 +32,7 @@
    functionality present for it to be a drop-in zlib replacement in many apps:
         The z_stream struct, optional memory allocation callbacks
         deflateInit/deflateInit2/deflate/deflateReset/deflateEnd/deflateBound
-        inflateInit/inflateInit2/inflate/inflateEnd
+        inflateInit/inflateInit2/inflate/inflateReset/inflateEnd
         compress, compress2, compressBound, uncompress
         CRC-32, Adler-32 - Using modern, minimal code size, CPU cache friendly
    routines. Supports raw deflate streams or standard zlib streams with adler-32
@@ -201,8 +122,8 @@
    lost with this method if anything goes wrong, though.
 
      - ZIP archive support limitations:
-     No zip64 or spanning support. Extraction functions can only handle
-   unencrypted, stored or deflated files. Requires streams capable of seeking.
+     No spanning support. Extraction functions can only handle unencrypted,
+   stored or deflated files. Requires streams capable of seeking.
 
    * This is a header file library, like stb_image.c. To get only a header file,
    either cut and paste the below header, or create miniz.h, #define
@@ -217,55 +138,69 @@
    stat64(), etc. Otherwise you won't be able to process large files (i.e.
    32-bit stat() fails for me on files > 0x7FFFFFFF bytes).
 */
+#pragma once
 
-#ifndef MINIZ_HEADER_INCLUDED
-#define MINIZ_HEADER_INCLUDED
+/* Defines to completely disable specific portions of miniz.c:
+   If all macros here are defined the only functionality remaining will be
+   CRC-32 and adler-32. */
 
-#include <stdint.h>
-#include <stdlib.h>
+/* Define MINIZ_NO_STDIO to disable all usage and any functions which rely on
+ * stdio for file I/O. */
+/*#define MINIZ_NO_STDIO */
 
-// Defines to completely disable specific portions of miniz.c:
-// If all macros here are defined the only functionality remaining will be
-// CRC-32, adler-32, tinfl, and tdefl.
+/* If MINIZ_NO_TIME is specified then the ZIP archive functions will not be able
+ * to get the current time, or */
+/* get/set file times, and the C run-time funcs that get/set times won't be
+ * called. */
+/* The current downside is the times written to your archives will be from 1979.
+ */
+/*#define MINIZ_NO_TIME */
 
-// Define MINIZ_NO_STDIO to disable all usage and any functions which rely on
-// stdio for file I/O.
-//#define MINIZ_NO_STDIO
+/* Define MINIZ_NO_DEFLATE_APIS to disable all compression API's. */
+/*#define MINIZ_NO_DEFLATE_APIS */
 
-// If MINIZ_NO_TIME is specified then the ZIP archive functions will not be able
-// to get the current time, or get/set file times, and the C run-time funcs that
-// get/set times won't be called. The current downside is the times written to
-// your archives will be from 1979.
-//#define MINIZ_NO_TIME
+/* Define MINIZ_NO_INFLATE_APIS to disable all decompression API's. */
+/*#define MINIZ_NO_INFLATE_APIS */
 
-// Define MINIZ_NO_ARCHIVE_APIS to disable all ZIP archive API's.
-//#define MINIZ_NO_ARCHIVE_APIS
+/* Define MINIZ_NO_ARCHIVE_APIS to disable all ZIP archive API's. */
+/*#define MINIZ_NO_ARCHIVE_APIS */
 
-// Define MINIZ_NO_ARCHIVE_APIS to disable all writing related ZIP archive
-// API's.
-//#define MINIZ_NO_ARCHIVE_WRITING_APIS
+/* Define MINIZ_NO_ARCHIVE_WRITING_APIS to disable all writing related ZIP
+ * archive API's. */
+/*#define MINIZ_NO_ARCHIVE_WRITING_APIS */
 
-// Define MINIZ_NO_ZLIB_APIS to remove all ZLIB-style compression/decompression
-// API's.
-//#define MINIZ_NO_ZLIB_APIS
+/* Define MINIZ_NO_ZLIB_APIS to remove all ZLIB-style compression/decompression
+ * API's. */
+/*#define MINIZ_NO_ZLIB_APIS */
 
-// Define MINIZ_NO_ZLIB_COMPATIBLE_NAME to disable zlib names, to prevent
-// conflicts against stock zlib.
-//#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES
+/* Define MINIZ_NO_ZLIB_COMPATIBLE_NAME to disable zlib names, to prevent
+ * conflicts against stock zlib. */
+/*#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES */
 
-// Define MINIZ_NO_MALLOC to disable all calls to malloc, free, and realloc.
-// Note if MINIZ_NO_MALLOC is defined then the user must always provide custom
-// user alloc/free/realloc callbacks to the zlib and archive API's, and a few
-// stand-alone helper API's which don't provide custom user functions (such as
-// tdefl_compress_mem_to_heap() and tinfl_decompress_mem_to_heap()) won't work.
-//#define MINIZ_NO_MALLOC
+/* Define MINIZ_NO_MALLOC to disable all calls to malloc, free, and realloc.
+   Note if MINIZ_NO_MALLOC is defined then the user must always provide custom
+   user alloc/free/realloc callbacks to the zlib and archive API's, and a few
+   stand-alone helper API's which don't provide custom user functions (such as
+   tdefl_compress_mem_to_heap() and tinfl_decompress_mem_to_heap()) won't work.
+ */
+/*#define MINIZ_NO_MALLOC */
+
+#ifdef MINIZ_NO_INFLATE_APIS
+#define MINIZ_NO_ARCHIVE_APIS
+#endif
+
+#ifdef MINIZ_NO_DEFLATE_APIS
+#define MINIZ_NO_ARCHIVE_WRITING_APIS
+#endif
 
 #if defined(__TINYC__) && (defined(__linux) || defined(__linux__))
-// TODO: Work around "error: include file 'sys\utime.h' when compiling with tcc
-// on Linux
+/* TODO: Work around "error: include file 'sys\utime.h' when compiling with tcc
+ * on Linux */
 #define MINIZ_NO_TIME
 #endif
 
+#include <stddef.h>
+
 #if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_ARCHIVE_APIS)
 #include <time.h>
 #endif
@@ -273,13 +208,39 @@
 #if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) ||                \
     defined(__i386) || defined(__i486__) || defined(__i486) ||                 \
     defined(i386) || defined(__ia64__) || defined(__x86_64__)
-// MINIZ_X86_OR_X64_CPU is only used to help set the below macros.
+/* MINIZ_X86_OR_X64_CPU is only used to help set the below macros. */
 #define MINIZ_X86_OR_X64_CPU 1
+#else
+#define MINIZ_X86_OR_X64_CPU 0
 #endif
 
-#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || MINIZ_X86_OR_X64_CPU
-// Set MINIZ_LITTLE_ENDIAN to 1 if the processor is little endian.
+/* Set MINIZ_LITTLE_ENDIAN only if not set */
+#if !defined(MINIZ_LITTLE_ENDIAN)
+#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__)
+
+#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+/* Set MINIZ_LITTLE_ENDIAN to 1 if the processor is little endian. */
 #define MINIZ_LITTLE_ENDIAN 1
+#else
+#define MINIZ_LITTLE_ENDIAN 0
+#endif
+
+#else
+
+#if MINIZ_X86_OR_X64_CPU
+#define MINIZ_LITTLE_ENDIAN 1
+#else
+#define MINIZ_LITTLE_ENDIAN 0
+#endif
+
+#endif
+#endif
+
+/* Using unaligned loads and stores causes errors when using UBSan */
+#if defined(__has_feature)
+#if __has_feature(undefined_behavior_sanitizer)
+#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0
+#endif
 #endif
 
 /* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES only if not set */
@@ -287,7 +248,7 @@
 #if MINIZ_X86_OR_X64_CPU
 /* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient
  * integer loads and stores from unaligned addresses. */
-#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1
+#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0
 #define MINIZ_UNALIGNED_USE_MEMCPY
 #else
 #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0
@@ -297,57 +258,42 @@
 #if defined(_M_X64) || defined(_WIN64) || defined(__MINGW64__) ||              \
     defined(_LP64) || defined(__LP64__) || defined(__ia64__) ||                \
     defined(__x86_64__)
-// Set MINIZ_HAS_64BIT_REGISTERS to 1 if operations on 64-bit integers are
-// reasonably fast (and don't involve compiler generated calls to helper
-// functions).
+/* Set MINIZ_HAS_64BIT_REGISTERS to 1 if operations on 64-bit integers are
+ * reasonably fast (and don't involve compiler generated calls to helper
+ * functions). */
 #define MINIZ_HAS_64BIT_REGISTERS 1
-#endif
-
-#ifdef __APPLE__
-#define ftello64 ftello
-#define fseeko64 fseeko
-#define fopen64 fopen
-#define freopen64 freopen
-
-// Darwin OSX
-#define MZ_PLATFORM 19
-#endif
-
-#ifndef MZ_PLATFORM
-#if defined(_WIN64) || defined(_WIN32) || defined(__WIN32__)
-#define MZ_PLATFORM 0
 #else
-// UNIX
-#define MZ_PLATFORM 3
-#endif
+#define MINIZ_HAS_64BIT_REGISTERS 0
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-// ------------------- zlib-style API Definitions.
+/* ------------------- zlib-style API Definitions. */
 
-// For more compatibility with zlib, miniz.c uses unsigned long for some
-// parameters/struct members. Beware: mz_ulong can be either 32 or 64-bits!
+/* For more compatibility with zlib, miniz.c uses unsigned long for some
+ * parameters/struct members. Beware: mz_ulong can be either 32 or 64-bits! */
 typedef unsigned long mz_ulong;
 
-// mz_free() internally uses the MZ_FREE() macro (which by default calls free()
-// unless you've modified the MZ_MALLOC macro) to release a block allocated from
-// the heap.
-void mz_free(void *p);
+/* mz_free() internally uses the MZ_FREE() macro (which by default calls free()
+ * unless you've modified the MZ_MALLOC macro) to release a block allocated from
+ * the heap. */
+MINIZ_EXPORT void mz_free(void *p);
 
 #define MZ_ADLER32_INIT (1)
-// mz_adler32() returns the initial adler-32 value to use when called with
-// ptr==NULL.
-mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len);
+/* mz_adler32() returns the initial adler-32 value to use when called with
+ * ptr==NULL. */
+MINIZ_EXPORT mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr,
+                                 size_t buf_len);
 
 #define MZ_CRC32_INIT (0)
-// mz_crc32() returns the initial CRC-32 value to use when called with
-// ptr==NULL.
-mz_ulong mz_crc32(mz_ulong crc, const unsigned char *ptr, size_t buf_len);
+/* mz_crc32() returns the initial CRC-32 value to use when called with
+ * ptr==NULL. */
+MINIZ_EXPORT mz_ulong mz_crc32(mz_ulong crc, const unsigned char *ptr,
+                               size_t buf_len);
 
-// Compression strategies.
+/* Compression strategies. */
 enum {
   MZ_DEFAULT_STRATEGY = 0,
   MZ_FILTERED = 1,
@@ -356,66 +302,40 @@ enum {
   MZ_FIXED = 4
 };
 
-/* miniz error codes. Be sure to update mz_zip_get_error_string() if you add or
- * modify this enum. */
-typedef enum {
-  MZ_ZIP_NO_ERROR = 0,
-  MZ_ZIP_UNDEFINED_ERROR,
-  MZ_ZIP_TOO_MANY_FILES,
-  MZ_ZIP_FILE_TOO_LARGE,
-  MZ_ZIP_UNSUPPORTED_METHOD,
-  MZ_ZIP_UNSUPPORTED_ENCRYPTION,
-  MZ_ZIP_UNSUPPORTED_FEATURE,
-  MZ_ZIP_FAILED_FINDING_CENTRAL_DIR,
-  MZ_ZIP_NOT_AN_ARCHIVE,
-  MZ_ZIP_INVALID_HEADER_OR_CORRUPTED,
-  MZ_ZIP_UNSUPPORTED_MULTIDISK,
-  MZ_ZIP_DECOMPRESSION_FAILED,
-  MZ_ZIP_COMPRESSION_FAILED,
-  MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE,
-  MZ_ZIP_CRC_CHECK_FAILED,
-  MZ_ZIP_UNSUPPORTED_CDIR_SIZE,
-  MZ_ZIP_ALLOC_FAILED,
-  MZ_ZIP_FILE_OPEN_FAILED,
-  MZ_ZIP_FILE_CREATE_FAILED,
-  MZ_ZIP_FILE_WRITE_FAILED,
-  MZ_ZIP_FILE_READ_FAILED,
-  MZ_ZIP_FILE_CLOSE_FAILED,
-  MZ_ZIP_FILE_SEEK_FAILED,
-  MZ_ZIP_FILE_STAT_FAILED,
-  MZ_ZIP_INVALID_PARAMETER,
-  MZ_ZIP_INVALID_FILENAME,
-  MZ_ZIP_BUF_TOO_SMALL,
-  MZ_ZIP_INTERNAL_ERROR,
-  MZ_ZIP_FILE_NOT_FOUND,
-  MZ_ZIP_ARCHIVE_TOO_LARGE,
-  MZ_ZIP_VALIDATION_FAILED,
-  MZ_ZIP_WRITE_CALLBACK_FAILED,
-  MZ_ZIP_TOTAL_ERRORS
-} mz_zip_error;
-
-// Method
+/* Method */
 #define MZ_DEFLATED 8
 
-#ifndef MINIZ_NO_ZLIB_APIS
-
-// Heap allocation callbacks.
-// Note that mz_alloc_func parameter types purposely differ from zlib's:
-// items/size is size_t, not unsigned long.
+/* Heap allocation callbacks.
+Note that mz_alloc_func parameter types purposely differ from zlib's: items/size
+is size_t, not unsigned long. */
 typedef void *(*mz_alloc_func)(void *opaque, size_t items, size_t size);
 typedef void (*mz_free_func)(void *opaque, void *address);
 typedef void *(*mz_realloc_func)(void *opaque, void *address, size_t items,
                                  size_t size);
 
-#define MZ_VERSION "9.1.15"
-#define MZ_VERNUM 0x91F0
-#define MZ_VER_MAJOR 9
-#define MZ_VER_MINOR 1
-#define MZ_VER_REVISION 15
+/* Compression levels: 0-9 are the standard zlib-style levels, 10 is best
+ * possible compression (not zlib compatible, and may be very slow),
+ * MZ_DEFAULT_COMPRESSION=MZ_DEFAULT_LEVEL. */
+enum {
+  MZ_NO_COMPRESSION = 0,
+  MZ_BEST_SPEED = 1,
+  MZ_BEST_COMPRESSION = 9,
+  MZ_UBER_COMPRESSION = 10,
+  MZ_DEFAULT_LEVEL = 6,
+  MZ_DEFAULT_COMPRESSION = -1
+};
+
+#define MZ_VERSION "11.0.2"
+#define MZ_VERNUM 0xB002
+#define MZ_VER_MAJOR 11
+#define MZ_VER_MINOR 2
+#define MZ_VER_REVISION 0
 #define MZ_VER_SUBREVISION 0
 
-// Flush values. For typical usage you only need MZ_NO_FLUSH and MZ_FINISH. The
-// other values are for advanced use (refer to the zlib docs).
+#ifndef MINIZ_NO_ZLIB_APIS
+
+/* Flush values. For typical usage you only need MZ_NO_FLUSH and MZ_FINISH. The
+ * other values are for advanced use (refer to the zlib docs). */
 enum {
   MZ_NO_FLUSH = 0,
   MZ_PARTIAL_FLUSH = 1,
@@ -425,7 +345,7 @@ enum {
   MZ_BLOCK = 5
 };
 
-// Return status codes. MZ_PARAM_ERROR is non-standard.
+/* Return status codes. MZ_PARAM_ERROR is non-standard. */
 enum {
   MZ_OK = 0,
   MZ_STREAM_END = 1,
@@ -439,171 +359,183 @@ enum {
   MZ_PARAM_ERROR = -10000
 };
 
-// Compression levels: 0-9 are the standard zlib-style levels, 10 is best
-// possible compression (not zlib compatible, and may be very slow),
-// MZ_DEFAULT_COMPRESSION=MZ_DEFAULT_LEVEL.
-enum {
-  MZ_NO_COMPRESSION = 0,
-  MZ_BEST_SPEED = 1,
-  MZ_BEST_COMPRESSION = 9,
-  MZ_UBER_COMPRESSION = 10,
-  MZ_DEFAULT_LEVEL = 6,
-  MZ_DEFAULT_COMPRESSION = -1
-};
-
-// Window bits
+/* Window bits */
 #define MZ_DEFAULT_WINDOW_BITS 15
 
 struct mz_internal_state;
 
-// Compression/decompression stream struct.
+/* Compression/decompression stream struct. */
 typedef struct mz_stream_s {
-  const unsigned char *next_in; // pointer to next byte to read
-  unsigned int avail_in;        // number of bytes available at next_in
-  mz_ulong total_in;            // total number of bytes consumed so far
+  const unsigned char *next_in; /* pointer to next byte to read */
+  unsigned int avail_in;        /* number of bytes available at next_in */
+  mz_ulong total_in;            /* total number of bytes consumed so far */
 
-  unsigned char *next_out; // pointer to next byte to write
-  unsigned int avail_out;  // number of bytes that can be written to next_out
-  mz_ulong total_out;      // total number of bytes produced so far
+  unsigned char *next_out; /* pointer to next byte to write */
+  unsigned int avail_out;  /* number of bytes that can be written to next_out */
+  mz_ulong total_out;      /* total number of bytes produced so far */
 
-  char *msg;                       // error msg (unused)
-  struct mz_internal_state *state; // internal state, allocated by zalloc/zfree
+  char *msg; /* error msg (unused) */
+  struct mz_internal_state
+      *state; /* internal state, allocated by zalloc/zfree */
 
   mz_alloc_func
-      zalloc;         // optional heap allocation function (defaults to malloc)
-  mz_free_func zfree; // optional heap free function (defaults to free)
-  void *opaque;       // heap alloc function user pointer
+      zalloc; /* optional heap allocation function (defaults to malloc) */
+  mz_free_func zfree; /* optional heap free function (defaults to free) */
+  void *opaque;       /* heap alloc function user pointer */
 
-  int data_type;     // data_type (unused)
-  mz_ulong adler;    // adler32 of the source or uncompressed data
-  mz_ulong reserved; // not used
+  int data_type;     /* data_type (unused) */
+  mz_ulong adler;    /* adler32 of the source or uncompressed data */
+  mz_ulong reserved; /* not used */
 } mz_stream;
 
 typedef mz_stream *mz_streamp;
 
-// Returns the version string of miniz.c.
-const char *mz_version(void);
+/* Returns the version string of miniz.c. */
+MINIZ_EXPORT const char *mz_version(void);
 
-// mz_deflateInit() initializes a compressor with default options:
-// Parameters:
-//  pStream must point to an initialized mz_stream struct.
-//  level must be between [MZ_NO_COMPRESSION, MZ_BEST_COMPRESSION].
-//  level 1 enables a specially optimized compression function that's been
-//  optimized purely for performance, not ratio. (This special func. is
-//  currently only enabled when MINIZ_USE_UNALIGNED_LOADS_AND_STORES and
-//  MINIZ_LITTLE_ENDIAN are defined.)
-// Return values:
-//  MZ_OK on success.
-//  MZ_STREAM_ERROR if the stream is bogus.
-//  MZ_PARAM_ERROR if the input parameters are bogus.
-//  MZ_MEM_ERROR on out of memory.
-int mz_deflateInit(mz_streamp pStream, int level);
+#ifndef MINIZ_NO_DEFLATE_APIS
 
-// mz_deflateInit2() is like mz_deflate(), except with more control:
-// Additional parameters:
-//   method must be MZ_DEFLATED
-//   window_bits must be MZ_DEFAULT_WINDOW_BITS (to wrap the deflate stream with
-//   zlib header/adler-32 footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate/no
-//   header or footer) mem_level must be between [1, 9] (it's checked but
-//   ignored by miniz.c)
-int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits,
-                    int mem_level, int strategy);
+/* mz_deflateInit() initializes a compressor with default options: */
+/* Parameters: */
+/*  pStream must point to an initialized mz_stream struct. */
+/*  level must be between [MZ_NO_COMPRESSION, MZ_BEST_COMPRESSION]. */
+/*  level 1 enables a specially optimized compression function that's been
+ * optimized purely for performance, not ratio. */
+/*  (This special func. is currently only enabled when
+ * MINIZ_USE_UNALIGNED_LOADS_AND_STORES and MINIZ_LITTLE_ENDIAN are defined.) */
+/* Return values: */
+/*  MZ_OK on success. */
+/*  MZ_STREAM_ERROR if the stream is bogus. */
+/*  MZ_PARAM_ERROR if the input parameters are bogus. */
+/*  MZ_MEM_ERROR on out of memory. */
+MINIZ_EXPORT int mz_deflateInit(mz_streamp pStream, int level);
 
-// Quickly resets a compressor without having to reallocate anything. Same as
-// calling mz_deflateEnd() followed by mz_deflateInit()/mz_deflateInit2().
-int mz_deflateReset(mz_streamp pStream);
+/* mz_deflateInit2() is like mz_deflate(), except with more control: */
+/* Additional parameters: */
+/*   method must be MZ_DEFLATED */
+/*   window_bits must be MZ_DEFAULT_WINDOW_BITS (to wrap the deflate stream with
+ * zlib header/adler-32 footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate/no
+ * header or footer) */
+/*   mem_level must be between [1, 9] (it's checked but ignored by miniz.c) */
+MINIZ_EXPORT int mz_deflateInit2(mz_streamp pStream, int level, int method,
+                                 int window_bits, int mem_level, int strategy);
 
-// mz_deflate() compresses the input to output, consuming as much of the input
-// and producing as much output as possible. Parameters:
-//   pStream is the stream to read from and write to. You must initialize/update
-//   the next_in, avail_in, next_out, and avail_out members. flush may be
-//   MZ_NO_FLUSH, MZ_PARTIAL_FLUSH/MZ_SYNC_FLUSH, MZ_FULL_FLUSH, or MZ_FINISH.
-// Return values:
-//   MZ_OK on success (when flushing, or if more input is needed but not
-//   available, and/or there's more output to be written but the output buffer
-//   is full). MZ_STREAM_END if all input has been consumed and all output bytes
-//   have been written. Don't call mz_deflate() on the stream anymore.
-//   MZ_STREAM_ERROR if the stream is bogus.
-//   MZ_PARAM_ERROR if one of the parameters is invalid.
-//   MZ_BUF_ERROR if no forward progress is possible because the input and/or
-//   output buffers are empty. (Fill up the input buffer or free up some output
-//   space and try again.)
-int mz_deflate(mz_streamp pStream, int flush);
+/* Quickly resets a compressor without having to reallocate anything. Same as
+ * calling mz_deflateEnd() followed by mz_deflateInit()/mz_deflateInit2(). */
+MINIZ_EXPORT int mz_deflateReset(mz_streamp pStream);
 
-// mz_deflateEnd() deinitializes a compressor:
-// Return values:
-//  MZ_OK on success.
-//  MZ_STREAM_ERROR if the stream is bogus.
-int mz_deflateEnd(mz_streamp pStream);
+/* mz_deflate() compresses the input to output, consuming as much of the input
+ * and producing as much output as possible. */
+/* Parameters: */
+/*   pStream is the stream to read from and write to. You must initialize/update
+ * the next_in, avail_in, next_out, and avail_out members. */
+/*   flush may be MZ_NO_FLUSH, MZ_PARTIAL_FLUSH/MZ_SYNC_FLUSH, MZ_FULL_FLUSH, or
+ * MZ_FINISH. */
+/* Return values: */
+/*   MZ_OK on success (when flushing, or if more input is needed but not
+ * available, and/or there's more output to be written but the output buffer is
+ * full). */
+/*   MZ_STREAM_END if all input has been consumed and all output bytes have been
+ * written. Don't call mz_deflate() on the stream anymore. */
+/*   MZ_STREAM_ERROR if the stream is bogus. */
+/*   MZ_PARAM_ERROR if one of the parameters is invalid. */
+/*   MZ_BUF_ERROR if no forward progress is possible because the input and/or
+ * output buffers are empty. (Fill up the input buffer or free up some output
+ * space and try again.) */
+MINIZ_EXPORT int mz_deflate(mz_streamp pStream, int flush);
 
-// mz_deflateBound() returns a (very) conservative upper bound on the amount of
-// data that could be generated by deflate(), assuming flush is set to only
-// MZ_NO_FLUSH or MZ_FINISH.
-mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len);
+/* mz_deflateEnd() deinitializes a compressor: */
+/* Return values: */
+/*  MZ_OK on success. */
+/*  MZ_STREAM_ERROR if the stream is bogus. */
+MINIZ_EXPORT int mz_deflateEnd(mz_streamp pStream);
 
-// Single-call compression functions mz_compress() and mz_compress2():
-// Returns MZ_OK on success, or one of the error codes from mz_deflate() on
-// failure.
-int mz_compress(unsigned char *pDest, mz_ulong *pDest_len,
-                const unsigned char *pSource, mz_ulong source_len);
-int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len,
-                 const unsigned char *pSource, mz_ulong source_len, int level);
+/* mz_deflateBound() returns a (very) conservative upper bound on the amount of
+ * data that could be generated by deflate(), assuming flush is set to only
+ * MZ_NO_FLUSH or MZ_FINISH. */
+MINIZ_EXPORT mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len);
 
-// mz_compressBound() returns a (very) conservative upper bound on the amount of
-// data that could be generated by calling mz_compress().
-mz_ulong mz_compressBound(mz_ulong source_len);
+/* Single-call compression functions mz_compress() and mz_compress2(): */
+/* Returns MZ_OK on success, or one of the error codes from mz_deflate() on
+ * failure. */
+MINIZ_EXPORT int mz_compress(unsigned char *pDest, mz_ulong *pDest_len,
+                             const unsigned char *pSource, mz_ulong source_len);
+MINIZ_EXPORT int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len,
+                              const unsigned char *pSource, mz_ulong source_len,
+                              int level);
 
-// Initializes a decompressor.
-int mz_inflateInit(mz_streamp pStream);
+/* mz_compressBound() returns a (very) conservative upper bound on the amount of
+ * data that could be generated by calling mz_compress(). */
+MINIZ_EXPORT mz_ulong mz_compressBound(mz_ulong source_len);
 
-// mz_inflateInit2() is like mz_inflateInit() with an additional option that
-// controls the window size and whether or not the stream has been wrapped with
-// a zlib header/footer: window_bits must be MZ_DEFAULT_WINDOW_BITS (to parse
-// zlib header/footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate).
-int mz_inflateInit2(mz_streamp pStream, int window_bits);
+#endif /*#ifndef MINIZ_NO_DEFLATE_APIS*/
 
-// Decompresses the input stream to the output, consuming only as much of the
-// input as needed, and writing as much to the output as possible. Parameters:
-//   pStream is the stream to read from and write to. You must initialize/update
-//   the next_in, avail_in, next_out, and avail_out members. flush may be
-//   MZ_NO_FLUSH, MZ_SYNC_FLUSH, or MZ_FINISH. On the first call, if flush is
-//   MZ_FINISH it's assumed the input and output buffers are both sized large
-//   enough to decompress the entire stream in a single call (this is slightly
-//   faster). MZ_FINISH implies that there are no more source bytes available
-//   beside what's already in the input buffer, and that the output buffer is
-//   large enough to hold the rest of the decompressed data.
-// Return values:
-//   MZ_OK on success. Either more input is needed but not available, and/or
-//   there's more output to be written but the output buffer is full.
-//   MZ_STREAM_END if all needed input has been consumed and all output bytes
-//   have been written. For zlib streams, the adler-32 of the decompressed data
-//   has also been verified. MZ_STREAM_ERROR if the stream is bogus.
-//   MZ_DATA_ERROR if the deflate stream is invalid.
-//   MZ_PARAM_ERROR if one of the parameters is invalid.
-//   MZ_BUF_ERROR if no forward progress is possible because the input buffer is
-//   empty but the inflater needs more input to continue, or if the output
-//   buffer is not large enough. Call mz_inflate() again with more input data,
-//   or with more room in the output buffer (except when using single call
-//   decompression, described above).
-int mz_inflate(mz_streamp pStream, int flush);
+#ifndef MINIZ_NO_INFLATE_APIS
 
-// Deinitializes a decompressor.
-int mz_inflateEnd(mz_streamp pStream);
+/* Initializes a decompressor. */
+MINIZ_EXPORT int mz_inflateInit(mz_streamp pStream);
 
-// Single-call decompression.
-// Returns MZ_OK on success, or one of the error codes from mz_inflate() on
-// failure.
-int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len,
-                  const unsigned char *pSource, mz_ulong source_len);
+/* mz_inflateInit2() is like mz_inflateInit() with an additional option that
+ * controls the window size and whether or not the stream has been wrapped with
+ * a zlib header/footer: */
+/* window_bits must be MZ_DEFAULT_WINDOW_BITS (to parse zlib header/footer) or
+ * -MZ_DEFAULT_WINDOW_BITS (raw deflate). */
+MINIZ_EXPORT int mz_inflateInit2(mz_streamp pStream, int window_bits);
 
-// Returns a string description of the specified error code, or NULL if the
-// error code is invalid.
-const char *mz_error(int err);
+/* Quickly resets a compressor without having to reallocate anything. Same as
+ * calling mz_inflateEnd() followed by mz_inflateInit()/mz_inflateInit2(). */
+MINIZ_EXPORT int mz_inflateReset(mz_streamp pStream);
 
-// Redefine zlib-compatible names to miniz equivalents, so miniz.c can be used
-// as a drop-in replacement for the subset of zlib that miniz.c supports. Define
-// MINIZ_NO_ZLIB_COMPATIBLE_NAMES to disable zlib-compatibility if you use zlib
-// in the same project.
+/* Decompresses the input stream to the output, consuming only as much of the
+ * input as needed, and writing as much to the output as possible. */
+/* Parameters: */
+/*   pStream is the stream to read from and write to. You must initialize/update
+ * the next_in, avail_in, next_out, and avail_out members. */
+/*   flush may be MZ_NO_FLUSH, MZ_SYNC_FLUSH, or MZ_FINISH. */
+/*   On the first call, if flush is MZ_FINISH it's assumed the input and output
+ * buffers are both sized large enough to decompress the entire stream in a
+ * single call (this is slightly faster). */
+/*   MZ_FINISH implies that there are no more source bytes available beside
+ * what's already in the input buffer, and that the output buffer is large
+ * enough to hold the rest of the decompressed data. */
+/* Return values: */
+/*   MZ_OK on success. Either more input is needed but not available, and/or
+ * there's more output to be written but the output buffer is full. */
+/*   MZ_STREAM_END if all needed input has been consumed and all output bytes
+ * have been written. For zlib streams, the adler-32 of the decompressed data
+ * has also been verified. */
+/*   MZ_STREAM_ERROR if the stream is bogus. */
+/*   MZ_DATA_ERROR if the deflate stream is invalid. */
+/*   MZ_PARAM_ERROR if one of the parameters is invalid. */
+/*   MZ_BUF_ERROR if no forward progress is possible because the input buffer is
+ * empty but the inflater needs more input to continue, or if the output buffer
+ * is not large enough. Call mz_inflate() again */
+/*   with more input data, or with more room in the output buffer (except when
+ * using single call decompression, described above). */
+MINIZ_EXPORT int mz_inflate(mz_streamp pStream, int flush);
+
+/* Deinitializes a decompressor. */
+MINIZ_EXPORT int mz_inflateEnd(mz_streamp pStream);
+
+/* Single-call decompression. */
+/* Returns MZ_OK on success, or one of the error codes from mz_inflate() on
+ * failure. */
+MINIZ_EXPORT int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len,
+                               const unsigned char *pSource,
+                               mz_ulong source_len);
+MINIZ_EXPORT int mz_uncompress2(unsigned char *pDest, mz_ulong *pDest_len,
+                                const unsigned char *pSource,
+                                mz_ulong *pSource_len);
+#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
+
+/* Returns a string description of the specified error code, or NULL if the
+ * error code is invalid. */
+MINIZ_EXPORT const char *mz_error(int err);
+
+/* Redefine zlib-compatible names to miniz equivalents, so miniz.c can be used
+ * as a drop-in replacement for the subset of zlib that miniz.c supports. */
+/* Define MINIZ_NO_ZLIB_COMPATIBLE_NAMES to disable zlib-compatibility if you
+ * use zlib in the same project. */
 #ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES
 typedef unsigned char Byte;
 typedef unsigned int uInt;
@@ -648,6 +580,8 @@ typedef void *const voidpc;
 #define free_func mz_free_func
 #define internal_state mz_internal_state
 #define z_stream mz_stream
+
+#ifndef MINIZ_NO_DEFLATE_APIS
 #define deflateInit mz_deflateInit
 #define deflateInit2 mz_deflateInit2
 #define deflateReset mz_deflateReset
@@ -657,11 +591,18 @@ typedef void *const voidpc;
 #define compress mz_compress
 #define compress2 mz_compress2
 #define compressBound mz_compressBound
+#endif /*#ifndef MINIZ_NO_DEFLATE_APIS*/
+
+#ifndef MINIZ_NO_INFLATE_APIS
 #define inflateInit mz_inflateInit
 #define inflateInit2 mz_inflateInit2
+#define inflateReset mz_inflateReset
 #define inflate mz_inflate
 #define inflateEnd mz_inflateEnd
 #define uncompress mz_uncompress
+#define uncompress2 mz_uncompress2
+#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
+
 #define crc32 mz_crc32
 #define adler32 mz_adler32
 #define MAX_WBITS 15
@@ -675,466 +616,160 @@ typedef void *const voidpc;
 #define ZLIB_VER_SUBREVISION MZ_VER_SUBREVISION
 #define zlibVersion mz_version
 #define zlib_version mz_version()
-#endif // #ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES
+#endif /* #ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES */
 
-#endif // MINIZ_NO_ZLIB_APIS
+#endif /* MINIZ_NO_ZLIB_APIS */
 
-// ------------------- Types and macros
+#ifdef __cplusplus
+}
+#endif
 
+#pragma once
+#include <assert.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* ------------------- Types and macros */
 typedef unsigned char mz_uint8;
 typedef signed short mz_int16;
 typedef unsigned short mz_uint16;
 typedef unsigned int mz_uint32;
 typedef unsigned int mz_uint;
-typedef long long mz_int64;
-typedef unsigned long long mz_uint64;
+typedef int64_t mz_int64;
+typedef uint64_t mz_uint64;
 typedef int mz_bool;
 
 #define MZ_FALSE (0)
 #define MZ_TRUE (1)
 
-// An attempt to work around MSVC's spammy "warning C4127: conditional
-// expression is constant" message.
+/* Works around MSVC's spammy "warning C4127: conditional expression is
+ * constant" message. */
 #ifdef _MSC_VER
 #define MZ_MACRO_END while (0, 0)
 #else
 #define MZ_MACRO_END while (0)
 #endif
 
-// ------------------- ZIP archive reading/writing
-
-#ifndef MINIZ_NO_ARCHIVE_APIS
-
-enum {
-  MZ_ZIP_MAX_IO_BUF_SIZE = 64 * 1024,
-  MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE = 260,
-  MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE = 256
-};
-
-typedef struct {
-  mz_uint32 m_file_index;
-  mz_uint32 m_central_dir_ofs;
-  mz_uint16 m_version_made_by;
-  mz_uint16 m_version_needed;
-  mz_uint16 m_bit_flag;
-  mz_uint16 m_method;
-#ifndef MINIZ_NO_TIME
-  time_t m_time;
-#endif
-  mz_uint32 m_crc32;
-  mz_uint64 m_comp_size;
-  mz_uint64 m_uncomp_size;
-  mz_uint16 m_internal_attr;
-  mz_uint32 m_external_attr;
-  mz_uint64 m_local_header_ofs;
-  mz_uint32 m_comment_size;
-  char m_filename[MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE];
-  char m_comment[MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE];
-} mz_zip_archive_file_stat;
-
-typedef size_t (*mz_file_read_func)(void *pOpaque, mz_uint64 file_ofs,
-                                    void *pBuf, size_t n);
-typedef size_t (*mz_file_write_func)(void *pOpaque, mz_uint64 file_ofs,
-                                     const void *pBuf, size_t n);
-typedef mz_bool (*mz_file_needs_keepalive)(void *pOpaque);
-
-struct mz_zip_internal_state_tag;
-typedef struct mz_zip_internal_state_tag mz_zip_internal_state;
-
-typedef enum {
-  MZ_ZIP_MODE_INVALID = 0,
-  MZ_ZIP_MODE_READING = 1,
-  MZ_ZIP_MODE_WRITING = 2,
-  MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED = 3
-} mz_zip_mode;
-
-typedef enum {
-  MZ_ZIP_TYPE_INVALID = 0,
-  MZ_ZIP_TYPE_USER,
-  MZ_ZIP_TYPE_MEMORY,
-  MZ_ZIP_TYPE_HEAP,
-  MZ_ZIP_TYPE_FILE,
-  MZ_ZIP_TYPE_CFILE,
-  MZ_ZIP_TOTAL_TYPES
-} mz_zip_type;
-
-typedef struct {
-  mz_uint64 m_archive_size;
-  mz_uint64 m_central_directory_file_ofs;
-
-  /* We only support up to UINT32_MAX files in zip64 mode. */
-  mz_uint32 m_total_files;
-  mz_zip_mode m_zip_mode;
-  mz_zip_type m_zip_type;
-  mz_zip_error m_last_error;
-
-  mz_uint64 m_file_offset_alignment;
-
-  mz_alloc_func m_pAlloc;
-  mz_free_func m_pFree;
-  mz_realloc_func m_pRealloc;
-  void *m_pAlloc_opaque;
-
-  mz_file_read_func m_pRead;
-  mz_file_write_func m_pWrite;
-  mz_file_needs_keepalive m_pNeeds_keepalive;
-  void *m_pIO_opaque;
-
-  mz_zip_internal_state *m_pState;
-
-} mz_zip_archive;
-
-typedef enum {
-  MZ_ZIP_FLAG_CASE_SENSITIVE = 0x0100,
-  MZ_ZIP_FLAG_IGNORE_PATH = 0x0200,
-  MZ_ZIP_FLAG_COMPRESSED_DATA = 0x0400,
-  MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY = 0x0800
-} mz_zip_flags;
-
-// ZIP archive reading
-
-// Inits a ZIP archive reader.
-// These functions read and validate the archive's central directory.
-mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size,
-                           mz_uint32 flags);
-mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, const void *pMem,
-                               size_t size, mz_uint32 flags);
-
-#ifndef MINIZ_NO_STDIO
-mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, const char *pFilename,
-                                mz_uint32 flags);
-#endif
-
-// Returns the total number of files in the archive.
-mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip);
-
-// Returns detailed information about an archive file entry.
-mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index,
-                                mz_zip_archive_file_stat *pStat);
-
-// Determines if an archive file entry is a directory entry.
-mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip,
-                                          mz_uint file_index);
-mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip,
-                                        mz_uint file_index);
-
-// Retrieves the filename of an archive file entry.
-// Returns the number of bytes written to pFilename, or if filename_buf_size is
-// 0 this function returns the number of bytes needed to fully store the
-// filename.
-mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index,
-                                   char *pFilename, mz_uint filename_buf_size);
-
-// Attempts to locates a file in the archive's central directory.
-// Valid flags: MZ_ZIP_FLAG_CASE_SENSITIVE, MZ_ZIP_FLAG_IGNORE_PATH
-// Returns -1 if the file cannot be found.
-int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName,
-                              const char *pComment, mz_uint flags);
-
-// Extracts a archive file to a memory buffer using no memory allocation.
-mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip,
-                                              mz_uint file_index, void *pBuf,
-                                              size_t buf_size, mz_uint flags,
-                                              void *pUser_read_buf,
-                                              size_t user_read_buf_size);
-mz_bool mz_zip_reader_extract_file_to_mem_no_alloc(
-    mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size,
-    mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size);
-
-// Extracts a archive file to a memory buffer.
-mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip, mz_uint file_index,
-                                     void *pBuf, size_t buf_size,
-                                     mz_uint flags);
-mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip,
-                                          const char *pFilename, void *pBuf,
-                                          size_t buf_size, mz_uint flags);
-
-// Extracts a archive file to a dynamically allocated heap buffer.
-void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index,
-                                    size_t *pSize, mz_uint flags);
-void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip,
-                                         const char *pFilename, size_t *pSize,
-                                         mz_uint flags);
-
-// Extracts a archive file using a callback function to output the file's data.
-mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip,
-                                          mz_uint file_index,
-                                          mz_file_write_func pCallback,
-                                          void *pOpaque, mz_uint flags);
-mz_bool mz_zip_reader_extract_file_to_callback(mz_zip_archive *pZip,
-                                               const char *pFilename,
-                                               mz_file_write_func pCallback,
-                                               void *pOpaque, mz_uint flags);
-
-#ifndef MINIZ_NO_STDIO
-// Extracts a archive file to a disk file and sets its last accessed and
-// modified times. This function only extracts files, not archive directory
-// records.
-mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip, mz_uint file_index,
-                                      const char *pDst_filename, mz_uint flags);
-mz_bool mz_zip_reader_extract_file_to_file(mz_zip_archive *pZip,
-                                           const char *pArchive_filename,
-                                           const char *pDst_filename,
-                                           mz_uint flags);
-#endif
-
-// Ends archive reading, freeing all allocations, and closing the input archive
-// file if mz_zip_reader_init_file() was used.
-mz_bool mz_zip_reader_end(mz_zip_archive *pZip);
-
-// ZIP archive writing
-
-#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
-
-// Inits a ZIP archive writer.
-mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size);
-mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip,
-                                size_t size_to_reserve_at_beginning,
-                                size_t initial_allocation_size);
-
-#ifndef MINIZ_NO_STDIO
-mz_bool mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename,
-                                mz_uint64 size_to_reserve_at_beginning);
-#endif
-
-// Converts a ZIP archive reader object into a writer object, to allow efficient
-// in-place file appends to occur on an existing archive. For archives opened
-// using mz_zip_reader_init_file, pFilename must be the archive's filename so it
-// can be reopened for writing. If the file can't be reopened,
-// mz_zip_reader_end() will be called. For archives opened using
-// mz_zip_reader_init_mem, the memory block must be growable using the realloc
-// callback (which defaults to realloc unless you've overridden it). Finally,
-// for archives opened using mz_zip_reader_init, the mz_zip_archive's user
-// provided m_pWrite function cannot be NULL. Note: In-place archive
-// modification is not recommended unless you know what you're doing, because if
-// execution stops or something goes wrong before the archive is finalized the
-// file's central directory will be hosed.
-mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip,
-                                       const char *pFilename);
-
-// Adds the contents of a memory buffer to an archive. These functions record
-// the current local time into the archive. To add a directory entry, call this
-// method with an archive name ending in a forwardslash with empty buffer.
-// level_and_flags - compression level (0-10, see MZ_BEST_SPEED,
-// MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or
-// just set to MZ_DEFAULT_COMPRESSION.
-mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip, const char *pArchive_name,
-                              const void *pBuf, size_t buf_size,
-                              mz_uint level_and_flags);
-mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip,
-                                 const char *pArchive_name, const void *pBuf,
-                                 size_t buf_size, const void *pComment,
-                                 mz_uint16 comment_size,
-                                 mz_uint level_and_flags, mz_uint64 uncomp_size,
-                                 mz_uint32 uncomp_crc32);
-
-#ifndef MINIZ_NO_STDIO
-// Adds the contents of a disk file to an archive. This function also records
-// the disk file's modified time into the archive. level_and_flags - compression
-// level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd
-// with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION.
-mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
-                               const char *pSrc_filename, const void *pComment,
-                               mz_uint16 comment_size, mz_uint level_and_flags,
-                               mz_uint32 ext_attributes);
-#endif
-
-// Adds a file to an archive by fully cloning the data from another archive.
-// This function fully clones the source file's compressed data (no
-// recompression), along with its full filename, extra data, and comment fields.
-mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip,
-                                          mz_zip_archive *pSource_zip,
-                                          mz_uint file_index);
-
-// Finalizes the archive by writing the central directory records followed by
-// the end of central directory record. After an archive is finalized, the only
-// valid call on the mz_zip_archive struct is mz_zip_writer_end(). An archive
-// must be manually finalized by calling this function for it to be valid.
-mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip);
-mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **pBuf,
-                                            size_t *pSize);
-
-// Ends archive writing, freeing all allocations, and closing the output file if
-// mz_zip_writer_init_file() was used. Note for the archive to be valid, it must
-// have been finalized before ending.
-mz_bool mz_zip_writer_end(mz_zip_archive *pZip);
-
-// Misc. high-level helper functions:
-
-// mz_zip_add_mem_to_archive_file_in_place() efficiently (but not atomically)
-// appends a memory blob to a ZIP archive. level_and_flags - compression level
-// (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero
-// or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION.
-mz_bool mz_zip_add_mem_to_archive_file_in_place(
-    const char *pZip_filename, const char *pArchive_name, const void *pBuf,
-    size_t buf_size, const void *pComment, mz_uint16 comment_size,
-    mz_uint level_and_flags);
-
-// Reads a single file from an archive into a heap block.
-// Returns NULL on failure.
-void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename,
-                                          const char *pArchive_name,
-                                          size_t *pSize, mz_uint zip_flags);
-
-#endif // #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
-
-#endif // #ifndef MINIZ_NO_ARCHIVE_APIS
-
-// ------------------- Low-level Decompression API Definitions
-
-// Decompression flags used by tinfl_decompress().
-// TINFL_FLAG_PARSE_ZLIB_HEADER: If set, the input has a valid zlib header and
-// ends with an adler32 checksum (it's a valid zlib stream). Otherwise, the
-// input is a raw deflate stream. TINFL_FLAG_HAS_MORE_INPUT: If set, there are
-// more input bytes available beyond the end of the supplied input buffer. If
-// clear, the input buffer contains all remaining input.
-// TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF: If set, the output buffer is large
-// enough to hold the entire decompressed stream. If clear, the output buffer is
-// at least the size of the dictionary (typically 32KB).
-// TINFL_FLAG_COMPUTE_ADLER32: Force adler-32 checksum computation of the
-// decompressed bytes.
-enum {
-  TINFL_FLAG_PARSE_ZLIB_HEADER = 1,
-  TINFL_FLAG_HAS_MORE_INPUT = 2,
-  TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF = 4,
-  TINFL_FLAG_COMPUTE_ADLER32 = 8
-};
-
-// High level decompression functions:
-// tinfl_decompress_mem_to_heap() decompresses a block in memory to a heap block
-// allocated via malloc(). On entry:
-//  pSrc_buf, src_buf_len: Pointer and size of the Deflate or zlib source data
-//  to decompress.
-// On return:
-//  Function returns a pointer to the decompressed data, or NULL on failure.
-//  *pOut_len will be set to the decompressed data's size, which could be larger
-//  than src_buf_len on uncompressible data. The caller must call mz_free() on
-//  the returned block when it's no longer needed.
-void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len,
-                                   size_t *pOut_len, int flags);
-
-// tinfl_decompress_mem_to_mem() decompresses a block in memory to another block
-// in memory. Returns TINFL_DECOMPRESS_MEM_TO_MEM_FAILED on failure, or the
-// number of bytes written on success.
-#define TINFL_DECOMPRESS_MEM_TO_MEM_FAILED ((size_t)(-1))
-size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len,
-                                   const void *pSrc_buf, size_t src_buf_len,
-                                   int flags);
-
-// tinfl_decompress_mem_to_callback() decompresses a block in memory to an
-// internal 32KB buffer, and a user provided callback function will be called to
-// flush the buffer. Returns 1 on success or 0 on failure.
-typedef int (*tinfl_put_buf_func_ptr)(const void *pBuf, int len, void *pUser);
-int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size,
-                                     tinfl_put_buf_func_ptr pPut_buf_func,
-                                     void *pPut_buf_user, int flags);
-
-struct tinfl_decompressor_tag;
-typedef struct tinfl_decompressor_tag tinfl_decompressor;
-
-// Max size of LZ dictionary.
-#define TINFL_LZ_DICT_SIZE 32768
-
-// Return status.
-typedef enum {
-  TINFL_STATUS_BAD_PARAM = -3,
-  TINFL_STATUS_ADLER32_MISMATCH = -2,
-  TINFL_STATUS_FAILED = -1,
-  TINFL_STATUS_DONE = 0,
-  TINFL_STATUS_NEEDS_MORE_INPUT = 1,
-  TINFL_STATUS_HAS_MORE_OUTPUT = 2
-} tinfl_status;
-
-// Initializes the decompressor to its initial state.
-#define tinfl_init(r)                                                          \
-  do {                                                                         \
-    (r)->m_state = 0;                                                          \
-  }                                                                            \
-  MZ_MACRO_END
-#define tinfl_get_adler32(r) (r)->m_check_adler32
-
-// Main low-level decompressor coroutine function. This is the only function
-// actually needed for decompression. All the other functions are just
-// high-level helpers for improved usability. This is a universal API, i.e. it
-// can be used as a building block to build any desired higher level
-// decompression API. In the limit case, it can be called once per every byte
-// input or output.
-tinfl_status tinfl_decompress(tinfl_decompressor *r,
-                              const mz_uint8 *pIn_buf_next,
-                              size_t *pIn_buf_size, mz_uint8 *pOut_buf_start,
-                              mz_uint8 *pOut_buf_next, size_t *pOut_buf_size,
-                              const mz_uint32 decomp_flags);
-
-// Internal/private bits follow.
-enum {
-  TINFL_MAX_HUFF_TABLES = 3,
-  TINFL_MAX_HUFF_SYMBOLS_0 = 288,
-  TINFL_MAX_HUFF_SYMBOLS_1 = 32,
-  TINFL_MAX_HUFF_SYMBOLS_2 = 19,
-  TINFL_FAST_LOOKUP_BITS = 10,
-  TINFL_FAST_LOOKUP_SIZE = 1 << TINFL_FAST_LOOKUP_BITS
-};
-
-typedef struct {
-  mz_uint8 m_code_size[TINFL_MAX_HUFF_SYMBOLS_0];
-  mz_int16 m_look_up[TINFL_FAST_LOOKUP_SIZE],
-      m_tree[TINFL_MAX_HUFF_SYMBOLS_0 * 2];
-} tinfl_huff_table;
-
-#if MINIZ_HAS_64BIT_REGISTERS
-#define TINFL_USE_64BIT_BITBUF 1
-#endif
-
-#if TINFL_USE_64BIT_BITBUF
-typedef mz_uint64 tinfl_bit_buf_t;
-#define TINFL_BITBUF_SIZE (64)
+#ifdef MINIZ_NO_STDIO
+#define MZ_FILE void *
 #else
-typedef mz_uint32 tinfl_bit_buf_t;
-#define TINFL_BITBUF_SIZE (32)
+#include <stdio.h>
+#define MZ_FILE FILE
+#endif /* #ifdef MINIZ_NO_STDIO */
+
+#ifdef MINIZ_NO_TIME
+typedef struct mz_dummy_time_t_tag {
+  mz_uint32 m_dummy1;
+  mz_uint32 m_dummy2;
+} mz_dummy_time_t;
+#define MZ_TIME_T mz_dummy_time_t
+#else
+#define MZ_TIME_T time_t
 #endif
 
-struct tinfl_decompressor_tag {
-  mz_uint32 m_state, m_num_bits, m_zhdr0, m_zhdr1, m_z_adler32, m_final, m_type,
-      m_check_adler32, m_dist, m_counter, m_num_extra,
-      m_table_sizes[TINFL_MAX_HUFF_TABLES];
-  tinfl_bit_buf_t m_bit_buf;
-  size_t m_dist_from_out_buf_start;
-  tinfl_huff_table m_tables[TINFL_MAX_HUFF_TABLES];
-  mz_uint8 m_raw_header[4],
-      m_len_codes[TINFL_MAX_HUFF_SYMBOLS_0 + TINFL_MAX_HUFF_SYMBOLS_1 + 137];
-};
+#define MZ_ASSERT(x) assert(x)
 
-// ------------------- Low-level Compression API Definitions
+#ifdef MINIZ_NO_MALLOC
+#define MZ_MALLOC(x) NULL
+#define MZ_FREE(x) (void)x, ((void)0)
+#define MZ_REALLOC(p, x) NULL
+#else
+#define MZ_MALLOC(x) malloc(x)
+#define MZ_FREE(x) free(x)
+#define MZ_REALLOC(p, x) realloc(p, x)
+#endif
 
-// Set TDEFL_LESS_MEMORY to 1 to use less memory (compression will be slightly
-// slower, and raw/dynamic blocks will be output more frequently).
+#define MZ_MAX(a, b) (((a) > (b)) ? (a) : (b))
+#define MZ_MIN(a, b) (((a) < (b)) ? (a) : (b))
+#define MZ_CLEAR_OBJ(obj) memset(&(obj), 0, sizeof(obj))
+#define MZ_CLEAR_ARR(obj) memset((obj), 0, sizeof(obj))
+#define MZ_CLEAR_PTR(obj) memset((obj), 0, sizeof(*obj))
+
+#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
+#define MZ_READ_LE16(p) *((const mz_uint16 *)(p))
+#define MZ_READ_LE32(p) *((const mz_uint32 *)(p))
+#else
+#define MZ_READ_LE16(p)                                                        \
+  ((mz_uint32)(((const mz_uint8 *)(p))[0]) |                                   \
+   ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U))
+#define MZ_READ_LE32(p)                                                        \
+  ((mz_uint32)(((const mz_uint8 *)(p))[0]) |                                   \
+   ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U) |                           \
+   ((mz_uint32)(((const mz_uint8 *)(p))[2]) << 16U) |                          \
+   ((mz_uint32)(((const mz_uint8 *)(p))[3]) << 24U))
+#endif
+
+#define MZ_READ_LE64(p)                                                        \
+  (((mz_uint64)MZ_READ_LE32(p)) |                                              \
+   (((mz_uint64)MZ_READ_LE32((const mz_uint8 *)(p) + sizeof(mz_uint32)))       \
+    << 32U))
+
+#ifdef _MSC_VER
+#define MZ_FORCEINLINE __forceinline
+#elif defined(__GNUC__)
+#define MZ_FORCEINLINE __inline__ __attribute__((__always_inline__))
+#else
+#define MZ_FORCEINLINE inline
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern MINIZ_EXPORT void *miniz_def_alloc_func(void *opaque, size_t items,
+                                               size_t size);
+extern MINIZ_EXPORT void miniz_def_free_func(void *opaque, void *address);
+extern MINIZ_EXPORT void *miniz_def_realloc_func(void *opaque, void *address,
+                                                 size_t items, size_t size);
+
+#define MZ_UINT16_MAX (0xFFFFU)
+#define MZ_UINT32_MAX (0xFFFFFFFFU)
+
+#ifdef __cplusplus
+}
+#endif
+#pragma once
+
+#ifndef MINIZ_NO_DEFLATE_APIS
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* ------------------- Low-level Compression API Definitions */
+
+/* Set TDEFL_LESS_MEMORY to 1 to use less memory (compression will be slightly
+ * slower, and raw/dynamic blocks will be output more frequently). */
 #define TDEFL_LESS_MEMORY 0
 
-// tdefl_init() compression flags logically OR'd together (low 12 bits contain
-// the max. number of probes per dictionary search): TDEFL_DEFAULT_MAX_PROBES:
-// The compressor defaults to 128 dictionary probes per dictionary search.
-// 0=Huffman only, 1=Huffman+LZ (fastest/crap compression), 4095=Huffman+LZ
-// (slowest/best compression).
+/* tdefl_init() compression flags logically OR'd together (low 12 bits contain
+ * the max. number of probes per dictionary search): */
+/* TDEFL_DEFAULT_MAX_PROBES: The compressor defaults to 128 dictionary probes
+ * per dictionary search. 0=Huffman only, 1=Huffman+LZ (fastest/crap
+ * compression), 4095=Huffman+LZ (slowest/best compression). */
 enum {
   TDEFL_HUFFMAN_ONLY = 0,
   TDEFL_DEFAULT_MAX_PROBES = 128,
   TDEFL_MAX_PROBES_MASK = 0xFFF
 };
 
-// TDEFL_WRITE_ZLIB_HEADER: If set, the compressor outputs a zlib header before
-// the deflate data, and the Adler-32 of the source data at the end. Otherwise,
-// you'll get raw deflate data. TDEFL_COMPUTE_ADLER32: Always compute the
-// adler-32 of the input data (even when not writing zlib headers).
-// TDEFL_GREEDY_PARSING_FLAG: Set to use faster greedy parsing, instead of more
-// efficient lazy parsing. TDEFL_NONDETERMINISTIC_PARSING_FLAG: Enable to
-// decrease the compressor's initialization time to the minimum, but the output
-// may vary from run to run given the same input (depending on the contents of
-// memory). TDEFL_RLE_MATCHES: Only look for RLE matches (matches with a
-// distance of 1) TDEFL_FILTER_MATCHES: Discards matches <= 5 chars if enabled.
-// TDEFL_FORCE_ALL_STATIC_BLOCKS: Disable usage of optimized Huffman tables.
-// TDEFL_FORCE_ALL_RAW_BLOCKS: Only use raw (uncompressed) deflate blocks.
-// The low 12 bits are reserved to control the max # of hash probes per
-// dictionary lookup (see TDEFL_MAX_PROBES_MASK).
+/* TDEFL_WRITE_ZLIB_HEADER: If set, the compressor outputs a zlib header before
+ * the deflate data, and the Adler-32 of the source data at the end. Otherwise,
+ * you'll get raw deflate data. */
+/* TDEFL_COMPUTE_ADLER32: Always compute the adler-32 of the input data (even
+ * when not writing zlib headers). */
+/* TDEFL_GREEDY_PARSING_FLAG: Set to use faster greedy parsing, instead of more
+ * efficient lazy parsing. */
+/* TDEFL_NONDETERMINISTIC_PARSING_FLAG: Enable to decrease the compressor's
+ * initialization time to the minimum, but the output may vary from run to run
+ * given the same input (depending on the contents of memory). */
+/* TDEFL_RLE_MATCHES: Only look for RLE matches (matches with a distance of 1)
+ */
+/* TDEFL_FILTER_MATCHES: Discards matches <= 5 chars if enabled. */
+/* TDEFL_FORCE_ALL_STATIC_BLOCKS: Disable usage of optimized Huffman tables. */
+/* TDEFL_FORCE_ALL_RAW_BLOCKS: Only use raw (uncompressed) deflate blocks. */
+/* The low 12 bits are reserved to control the max # of hash probes per
+ * dictionary lookup (see TDEFL_MAX_PROBES_MASK). */
 enum {
   TDEFL_WRITE_ZLIB_HEADER = 0x01000,
   TDEFL_COMPUTE_ADLER32 = 0x02000,
@@ -1146,56 +781,64 @@ enum {
   TDEFL_FORCE_ALL_RAW_BLOCKS = 0x80000
 };
 
-// High level compression functions:
-// tdefl_compress_mem_to_heap() compresses a block in memory to a heap block
-// allocated via malloc(). On entry:
-//  pSrc_buf, src_buf_len: Pointer and size of source block to compress.
-//  flags: The max match finder probes (default is 128) logically OR'd against
-//  the above flags. Higher probes are slower but improve compression.
-// On return:
-//  Function returns a pointer to the compressed data, or NULL on failure.
-//  *pOut_len will be set to the compressed data's size, which could be larger
-//  than src_buf_len on uncompressible data. The caller must free() the returned
-//  block when it's no longer needed.
-void *tdefl_compress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len,
-                                 size_t *pOut_len, int flags);
+/* High level compression functions: */
+/* tdefl_compress_mem_to_heap() compresses a block in memory to a heap block
+ * allocated via malloc(). */
+/* On entry: */
+/*  pSrc_buf, src_buf_len: Pointer and size of source block to compress. */
+/*  flags: The max match finder probes (default is 128) logically OR'd against
+ * the above flags. Higher probes are slower but improve compression. */
+/* On return: */
+/*  Function returns a pointer to the compressed data, or NULL on failure. */
+/*  *pOut_len will be set to the compressed data's size, which could be larger
+ * than src_buf_len on uncompressible data. */
+/*  The caller must free() the returned block when it's no longer needed. */
+MINIZ_EXPORT void *tdefl_compress_mem_to_heap(const void *pSrc_buf,
+                                              size_t src_buf_len,
+                                              size_t *pOut_len, int flags);
 
-// tdefl_compress_mem_to_mem() compresses a block in memory to another block in
-// memory. Returns 0 on failure.
-size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len,
-                                 const void *pSrc_buf, size_t src_buf_len,
-                                 int flags);
+/* tdefl_compress_mem_to_mem() compresses a block in memory to another block in
+ * memory. */
+/* Returns 0 on failure. */
+MINIZ_EXPORT size_t tdefl_compress_mem_to_mem(void *pOut_buf,
+                                              size_t out_buf_len,
+                                              const void *pSrc_buf,
+                                              size_t src_buf_len, int flags);
 
-// Compresses an image to a compressed PNG file in memory.
-// On entry:
-//  pImage, w, h, and num_chans describe the image to compress. num_chans may be
-//  1, 2, 3, or 4. The image pitch in bytes per scanline will be w*num_chans.
-//  The leftmost pixel on the top scanline is stored first in memory. level may
-//  range from [0,10], use MZ_NO_COMPRESSION, MZ_BEST_SPEED,
-//  MZ_BEST_COMPRESSION, etc. or a decent default is MZ_DEFAULT_LEVEL If flip is
-//  true, the image will be flipped on the Y axis (useful for OpenGL apps).
-// On return:
-//  Function returns a pointer to the compressed data, or NULL on failure.
-//  *pLen_out will be set to the size of the PNG image file.
-//  The caller must mz_free() the returned heap block (which will typically be
-//  larger than *pLen_out) when it's no longer needed.
-void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w,
-                                                 int h, int num_chans,
-                                                 size_t *pLen_out,
-                                                 mz_uint level, mz_bool flip);
-void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h,
-                                              int num_chans, size_t *pLen_out);
+/* Compresses an image to a compressed PNG file in memory. */
+/* On entry: */
+/*  pImage, w, h, and num_chans describe the image to compress. num_chans may be
+ * 1, 2, 3, or 4. */
+/*  The image pitch in bytes per scanline will be w*num_chans. The leftmost
+ * pixel on the top scanline is stored first in memory. */
+/*  level may range from [0,10], use MZ_NO_COMPRESSION, MZ_BEST_SPEED,
+ * MZ_BEST_COMPRESSION, etc. or a decent default is MZ_DEFAULT_LEVEL */
+/*  If flip is true, the image will be flipped on the Y axis (useful for OpenGL
+ * apps). */
+/* On return: */
+/*  Function returns a pointer to the compressed data, or NULL on failure. */
+/*  *pLen_out will be set to the size of the PNG image file. */
+/*  The caller must mz_free() the returned heap block (which will typically be
+ * larger than *pLen_out) when it's no longer needed. */
+MINIZ_EXPORT void *
+tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int h,
+                                           int num_chans, size_t *pLen_out,
+                                           mz_uint level, mz_bool flip);
+MINIZ_EXPORT void *tdefl_write_image_to_png_file_in_memory(const void *pImage,
+                                                           int w, int h,
+                                                           int num_chans,
+                                                           size_t *pLen_out);
 
-// Output stream interface. The compressor uses this interface to write
-// compressed data. It'll typically be called TDEFL_OUT_BUF_SIZE at a time.
+/* Output stream interface. The compressor uses this interface to write
+ * compressed data. It'll typically be called TDEFL_OUT_BUF_SIZE at a time. */
 typedef mz_bool (*tdefl_put_buf_func_ptr)(const void *pBuf, int len,
                                           void *pUser);
 
-// tdefl_compress_mem_to_output() compresses a block to an output stream. The
-// above helpers use this function internally.
-mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len,
-                                     tdefl_put_buf_func_ptr pPut_buf_func,
-                                     void *pPut_buf_user, int flags);
+/* tdefl_compress_mem_to_output() compresses a block to an output stream. The
+ * above helpers use this function internally. */
+MINIZ_EXPORT mz_bool tdefl_compress_mem_to_output(
+    const void *pBuf, size_t buf_len, tdefl_put_buf_func_ptr pPut_buf_func,
+    void *pPut_buf_user, int flags);
 
 enum {
   TDEFL_MAX_HUFF_TABLES = 3,
@@ -1208,8 +851,8 @@ enum {
   TDEFL_MAX_MATCH_LEN = 258
 };
 
-// TDEFL_OUT_BUF_SIZE MUST be large enough to hold a single entire compressed
-// output block (using static/fixed Huffman codes).
+/* TDEFL_OUT_BUF_SIZE MUST be large enough to hold a single entire compressed
+ * output block (using static/fixed Huffman codes). */
 #if TDEFL_LESS_MEMORY
 enum {
   TDEFL_LZ_CODE_BUF_SIZE = 24 * 1024,
@@ -1232,17 +875,17 @@ enum {
 };
 #endif
 
-// The low-level tdefl functions below may be used directly if the above helper
-// functions aren't flexible enough. The low-level functions don't make any heap
-// allocations, unlike the above helper functions.
+/* The low-level tdefl functions below may be used directly if the above helper
+ * functions aren't flexible enough. The low-level functions don't make any heap
+ * allocations, unlike the above helper functions. */
 typedef enum {
   TDEFL_STATUS_BAD_PARAM = -2,
   TDEFL_STATUS_PUT_BUF_FAILED = -1,
   TDEFL_STATUS_OKAY = 0,
-  TDEFL_STATUS_DONE = 1,
+  TDEFL_STATUS_DONE = 1
 } tdefl_status;
 
-// Must map to MZ_NO_FLUSH, MZ_SYNC_FLUSH, etc. enums
+/* Must map to MZ_NO_FLUSH, MZ_SYNC_FLUSH, etc. enums */
 typedef enum {
   TDEFL_NO_FLUSH = 0,
   TDEFL_SYNC_FLUSH = 2,
@@ -1250,7 +893,7 @@ typedef enum {
   TDEFL_FINISH = 4
 } tdefl_flush;
 
-// tdefl's compression state structure.
+/* tdefl's compression state structure. */
 typedef struct {
   tdefl_put_buf_func_ptr m_pPut_buf_func;
   void *m_pPut_buf_user;
@@ -1280,114 +923,950 @@ typedef struct {
   mz_uint8 m_output_buf[TDEFL_OUT_BUF_SIZE];
 } tdefl_compressor;
 
-// Initializes the compressor.
-// There is no corresponding deinit() function because the tdefl API's do not
-// dynamically allocate memory. pBut_buf_func: If NULL, output data will be
-// supplied to the specified callback. In this case, the user should call the
-// tdefl_compress_buffer() API for compression. If pBut_buf_func is NULL the
-// user should always call the tdefl_compress() API. flags: See the above enums
-// (TDEFL_HUFFMAN_ONLY, TDEFL_WRITE_ZLIB_HEADER, etc.)
-tdefl_status tdefl_init(tdefl_compressor *d,
-                        tdefl_put_buf_func_ptr pPut_buf_func,
-                        void *pPut_buf_user, int flags);
+/* Initializes the compressor. */
+/* There is no corresponding deinit() function because the tdefl API's do not
+ * dynamically allocate memory. */
+/* pBut_buf_func: If NULL, output data will be supplied to the specified
+ * callback. In this case, the user should call the tdefl_compress_buffer() API
+ * for compression. */
+/* If pBut_buf_func is NULL the user should always call the tdefl_compress()
+ * API. */
+/* flags: See the above enums (TDEFL_HUFFMAN_ONLY, TDEFL_WRITE_ZLIB_HEADER,
+ * etc.) */
+MINIZ_EXPORT tdefl_status tdefl_init(tdefl_compressor *d,
+                                     tdefl_put_buf_func_ptr pPut_buf_func,
+                                     void *pPut_buf_user, int flags);
 
-// Compresses a block of data, consuming as much of the specified input buffer
-// as possible, and writing as much compressed data to the specified output
-// buffer as possible.
-tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf,
-                            size_t *pIn_buf_size, void *pOut_buf,
-                            size_t *pOut_buf_size, tdefl_flush flush);
+/* Compresses a block of data, consuming as much of the specified input buffer
+ * as possible, and writing as much compressed data to the specified output
+ * buffer as possible. */
+MINIZ_EXPORT tdefl_status tdefl_compress(tdefl_compressor *d,
+                                         const void *pIn_buf,
+                                         size_t *pIn_buf_size, void *pOut_buf,
+                                         size_t *pOut_buf_size,
+                                         tdefl_flush flush);
 
-// tdefl_compress_buffer() is only usable when the tdefl_init() is called with a
-// non-NULL tdefl_put_buf_func_ptr. tdefl_compress_buffer() always consumes the
-// entire input buffer.
-tdefl_status tdefl_compress_buffer(tdefl_compressor *d, const void *pIn_buf,
-                                   size_t in_buf_size, tdefl_flush flush);
+/* tdefl_compress_buffer() is only usable when the tdefl_init() is called with a
+ * non-NULL tdefl_put_buf_func_ptr. */
+/* tdefl_compress_buffer() always consumes the entire input buffer. */
+MINIZ_EXPORT tdefl_status tdefl_compress_buffer(tdefl_compressor *d,
+                                                const void *pIn_buf,
+                                                size_t in_buf_size,
+                                                tdefl_flush flush);
 
-tdefl_status tdefl_get_prev_return_status(tdefl_compressor *d);
-mz_uint32 tdefl_get_adler32(tdefl_compressor *d);
+MINIZ_EXPORT tdefl_status tdefl_get_prev_return_status(tdefl_compressor *d);
+MINIZ_EXPORT mz_uint32 tdefl_get_adler32(tdefl_compressor *d);
 
-// Can't use tdefl_create_comp_flags_from_zip_params if MINIZ_NO_ZLIB_APIS isn't
-// defined, because it uses some of its macros.
-#ifndef MINIZ_NO_ZLIB_APIS
-// Create tdefl_compress() flags given zlib-style compression parameters.
-// level may range from [0,10] (where 10 is absolute max compression, but may be
-// much slower on some files) window_bits may be -15 (raw deflate) or 15 (zlib)
-// strategy may be either MZ_DEFAULT_STRATEGY, MZ_FILTERED, MZ_HUFFMAN_ONLY,
-// MZ_RLE, or MZ_FIXED
-mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits,
-                                                int strategy);
-#endif // #ifndef MINIZ_NO_ZLIB_APIS
+/* Create tdefl_compress() flags given zlib-style compression parameters. */
+/* level may range from [0,10] (where 10 is absolute max compression, but may be
+ * much slower on some files) */
+/* window_bits may be -15 (raw deflate) or 15 (zlib) */
+/* strategy may be either MZ_DEFAULT_STRATEGY, MZ_FILTERED, MZ_HUFFMAN_ONLY,
+ * MZ_RLE, or MZ_FIXED */
+MINIZ_EXPORT mz_uint tdefl_create_comp_flags_from_zip_params(int level,
+                                                             int window_bits,
+                                                             int strategy);
 
-#define MZ_UINT16_MAX (0xFFFFU)
-#define MZ_UINT32_MAX (0xFFFFFFFFU)
+#ifndef MINIZ_NO_MALLOC
+/* Allocate the tdefl_compressor structure in C so that */
+/* non-C language bindings to tdefl_ API don't need to worry about */
+/* structure size and allocation mechanism. */
+MINIZ_EXPORT tdefl_compressor *tdefl_compressor_alloc(void);
+MINIZ_EXPORT void tdefl_compressor_free(tdefl_compressor *pComp);
+#endif
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif // MINIZ_HEADER_INCLUDED
+#endif /*#ifndef MINIZ_NO_DEFLATE_APIS*/
+#pragma once
 
-// ------------------- End of Header: Implementation follows. (If you only want
-// the header, define MINIZ_HEADER_FILE_ONLY.)
+/* ------------------- Low-level Decompression API Definitions */
 
-#ifndef MINIZ_HEADER_FILE_ONLY
+#ifndef MINIZ_NO_INFLATE_APIS
 
-typedef unsigned char mz_validate_uint16[sizeof(mz_uint16) == 2 ? 1 : -1];
-typedef unsigned char mz_validate_uint32[sizeof(mz_uint32) == 4 ? 1 : -1];
-typedef unsigned char mz_validate_uint64[sizeof(mz_uint64) == 8 ? 1 : -1];
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Decompression flags used by tinfl_decompress(). */
+/* TINFL_FLAG_PARSE_ZLIB_HEADER: If set, the input has a valid zlib header and
+ * ends with an adler32 checksum (it's a valid zlib stream). Otherwise, the
+ * input is a raw deflate stream. */
+/* TINFL_FLAG_HAS_MORE_INPUT: If set, there are more input bytes available
+ * beyond the end of the supplied input buffer. If clear, the input buffer
+ * contains all remaining input. */
+/* TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF: If set, the output buffer is large
+ * enough to hold the entire decompressed stream. If clear, the output buffer is
+ * at least the size of the dictionary (typically 32KB). */
+/* TINFL_FLAG_COMPUTE_ADLER32: Force adler-32 checksum computation of the
+ * decompressed bytes. */
+enum {
+  TINFL_FLAG_PARSE_ZLIB_HEADER = 1,
+  TINFL_FLAG_HAS_MORE_INPUT = 2,
+  TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF = 4,
+  TINFL_FLAG_COMPUTE_ADLER32 = 8
+};
 
-#include <assert.h>
-#include <string.h>
+/* High level decompression functions: */
+/* tinfl_decompress_mem_to_heap() decompresses a block in memory to a heap block
+ * allocated via malloc(). */
+/* On entry: */
+/*  pSrc_buf, src_buf_len: Pointer and size of the Deflate or zlib source data
+ * to decompress. */
+/* On return: */
+/*  Function returns a pointer to the decompressed data, or NULL on failure. */
+/*  *pOut_len will be set to the decompressed data's size, which could be larger
+ * than src_buf_len on uncompressible data. */
+/*  The caller must call mz_free() on the returned block when it's no longer
+ * needed. */
+MINIZ_EXPORT void *tinfl_decompress_mem_to_heap(const void *pSrc_buf,
+                                                size_t src_buf_len,
+                                                size_t *pOut_len, int flags);
 
-#define MZ_ASSERT(x) assert(x)
+/* tinfl_decompress_mem_to_mem() decompresses a block in memory to another block
+ * in memory. */
+/* Returns TINFL_DECOMPRESS_MEM_TO_MEM_FAILED on failure, or the number of bytes
+ * written on success. */
+#define TINFL_DECOMPRESS_MEM_TO_MEM_FAILED ((size_t)(-1))
+MINIZ_EXPORT size_t tinfl_decompress_mem_to_mem(void *pOut_buf,
+                                                size_t out_buf_len,
+                                                const void *pSrc_buf,
+                                                size_t src_buf_len, int flags);
 
-#ifdef MINIZ_NO_MALLOC
-#define MZ_MALLOC(x) NULL
-#define MZ_FREE(x) (void)x, ((void)0)
-#define MZ_REALLOC(p, x) NULL
-#else
-#define MZ_MALLOC(x) malloc(x)
-#define MZ_FREE(x) free(x)
-#define MZ_REALLOC(p, x) realloc(p, x)
+/* tinfl_decompress_mem_to_callback() decompresses a block in memory to an
+ * internal 32KB buffer, and a user provided callback function will be called to
+ * flush the buffer. */
+/* Returns 1 on success or 0 on failure. */
+typedef int (*tinfl_put_buf_func_ptr)(const void *pBuf, int len, void *pUser);
+MINIZ_EXPORT int
+tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size,
+                                 tinfl_put_buf_func_ptr pPut_buf_func,
+                                 void *pPut_buf_user, int flags);
+
+struct tinfl_decompressor_tag;
+typedef struct tinfl_decompressor_tag tinfl_decompressor;
+
+#ifndef MINIZ_NO_MALLOC
+/* Allocate the tinfl_decompressor structure in C so that */
+/* non-C language bindings to tinfl_ API don't need to worry about */
+/* structure size and allocation mechanism. */
+MINIZ_EXPORT tinfl_decompressor *tinfl_decompressor_alloc(void);
+MINIZ_EXPORT void tinfl_decompressor_free(tinfl_decompressor *pDecomp);
 #endif
 
-#define MZ_MAX(a, b) (((a) > (b)) ? (a) : (b))
-#define MZ_MIN(a, b) (((a) < (b)) ? (a) : (b))
-#define MZ_CLEAR_OBJ(obj) memset(&(obj), 0, sizeof(obj))
+/* Max size of LZ dictionary. */
+#define TINFL_LZ_DICT_SIZE 32768
 
-#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
-#define MZ_READ_LE16(p) *((const mz_uint16 *)(p))
-#define MZ_READ_LE32(p) *((const mz_uint32 *)(p))
+/* Return status. */
+typedef enum {
+  /* This flags indicates the inflator needs 1 or more input bytes to make
+     forward progress, but the caller is indicating that no more are available.
+     The compressed data */
+  /* is probably corrupted. If you call the inflator again with more bytes it'll
+     try to continue processing the input but this is a BAD sign (either the
+     data is corrupted or you called it incorrectly). */
+  /* If you call it again with no input you'll just get
+     TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS again. */
+  TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS = -4,
+
+  /* This flag indicates that one or more of the input parameters was obviously
+     bogus. (You can try calling it again, but if you get this error the calling
+     code is wrong.) */
+  TINFL_STATUS_BAD_PARAM = -3,
+
+  /* This flags indicate the inflator is finished but the adler32 check of the
+     uncompressed data didn't match. If you call it again it'll return
+     TINFL_STATUS_DONE. */
+  TINFL_STATUS_ADLER32_MISMATCH = -2,
+
+  /* This flags indicate the inflator has somehow failed (bad code, corrupted
+     input, etc.). If you call it again without resetting via tinfl_init() it
+     it'll just keep on returning the same status failure code. */
+  TINFL_STATUS_FAILED = -1,
+
+  /* Any status code less than TINFL_STATUS_DONE must indicate a failure. */
+
+  /* This flag indicates the inflator has returned every byte of uncompressed
+     data that it can, has consumed every byte that it needed, has successfully
+     reached the end of the deflate stream, and */
+  /* if zlib headers and adler32 checking enabled that it has successfully
+     checked the uncompressed data's adler32. If you call it again you'll just
+     get TINFL_STATUS_DONE over and over again. */
+  TINFL_STATUS_DONE = 0,
+
+  /* This flag indicates the inflator MUST have more input data (even 1 byte)
+     before it can make any more forward progress, or you need to clear the
+     TINFL_FLAG_HAS_MORE_INPUT */
+  /* flag on the next call if you don't have any more source data. If the source
+     data was somehow corrupted it's also possible (but unlikely) for the
+     inflator to keep on demanding input to */
+  /* proceed, so be sure to properly set the TINFL_FLAG_HAS_MORE_INPUT flag. */
+  TINFL_STATUS_NEEDS_MORE_INPUT = 1,
+
+  /* This flag indicates the inflator definitely has 1 or more bytes of
+     uncompressed data available, but it cannot write this data into the output
+     buffer. */
+  /* Note if the source compressed data was corrupted it's possible for the
+     inflator to return a lot of uncompressed data to the caller. I've been
+     assuming you know how much uncompressed data to expect */
+  /* (either exact or worst case) and will stop calling the inflator and fail
+     after receiving too much. In pure streaming scenarios where you have no
+     idea how many bytes to expect this may not be possible */
+  /* so I may need to add some code to address this. */
+  TINFL_STATUS_HAS_MORE_OUTPUT = 2
+} tinfl_status;
+
+/* Initializes the decompressor to its initial state. */
+#define tinfl_init(r)                                                          \
+  do {                                                                         \
+    (r)->m_state = 0;                                                          \
+  }                                                                            \
+  MZ_MACRO_END
+#define tinfl_get_adler32(r) (r)->m_check_adler32
+
+/* Main low-level decompressor coroutine function. This is the only function
+ * actually needed for decompression. All the other functions are just
+ * high-level helpers for improved usability. */
+/* This is a universal API, i.e. it can be used as a building block to build any
+ * desired higher level decompression API. In the limit case, it can be called
+ * once per every byte input or output. */
+MINIZ_EXPORT tinfl_status tinfl_decompress(
+    tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size,
+    mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size,
+    const mz_uint32 decomp_flags);
+
+/* Internal/private bits follow. */
+enum {
+  TINFL_MAX_HUFF_TABLES = 3,
+  TINFL_MAX_HUFF_SYMBOLS_0 = 288,
+  TINFL_MAX_HUFF_SYMBOLS_1 = 32,
+  TINFL_MAX_HUFF_SYMBOLS_2 = 19,
+  TINFL_FAST_LOOKUP_BITS = 10,
+  TINFL_FAST_LOOKUP_SIZE = 1 << TINFL_FAST_LOOKUP_BITS
+};
+
+#if MINIZ_HAS_64BIT_REGISTERS
+#define TINFL_USE_64BIT_BITBUF 1
 #else
-#define MZ_READ_LE16(p)                                                        \
-  ((mz_uint32)(((const mz_uint8 *)(p))[0]) |                                   \
-   ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U))
-#define MZ_READ_LE32(p)                                                        \
-  ((mz_uint32)(((const mz_uint8 *)(p))[0]) |                                   \
-   ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U) |                           \
-   ((mz_uint32)(((const mz_uint8 *)(p))[2]) << 16U) |                          \
-   ((mz_uint32)(((const mz_uint8 *)(p))[3]) << 24U))
+#define TINFL_USE_64BIT_BITBUF 0
 #endif
 
-#define MZ_READ_LE64(p)                                                        \
-  (((mz_uint64)MZ_READ_LE32(p)) |                                              \
-   (((mz_uint64)MZ_READ_LE32((const mz_uint8 *)(p) + sizeof(mz_uint32)))       \
-    << 32U))
-
-#ifdef _MSC_VER
-#define MZ_FORCEINLINE __forceinline
-#elif defined(__GNUC__)
-#define MZ_FORCEINLINE inline __attribute__((__always_inline__))
+#if TINFL_USE_64BIT_BITBUF
+typedef mz_uint64 tinfl_bit_buf_t;
+#define TINFL_BITBUF_SIZE (64)
 #else
-#define MZ_FORCEINLINE inline
+typedef mz_uint32 tinfl_bit_buf_t;
+#define TINFL_BITBUF_SIZE (32)
 #endif
 
+struct tinfl_decompressor_tag {
+  mz_uint32 m_state, m_num_bits, m_zhdr0, m_zhdr1, m_z_adler32, m_final, m_type,
+      m_check_adler32, m_dist, m_counter, m_num_extra,
+      m_table_sizes[TINFL_MAX_HUFF_TABLES];
+  tinfl_bit_buf_t m_bit_buf;
+  size_t m_dist_from_out_buf_start;
+  mz_int16 m_look_up[TINFL_MAX_HUFF_TABLES][TINFL_FAST_LOOKUP_SIZE];
+  mz_int16 m_tree_0[TINFL_MAX_HUFF_SYMBOLS_0 * 2];
+  mz_int16 m_tree_1[TINFL_MAX_HUFF_SYMBOLS_1 * 2];
+  mz_int16 m_tree_2[TINFL_MAX_HUFF_SYMBOLS_2 * 2];
+  mz_uint8 m_code_size_0[TINFL_MAX_HUFF_SYMBOLS_0];
+  mz_uint8 m_code_size_1[TINFL_MAX_HUFF_SYMBOLS_1];
+  mz_uint8 m_code_size_2[TINFL_MAX_HUFF_SYMBOLS_2];
+  mz_uint8 m_raw_header[4],
+      m_len_codes[TINFL_MAX_HUFF_SYMBOLS_0 + TINFL_MAX_HUFF_SYMBOLS_1 + 137];
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
+
+#pragma once
+
+/* ------------------- ZIP archive reading/writing */
+
+#ifndef MINIZ_NO_ARCHIVE_APIS
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-// ------------------- zlib-style API's
+enum {
+  /* Note: These enums can be reduced as needed to save memory or stack space -
+     they are pretty conservative. */
+  MZ_ZIP_MAX_IO_BUF_SIZE = 64 * 1024,
+  MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE = 512,
+  MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE = 512
+};
+
+typedef struct {
+  /* Central directory file index. */
+  mz_uint32 m_file_index;
+
+  /* Byte offset of this entry in the archive's central directory. Note we
+   * currently only support up to UINT_MAX or less bytes in the central dir. */
+  mz_uint64 m_central_dir_ofs;
+
+  /* These fields are copied directly from the zip's central dir. */
+  mz_uint16 m_version_made_by;
+  mz_uint16 m_version_needed;
+  mz_uint16 m_bit_flag;
+  mz_uint16 m_method;
+
+  /* CRC-32 of uncompressed data. */
+  mz_uint32 m_crc32;
+
+  /* File's compressed size. */
+  mz_uint64 m_comp_size;
+
+  /* File's uncompressed size. Note, I've seen some old archives where directory
+   * entries had 512 bytes for their uncompressed sizes, but when you try to
+   * unpack them you actually get 0 bytes. */
+  mz_uint64 m_uncomp_size;
+
+  /* Zip internal and external file attributes. */
+  mz_uint16 m_internal_attr;
+  mz_uint32 m_external_attr;
+
+  /* Entry's local header file offset in bytes. */
+  mz_uint64 m_local_header_ofs;
+
+  /* Size of comment in bytes. */
+  mz_uint32 m_comment_size;
+
+  /* MZ_TRUE if the entry appears to be a directory. */
+  mz_bool m_is_directory;
+
+  /* MZ_TRUE if the entry uses encryption/strong encryption (which miniz_zip
+   * doesn't support) */
+  mz_bool m_is_encrypted;
+
+  /* MZ_TRUE if the file is not encrypted, a patch file, and if it uses a
+   * compression method we support. */
+  mz_bool m_is_supported;
+
+  /* Filename. If string ends in '/' it's a subdirectory entry. */
+  /* Guaranteed to be zero terminated, may be truncated to fit. */
+  char m_filename[MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE];
+
+  /* Comment field. */
+  /* Guaranteed to be zero terminated, may be truncated to fit. */
+  char m_comment[MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE];
+
+#ifdef MINIZ_NO_TIME
+  MZ_TIME_T m_padding;
+#else
+  MZ_TIME_T m_time;
+#endif
+} mz_zip_archive_file_stat;
+
+typedef size_t (*mz_file_read_func)(void *pOpaque, mz_uint64 file_ofs,
+                                    void *pBuf, size_t n);
+typedef size_t (*mz_file_write_func)(void *pOpaque, mz_uint64 file_ofs,
+                                     const void *pBuf, size_t n);
+typedef mz_bool (*mz_file_needs_keepalive)(void *pOpaque);
+
+struct mz_zip_internal_state_tag;
+typedef struct mz_zip_internal_state_tag mz_zip_internal_state;
+
+typedef enum {
+  MZ_ZIP_MODE_INVALID = 0,
+  MZ_ZIP_MODE_READING = 1,
+  MZ_ZIP_MODE_WRITING = 2,
+  MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED = 3
+} mz_zip_mode;
+
+typedef enum {
+  MZ_ZIP_FLAG_CASE_SENSITIVE = 0x0100,
+  MZ_ZIP_FLAG_IGNORE_PATH = 0x0200,
+  MZ_ZIP_FLAG_COMPRESSED_DATA = 0x0400,
+  MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY = 0x0800,
+  MZ_ZIP_FLAG_VALIDATE_LOCATE_FILE_FLAG =
+      0x1000, /* if enabled, mz_zip_reader_locate_file() will be called on each
+                 file as its validated to ensure the func finds the file in the
+                 central dir (intended for testing) */
+  MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY =
+      0x2000, /* validate the local headers, but don't decompress the entire
+                 file and check the crc32 */
+  MZ_ZIP_FLAG_WRITE_ZIP64 =
+      0x4000, /* always use the zip64 file format, instead of the original zip
+                 file format with automatic switch to zip64. Use as flags
+                 parameter with mz_zip_writer_init*_v2 */
+  MZ_ZIP_FLAG_WRITE_ALLOW_READING = 0x8000,
+  MZ_ZIP_FLAG_ASCII_FILENAME = 0x10000,
+  /*After adding a compressed file, seek back
+  to local file header and set the correct sizes*/
+  MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE = 0x20000
+} mz_zip_flags;
+
+typedef enum {
+  MZ_ZIP_TYPE_INVALID = 0,
+  MZ_ZIP_TYPE_USER,
+  MZ_ZIP_TYPE_MEMORY,
+  MZ_ZIP_TYPE_HEAP,
+  MZ_ZIP_TYPE_FILE,
+  MZ_ZIP_TYPE_CFILE,
+  MZ_ZIP_TOTAL_TYPES
+} mz_zip_type;
+
+/* miniz error codes. Be sure to update mz_zip_get_error_string() if you add or
+ * modify this enum. */
+typedef enum {
+  MZ_ZIP_NO_ERROR = 0,
+  MZ_ZIP_UNDEFINED_ERROR,
+  MZ_ZIP_TOO_MANY_FILES,
+  MZ_ZIP_FILE_TOO_LARGE,
+  MZ_ZIP_UNSUPPORTED_METHOD,
+  MZ_ZIP_UNSUPPORTED_ENCRYPTION,
+  MZ_ZIP_UNSUPPORTED_FEATURE,
+  MZ_ZIP_FAILED_FINDING_CENTRAL_DIR,
+  MZ_ZIP_NOT_AN_ARCHIVE,
+  MZ_ZIP_INVALID_HEADER_OR_CORRUPTED,
+  MZ_ZIP_UNSUPPORTED_MULTIDISK,
+  MZ_ZIP_DECOMPRESSION_FAILED,
+  MZ_ZIP_COMPRESSION_FAILED,
+  MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE,
+  MZ_ZIP_CRC_CHECK_FAILED,
+  MZ_ZIP_UNSUPPORTED_CDIR_SIZE,
+  MZ_ZIP_ALLOC_FAILED,
+  MZ_ZIP_FILE_OPEN_FAILED,
+  MZ_ZIP_FILE_CREATE_FAILED,
+  MZ_ZIP_FILE_WRITE_FAILED,
+  MZ_ZIP_FILE_READ_FAILED,
+  MZ_ZIP_FILE_CLOSE_FAILED,
+  MZ_ZIP_FILE_SEEK_FAILED,
+  MZ_ZIP_FILE_STAT_FAILED,
+  MZ_ZIP_INVALID_PARAMETER,
+  MZ_ZIP_INVALID_FILENAME,
+  MZ_ZIP_BUF_TOO_SMALL,
+  MZ_ZIP_INTERNAL_ERROR,
+  MZ_ZIP_FILE_NOT_FOUND,
+  MZ_ZIP_ARCHIVE_TOO_LARGE,
+  MZ_ZIP_VALIDATION_FAILED,
+  MZ_ZIP_WRITE_CALLBACK_FAILED,
+  MZ_ZIP_TOTAL_ERRORS
+} mz_zip_error;
+
+typedef struct {
+  mz_uint64 m_archive_size;
+  mz_uint64 m_central_directory_file_ofs;
+
+  /* We only support up to UINT32_MAX files in zip64 mode. */
+  mz_uint32 m_total_files;
+  mz_zip_mode m_zip_mode;
+  mz_zip_type m_zip_type;
+  mz_zip_error m_last_error;
+
+  mz_uint64 m_file_offset_alignment;
+
+  mz_alloc_func m_pAlloc;
+  mz_free_func m_pFree;
+  mz_realloc_func m_pRealloc;
+  void *m_pAlloc_opaque;
+
+  mz_file_read_func m_pRead;
+  mz_file_write_func m_pWrite;
+  mz_file_needs_keepalive m_pNeeds_keepalive;
+  void *m_pIO_opaque;
+
+  mz_zip_internal_state *m_pState;
+
+} mz_zip_archive;
+
+typedef struct {
+  mz_zip_archive *pZip;
+  mz_uint flags;
+
+  int status;
+
+  mz_uint64 read_buf_size, read_buf_ofs, read_buf_avail, comp_remaining,
+      out_buf_ofs, cur_file_ofs;
+  mz_zip_archive_file_stat file_stat;
+  void *pRead_buf;
+  void *pWrite_buf;
+
+  size_t out_blk_remain;
+
+  tinfl_decompressor inflator;
+
+#ifdef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+  mz_uint padding;
+#else
+  mz_uint file_crc32;
+#endif
+
+} mz_zip_reader_extract_iter_state;
+
+/* -------- ZIP reading */
+
+/* Inits a ZIP archive reader. */
+/* These functions read and validate the archive's central directory. */
+MINIZ_EXPORT mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size,
+                                        mz_uint flags);
+
+MINIZ_EXPORT mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip,
+                                            const void *pMem, size_t size,
+                                            mz_uint flags);
+
+#ifndef MINIZ_NO_STDIO
+/* Read a archive from a disk file. */
+/* file_start_ofs is the file offset where the archive actually begins, or 0. */
+/* actual_archive_size is the true total size of the archive, which may be
+ * smaller than the file's actual size on disk. If zero the entire file is
+ * treated as the archive. */
+MINIZ_EXPORT mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip,
+                                             const char *pFilename,
+                                             mz_uint32 flags);
+MINIZ_EXPORT mz_bool mz_zip_reader_init_file_v2(mz_zip_archive *pZip,
+                                                const char *pFilename,
+                                                mz_uint flags,
+                                                mz_uint64 file_start_ofs,
+                                                mz_uint64 archive_size);
+MINIZ_EXPORT mz_bool mz_zip_reader_init_file_v2_rpb(mz_zip_archive *pZip,
+                                                    const char *pFilename,
+                                                    mz_uint flags,
+                                                    mz_uint64 file_start_ofs,
+                                                    mz_uint64 archive_size);
+
+/* Read an archive from an already opened FILE, beginning at the current file
+ * position. */
+/* The archive is assumed to be archive_size bytes long. If archive_size is 0,
+ * then the entire rest of the file is assumed to contain the archive. */
+/* The FILE will NOT be closed when mz_zip_reader_end() is called. */
+MINIZ_EXPORT mz_bool mz_zip_reader_init_cfile(mz_zip_archive *pZip,
+                                              MZ_FILE *pFile,
+                                              mz_uint64 archive_size,
+                                              mz_uint flags);
+#endif
+
+/* Ends archive reading, freeing all allocations, and closing the input archive
+ * file if mz_zip_reader_init_file() was used. */
+MINIZ_EXPORT mz_bool mz_zip_reader_end(mz_zip_archive *pZip);
+
+/* -------- ZIP reading or writing */
+
+/* Clears a mz_zip_archive struct to all zeros. */
+/* Important: This must be done before passing the struct to any mz_zip
+ * functions. */
+MINIZ_EXPORT void mz_zip_zero_struct(mz_zip_archive *pZip);
+
+MINIZ_EXPORT mz_zip_mode mz_zip_get_mode(mz_zip_archive *pZip);
+MINIZ_EXPORT mz_zip_type mz_zip_get_type(mz_zip_archive *pZip);
+
+/* Returns the total number of files in the archive. */
+MINIZ_EXPORT mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip);
+
+MINIZ_EXPORT mz_uint64 mz_zip_get_archive_size(mz_zip_archive *pZip);
+MINIZ_EXPORT mz_uint64
+mz_zip_get_archive_file_start_offset(mz_zip_archive *pZip);
+MINIZ_EXPORT MZ_FILE *mz_zip_get_cfile(mz_zip_archive *pZip);
+
+/* Reads n bytes of raw archive data, starting at file offset file_ofs, to pBuf.
+ */
+MINIZ_EXPORT size_t mz_zip_read_archive_data(mz_zip_archive *pZip,
+                                             mz_uint64 file_ofs, void *pBuf,
+                                             size_t n);
+
+/* All mz_zip funcs set the m_last_error field in the mz_zip_archive struct.
+ * These functions retrieve/manipulate this field. */
+/* Note that the m_last_error functionality is not thread safe. */
+MINIZ_EXPORT mz_zip_error mz_zip_set_last_error(mz_zip_archive *pZip,
+                                                mz_zip_error err_num);
+MINIZ_EXPORT mz_zip_error mz_zip_peek_last_error(mz_zip_archive *pZip);
+MINIZ_EXPORT mz_zip_error mz_zip_clear_last_error(mz_zip_archive *pZip);
+MINIZ_EXPORT mz_zip_error mz_zip_get_last_error(mz_zip_archive *pZip);
+MINIZ_EXPORT const char *mz_zip_get_error_string(mz_zip_error mz_err);
+
+/* MZ_TRUE if the archive file entry is a directory entry. */
+MINIZ_EXPORT mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip,
+                                                       mz_uint file_index);
+
+/* MZ_TRUE if the file is encrypted/strong encrypted. */
+MINIZ_EXPORT mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip,
+                                                     mz_uint file_index);
+
+/* MZ_TRUE if the compression method is supported, and the file is not
+ * encrypted, and the file is not a compressed patch file. */
+MINIZ_EXPORT mz_bool mz_zip_reader_is_file_supported(mz_zip_archive *pZip,
+                                                     mz_uint file_index);
+
+/* Retrieves the filename of an archive file entry. */
+/* Returns the number of bytes written to pFilename, or if filename_buf_size is
+ * 0 this function returns the number of bytes needed to fully store the
+ * filename. */
+MINIZ_EXPORT mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip,
+                                                mz_uint file_index,
+                                                char *pFilename,
+                                                mz_uint filename_buf_size);
+
+/* Attempts to locates a file in the archive's central directory. */
+/* Valid flags: MZ_ZIP_FLAG_CASE_SENSITIVE, MZ_ZIP_FLAG_IGNORE_PATH */
+/* Returns -1 if the file cannot be found. */
+MINIZ_EXPORT int mz_zip_reader_locate_file(mz_zip_archive *pZip,
+                                           const char *pName,
+                                           const char *pComment, mz_uint flags);
+MINIZ_EXPORT mz_bool mz_zip_reader_locate_file_v2(mz_zip_archive *pZip,
+                                                  const char *pName,
+                                                  const char *pComment,
+                                                  mz_uint flags,
+                                                  mz_uint32 *file_index);
+
+/* Returns detailed information about an archive file entry. */
+MINIZ_EXPORT mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip,
+                                             mz_uint file_index,
+                                             mz_zip_archive_file_stat *pStat);
+
+/* MZ_TRUE if the file is in zip64 format. */
+/* A file is considered zip64 if it contained a zip64 end of central directory
+ * marker, or if it contained any zip64 extended file information fields in the
+ * central directory. */
+MINIZ_EXPORT mz_bool mz_zip_is_zip64(mz_zip_archive *pZip);
+
+/* Returns the total central directory size in bytes. */
+/* The current max supported size is <= MZ_UINT32_MAX. */
+MINIZ_EXPORT size_t mz_zip_get_central_dir_size(mz_zip_archive *pZip);
+
+/* Extracts a archive file to a memory buffer using no memory allocation. */
+/* There must be at least enough room on the stack to store the inflator's state
+ * (~34KB or so). */
+MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_mem_no_alloc(
+    mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size,
+    mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size);
+MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_mem_no_alloc(
+    mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size,
+    mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size);
+
+/* Extracts a archive file to a memory buffer. */
+MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip,
+                                                  mz_uint file_index,
+                                                  void *pBuf, size_t buf_size,
+                                                  mz_uint flags);
+MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip,
+                                                       const char *pFilename,
+                                                       void *pBuf,
+                                                       size_t buf_size,
+                                                       mz_uint flags);
+
+/* Extracts a archive file to a dynamically allocated heap buffer. */
+/* The memory will be allocated via the mz_zip_archive's alloc/realloc
+ * functions. */
+/* Returns NULL and sets the last error on failure. */
+MINIZ_EXPORT void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip,
+                                                 mz_uint file_index,
+                                                 size_t *pSize, mz_uint flags);
+MINIZ_EXPORT void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip,
+                                                      const char *pFilename,
+                                                      size_t *pSize,
+                                                      mz_uint flags);
+
+/* Extracts a archive file using a callback function to output the file's data.
+ */
+MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_callback(
+    mz_zip_archive *pZip, mz_uint file_index, mz_file_write_func pCallback,
+    void *pOpaque, mz_uint flags);
+MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_callback(
+    mz_zip_archive *pZip, const char *pFilename, mz_file_write_func pCallback,
+    void *pOpaque, mz_uint flags);
+
+/* Extract a file iteratively */
+MINIZ_EXPORT mz_zip_reader_extract_iter_state *
+mz_zip_reader_extract_iter_new(mz_zip_archive *pZip, mz_uint file_index,
+                               mz_uint flags);
+MINIZ_EXPORT mz_zip_reader_extract_iter_state *
+mz_zip_reader_extract_file_iter_new(mz_zip_archive *pZip, const char *pFilename,
+                                    mz_uint flags);
+MINIZ_EXPORT size_t mz_zip_reader_extract_iter_read(
+    mz_zip_reader_extract_iter_state *pState, void *pvBuf, size_t buf_size);
+MINIZ_EXPORT mz_bool
+mz_zip_reader_extract_iter_free(mz_zip_reader_extract_iter_state *pState);
+
+#ifndef MINIZ_NO_STDIO
+/* Extracts a archive file to a disk file and sets its last accessed and
+ * modified times. */
+/* This function only extracts files, not archive directory records. */
+MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip,
+                                                   mz_uint file_index,
+                                                   const char *pDst_filename,
+                                                   mz_uint flags);
+MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_file(
+    mz_zip_archive *pZip, const char *pArchive_filename,
+    const char *pDst_filename, mz_uint flags);
+
+/* Extracts a archive file starting at the current position in the destination
+ * FILE stream. */
+MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_cfile(mz_zip_archive *pZip,
+                                                    mz_uint file_index,
+                                                    MZ_FILE *File,
+                                                    mz_uint flags);
+MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_cfile(
+    mz_zip_archive *pZip, const char *pArchive_filename, MZ_FILE *pFile,
+    mz_uint flags);
+#endif
+
+#if 0
+/* TODO */
+	typedef void *mz_zip_streaming_extract_state_ptr;
+	mz_zip_streaming_extract_state_ptr mz_zip_streaming_extract_begin(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags);
+	mz_uint64 mz_zip_streaming_extract_get_size(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState);
+	mz_uint64 mz_zip_streaming_extract_get_cur_ofs(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState);
+	mz_bool mz_zip_streaming_extract_seek(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState, mz_uint64 new_ofs);
+	size_t mz_zip_streaming_extract_read(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState, void *pBuf, size_t buf_size);
+	mz_bool mz_zip_streaming_extract_end(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState);
+#endif
+
+/* This function compares the archive's local headers, the optional local zip64
+ * extended information block, and the optional descriptor following the
+ * compressed data vs. the data in the central directory. */
+/* It also validates that each file can be successfully uncompressed unless the
+ * MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY is specified. */
+MINIZ_EXPORT mz_bool mz_zip_validate_file(mz_zip_archive *pZip,
+                                          mz_uint file_index, mz_uint flags);
+
+/* Validates an entire archive by calling mz_zip_validate_file() on each file.
+ */
+MINIZ_EXPORT mz_bool mz_zip_validate_archive(mz_zip_archive *pZip,
+                                             mz_uint flags);
+
+/* Misc utils/helpers, valid for ZIP reading or writing */
+MINIZ_EXPORT mz_bool mz_zip_validate_mem_archive(const void *pMem, size_t size,
+                                                 mz_uint flags,
+                                                 mz_zip_error *pErr);
+#ifndef MINIZ_NO_STDIO
+MINIZ_EXPORT mz_bool mz_zip_validate_file_archive(const char *pFilename,
+                                                  mz_uint flags,
+                                                  mz_zip_error *pErr);
+#endif
+
+/* Universal end function - calls either mz_zip_reader_end() or
+ * mz_zip_writer_end(). */
+MINIZ_EXPORT mz_bool mz_zip_end(mz_zip_archive *pZip);
+
+/* -------- ZIP writing */
+
+#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
+
+/* Inits a ZIP archive writer. */
+/*Set pZip->m_pWrite (and pZip->m_pIO_opaque) before calling mz_zip_writer_init
+ * or mz_zip_writer_init_v2*/
+/*The output is streamable, i.e. file_ofs in mz_file_write_func always increases
+ * only by n*/
+MINIZ_EXPORT mz_bool mz_zip_writer_init(mz_zip_archive *pZip,
+                                        mz_uint64 existing_size);
+MINIZ_EXPORT mz_bool mz_zip_writer_init_v2(mz_zip_archive *pZip,
+                                           mz_uint64 existing_size,
+                                           mz_uint flags);
+
+MINIZ_EXPORT mz_bool mz_zip_writer_init_heap(
+    mz_zip_archive *pZip, size_t size_to_reserve_at_beginning,
+    size_t initial_allocation_size);
+MINIZ_EXPORT mz_bool mz_zip_writer_init_heap_v2(
+    mz_zip_archive *pZip, size_t size_to_reserve_at_beginning,
+    size_t initial_allocation_size, mz_uint flags);
+
+#ifndef MINIZ_NO_STDIO
+MINIZ_EXPORT mz_bool
+mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename,
+                        mz_uint64 size_to_reserve_at_beginning);
+MINIZ_EXPORT mz_bool mz_zip_writer_init_file_v2(
+    mz_zip_archive *pZip, const char *pFilename,
+    mz_uint64 size_to_reserve_at_beginning, mz_uint flags);
+MINIZ_EXPORT mz_bool mz_zip_writer_init_cfile(mz_zip_archive *pZip,
+                                              MZ_FILE *pFile, mz_uint flags);
+#endif
+
+/* Converts a ZIP archive reader object into a writer object, to allow efficient
+ * in-place file appends to occur on an existing archive. */
+/* For archives opened using mz_zip_reader_init_file, pFilename must be the
+ * archive's filename so it can be reopened for writing. If the file can't be
+ * reopened, mz_zip_reader_end() will be called. */
+/* For archives opened using mz_zip_reader_init_mem, the memory block must be
+ * growable using the realloc callback (which defaults to realloc unless you've
+ * overridden it). */
+/* Finally, for archives opened using mz_zip_reader_init, the mz_zip_archive's
+ * user provided m_pWrite function cannot be NULL. */
+/* Note: In-place archive modification is not recommended unless you know what
+ * you're doing, because if execution stops or something goes wrong before */
+/* the archive is finalized the file's central directory will be hosed. */
+MINIZ_EXPORT mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip,
+                                                    const char *pFilename);
+MINIZ_EXPORT mz_bool mz_zip_writer_init_from_reader_v2(mz_zip_archive *pZip,
+                                                       const char *pFilename,
+                                                       mz_uint flags);
+MINIZ_EXPORT mz_bool mz_zip_writer_init_from_reader_v2_noreopen(
+    mz_zip_archive *pZip, const char *pFilename, mz_uint flags);
+
+/* Adds the contents of a memory buffer to an archive. These functions record
+ * the current local time into the archive. */
+/* To add a directory entry, call this method with an archive name ending in a
+ * forwardslash with an empty buffer. */
+/* level_and_flags - compression level (0-10, see MZ_BEST_SPEED,
+ * MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or
+ * just set to MZ_DEFAULT_COMPRESSION. */
+MINIZ_EXPORT mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip,
+                                           const char *pArchive_name,
+                                           const void *pBuf, size_t buf_size,
+                                           mz_uint level_and_flags);
+
+/* Like mz_zip_writer_add_mem(), except you can specify a file comment field,
+ * and optionally supply the function with already compressed data. */
+/* uncomp_size/uncomp_crc32 are only used if the MZ_ZIP_FLAG_COMPRESSED_DATA
+ * flag is specified. */
+MINIZ_EXPORT mz_bool mz_zip_writer_add_mem_ex(
+    mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf,
+    size_t buf_size, const void *pComment, mz_uint16 comment_size,
+    mz_uint level_and_flags, mz_uint64 uncomp_size, mz_uint32 uncomp_crc32);
+
+MINIZ_EXPORT mz_bool mz_zip_writer_add_mem_ex_v2(
+    mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf,
+    size_t buf_size, const void *pComment, mz_uint16 comment_size,
+    mz_uint level_and_flags, mz_uint64 uncomp_size, mz_uint32 uncomp_crc32,
+    MZ_TIME_T *last_modified, const char *user_extra_data_local,
+    mz_uint user_extra_data_local_len, const char *user_extra_data_central,
+    mz_uint user_extra_data_central_len);
+
+/* Adds the contents of a file to an archive. This function also records the
+ * disk file's modified time into the archive. */
+/* File data is supplied via a read callback function. User
+ * mz_zip_writer_add_(c)file to add a file directly.*/
+MINIZ_EXPORT mz_bool mz_zip_writer_add_read_buf_callback(
+    mz_zip_archive *pZip, const char *pArchive_name,
+    mz_file_read_func read_callback, void *callback_opaque, mz_uint64 max_size,
+    const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size,
+    mz_uint level_and_flags, mz_uint32 ext_attributes,
+    const char *user_extra_data_local, mz_uint user_extra_data_local_len,
+    const char *user_extra_data_central, mz_uint user_extra_data_central_len);
+
+#ifndef MINIZ_NO_STDIO
+/* Adds the contents of a disk file to an archive. This function also records
+ * the disk file's modified time into the archive. */
+/* level_and_flags - compression level (0-10, see MZ_BEST_SPEED,
+ * MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or
+ * just set to MZ_DEFAULT_COMPRESSION. */
+MINIZ_EXPORT mz_bool mz_zip_writer_add_file(
+    mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename,
+    const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
+    mz_uint32 ext_attributes);
+
+/* Like mz_zip_writer_add_file(), except the file data is read from the
+ * specified FILE stream. */
+MINIZ_EXPORT mz_bool mz_zip_writer_add_cfile(
+    mz_zip_archive *pZip, const char *pArchive_name, MZ_FILE *pSrc_file,
+    mz_uint64 max_size, const MZ_TIME_T *pFile_time, const void *pComment,
+    mz_uint16 comment_size, mz_uint level_and_flags, mz_uint32 ext_attributes,
+    const char *user_extra_data_local, mz_uint user_extra_data_local_len,
+    const char *user_extra_data_central, mz_uint user_extra_data_central_len);
+#endif
+
+/* Adds a file to an archive by fully cloning the data from another archive. */
+/* This function fully clones the source file's compressed data (no
+ * recompression), along with its full filename, extra data (it may add or
+ * modify the zip64 local header extra data field), and the optional descriptor
+ * following the compressed data. */
+MINIZ_EXPORT mz_bool mz_zip_writer_add_from_zip_reader(
+    mz_zip_archive *pZip, mz_zip_archive *pSource_zip, mz_uint src_file_index);
+
+/* Finalizes the archive by writing the central directory records followed by
+ * the end of central directory record. */
+/* After an archive is finalized, the only valid call on the mz_zip_archive
+ * struct is mz_zip_writer_end(). */
+/* An archive must be manually finalized by calling this function for it to be
+ * valid. */
+MINIZ_EXPORT mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip);
+
+/* Finalizes a heap archive, returning a pointer to the heap block and its size.
+ */
+/* The heap block will be allocated using the mz_zip_archive's alloc/realloc
+ * callbacks. */
+MINIZ_EXPORT mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip,
+                                                         void **ppBuf,
+                                                         size_t *pSize);
+
+/* Ends archive writing, freeing all allocations, and closing the output file if
+ * mz_zip_writer_init_file() was used. */
+/* Note for the archive to be valid, it *must* have been finalized before ending
+ * (this function will not do it for you). */
+MINIZ_EXPORT mz_bool mz_zip_writer_end(mz_zip_archive *pZip);
+
+/* -------- Misc. high-level helper functions: */
+
+/* mz_zip_add_mem_to_archive_file_in_place() efficiently (but not atomically)
+ * appends a memory blob to a ZIP archive. */
+/* Note this is NOT a fully safe operation. If it crashes or dies in some way
+ * your archive can be left in a screwed up state (without a central directory).
+ */
+/* level_and_flags - compression level (0-10, see MZ_BEST_SPEED,
+ * MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or
+ * just set to MZ_DEFAULT_COMPRESSION. */
+/* TODO: Perhaps add an option to leave the existing central dir in place in
+ * case the add dies? We could then truncate the file (so the old central dir
+ * would be at the end) if something goes wrong. */
+MINIZ_EXPORT mz_bool mz_zip_add_mem_to_archive_file_in_place(
+    const char *pZip_filename, const char *pArchive_name, const void *pBuf,
+    size_t buf_size, const void *pComment, mz_uint16 comment_size,
+    mz_uint level_and_flags);
+MINIZ_EXPORT mz_bool mz_zip_add_mem_to_archive_file_in_place_v2(
+    const char *pZip_filename, const char *pArchive_name, const void *pBuf,
+    size_t buf_size, const void *pComment, mz_uint16 comment_size,
+    mz_uint level_and_flags, mz_zip_error *pErr);
+
+#ifndef MINIZ_NO_STDIO
+/* Reads a single file from an archive into a heap block. */
+/* If pComment is not NULL, only the file with the specified comment will be
+ * extracted. */
+/* Returns NULL on failure. */
+MINIZ_EXPORT void *
+mz_zip_extract_archive_file_to_heap(const char *pZip_filename,
+                                    const char *pArchive_name, size_t *pSize,
+                                    mz_uint flags);
+MINIZ_EXPORT void *mz_zip_extract_archive_file_to_heap_v2(
+    const char *pZip_filename, const char *pArchive_name, const char *pComment,
+    size_t *pSize, mz_uint flags, mz_zip_error *pErr);
+#endif
+
+#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MINIZ_NO_ARCHIVE_APIS */
+/**************************************************************************
+ *
+ * Copyright 2013-2014 RAD Game Tools and Valve Software
+ * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
+ * All Rights Reserved.
+ *
+ * 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.
+ *
+ **************************************************************************/
+
+typedef unsigned char mz_validate_uint16[sizeof(mz_uint16) == 2 ? 1 : -1];
+typedef unsigned char mz_validate_uint32[sizeof(mz_uint32) == 4 ? 1 : -1];
+typedef unsigned char mz_validate_uint64[sizeof(mz_uint64) == 8 ? 1 : -1];
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ------------------- zlib-style API's */
 
 mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len) {
   mz_uint32 i, s1 = (mz_uint32)(adler & 0xffff), s2 = (mz_uint32)(adler >> 16);
@@ -1414,46 +1893,126 @@ mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len) {
   return (s2 << 16) + s1;
 }
 
-// Karl Malbrain's compact CRC-32. See "A compact CCITT crc16 and crc32 C
-// implementation that balances processor cache usage against speed":
-// http://www.geocities.com/malbrain/
+/* Karl Malbrain's compact CRC-32. See "A compact CCITT crc16 and crc32 C
+ * implementation that balances processor cache usage against speed":
+ * http://www.geocities.com/malbrain/ */
+#if 0
+    mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len)
+    {
+        static const mz_uint32 s_crc32[16] = { 0, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c,
+                                               0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c, 0x9b64c2b0, 0x86d3d2d4, 0xa00ae278, 0xbdbdf21c };
+        mz_uint32 crcu32 = (mz_uint32)crc;
+        if (!ptr)
+            return MZ_CRC32_INIT;
+        crcu32 = ~crcu32;
+        while (buf_len--)
+        {
+            mz_uint8 b = *ptr++;
+            crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b & 0xF)];
+            crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b >> 4)];
+        }
+        return ~crcu32;
+    }
+#elif defined(USE_EXTERNAL_MZCRC)
+/* If USE_EXTERNAL_CRC is defined, an external module will export the
+ * mz_crc32() symbol for us to use, e.g. an SSE-accelerated version.
+ * Depending on the impl, it may be necessary to ~ the input/output crc values.
+ */
+mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len);
+#else
+/* Faster, but larger CPU cache footprint.
+ */
 mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len) {
-  static const mz_uint32 s_crc32[16] = {
-      0,          0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190, 0x6b6b51f4,
-      0x4db26158, 0x5005713c, 0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c,
-      0x9b64c2b0, 0x86d3d2d4, 0xa00ae278, 0xbdbdf21c};
-  mz_uint32 crcu32 = (mz_uint32)crc;
-  if (!ptr)
-    return MZ_CRC32_INIT;
-  crcu32 = ~crcu32;
-  while (buf_len--) {
-    mz_uint8 b = *ptr++;
-    crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b & 0xF)];
-    crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b >> 4)];
+  static const mz_uint32 s_crc_table[256] = {
+      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};
+
+  mz_uint32 crc32 = (mz_uint32)crc ^ 0xFFFFFFFF;
+  const mz_uint8 *pByte_buf = (const mz_uint8 *)ptr;
+
+  while (buf_len >= 4) {
+    crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[0]) & 0xFF];
+    crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[1]) & 0xFF];
+    crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[2]) & 0xFF];
+    crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[3]) & 0xFF];
+    pByte_buf += 4;
+    buf_len -= 4;
   }
-  return ~crcu32;
+
+  while (buf_len) {
+    crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[0]) & 0xFF];
+    ++pByte_buf;
+    --buf_len;
+  }
+
+  return ~crc32;
 }
+#endif
 
 void mz_free(void *p) { MZ_FREE(p); }
 
-#ifndef MINIZ_NO_ZLIB_APIS
-
-static void *def_alloc_func(void *opaque, size_t items, size_t size) {
+MINIZ_EXPORT void *miniz_def_alloc_func(void *opaque, size_t items,
+                                        size_t size) {
   (void)opaque, (void)items, (void)size;
   return MZ_MALLOC(items * size);
 }
-static void def_free_func(void *opaque, void *address) {
+MINIZ_EXPORT void miniz_def_free_func(void *opaque, void *address) {
   (void)opaque, (void)address;
   MZ_FREE(address);
 }
-static void *def_realloc_func(void *opaque, void *address, size_t items,
-                              size_t size) {
+MINIZ_EXPORT void *miniz_def_realloc_func(void *opaque, void *address,
+                                          size_t items, size_t size) {
   (void)opaque, (void)address, (void)items, (void)size;
   return MZ_REALLOC(address, items * size);
 }
 
 const char *mz_version(void) { return MZ_VERSION; }
 
+#ifndef MINIZ_NO_ZLIB_APIS
+
+#ifndef MINIZ_NO_DEFLATE_APIS
+
 int mz_deflateInit(mz_streamp pStream, int level) {
   return mz_deflateInit2(pStream, level, MZ_DEFLATED, MZ_DEFAULT_WINDOW_BITS, 9,
                          MZ_DEFAULT_STRATEGY);
@@ -1480,9 +2039,9 @@ int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits,
   pStream->total_in = 0;
   pStream->total_out = 0;
   if (!pStream->zalloc)
-    pStream->zalloc = def_alloc_func;
+    pStream->zalloc = miniz_def_alloc_func;
   if (!pStream->zfree)
-    pStream->zfree = def_free_func;
+    pStream->zfree = miniz_def_free_func;
 
   pComp = (tdefl_compressor *)pStream->zalloc(pStream->opaque, 1,
                                               sizeof(tdefl_compressor));
@@ -1558,7 +2117,8 @@ int mz_deflate(mz_streamp pStream, int flush) {
       if ((flush) || (pStream->total_in != orig_total_in) ||
           (pStream->total_out != orig_total_out))
         break;
-      return MZ_BUF_ERROR; // Can't make forward progress without some input.
+      return MZ_BUF_ERROR; /* Can't make forward progress without some input.
+                            */
     }
   }
   return mz_status;
@@ -1576,24 +2136,29 @@ int mz_deflateEnd(mz_streamp pStream) {
 
 mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len) {
   (void)pStream;
-  // This is really over conservative. (And lame, but it's actually pretty
-  // tricky to compute a true upper bound given the way tdefl's blocking works.)
+  /* This is really over conservative. (And lame, but it's actually pretty
+   * tricky to compute a true upper bound given the way tdefl's blocking works.)
+   */
   return MZ_MAX(128 + (source_len * 110) / 100,
                 128 + source_len + ((source_len / (31 * 1024)) + 1) * 5);
 }
 
 int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len,
-                 const unsigned char *pSource, mz_ulong source_len, int level) {
+                 const unsigned char *pSource, mz_ulong pSource_len,
+                 int level) {
   int status;
   mz_stream stream;
   memset(&stream, 0, sizeof(stream));
 
-  // In case mz_ulong is 64-bits (argh I hate longs).
-  if ((source_len | *pDest_len) > 0xFFFFFFFFU)
+#if defined(__MINGW32__) || defined(__MINGW64__) || defined(__WATCOMC__)
+  /* In case mz_ulong is 64-bits (argh I hate longs). */
+#else
+  if ((mz_uint64)(pSource_len | *pDest_len) > 0xFFFFFFFFU)
     return MZ_PARAM_ERROR;
+#endif
 
   stream.next_in = pSource;
-  stream.avail_in = (mz_uint32)source_len;
+  stream.avail_in = (mz_uint32)pSource_len;
   stream.next_out = pDest;
   stream.avail_out = (mz_uint32)*pDest_len;
 
@@ -1621,6 +2186,10 @@ mz_ulong mz_compressBound(mz_ulong source_len) {
   return mz_deflateBound(NULL, source_len);
 }
 
+#endif /*#ifndef MINIZ_NO_DEFLATE_APIS*/
+
+#ifndef MINIZ_NO_INFLATE_APIS
+
 typedef struct {
   tinfl_decompressor m_decomp;
   mz_uint m_dict_ofs, m_dict_avail, m_first_call, m_has_flushed;
@@ -1644,9 +2213,9 @@ int mz_inflateInit2(mz_streamp pStream, int window_bits) {
   pStream->total_out = 0;
   pStream->reserved = 0;
   if (!pStream->zalloc)
-    pStream->zalloc = def_alloc_func;
+    pStream->zalloc = miniz_def_alloc_func;
   if (!pStream->zfree)
-    pStream->zfree = def_free_func;
+    pStream->zfree = miniz_def_free_func;
 
   pDecomp = (inflate_state *)pStream->zalloc(pStream->opaque, 1,
                                              sizeof(inflate_state));
@@ -1670,6 +2239,31 @@ int mz_inflateInit(mz_streamp pStream) {
   return mz_inflateInit2(pStream, MZ_DEFAULT_WINDOW_BITS);
 }
 
+int mz_inflateReset(mz_streamp pStream) {
+  inflate_state *pDecomp;
+  if (!pStream)
+    return MZ_STREAM_ERROR;
+
+  pStream->data_type = 0;
+  pStream->adler = 0;
+  pStream->msg = NULL;
+  pStream->total_in = 0;
+  pStream->total_out = 0;
+  pStream->reserved = 0;
+
+  pDecomp = (inflate_state *)pStream->state;
+
+  tinfl_init(&pDecomp->m_decomp);
+  pDecomp->m_dict_ofs = 0;
+  pDecomp->m_dict_avail = 0;
+  pDecomp->m_last_status = TINFL_STATUS_NEEDS_MORE_INPUT;
+  pDecomp->m_first_call = 1;
+  pDecomp->m_has_flushed = 0;
+  /* pDecomp->m_window_bits = window_bits */;
+
+  return MZ_OK;
+}
+
 int mz_inflate(mz_streamp pStream, int flush) {
   inflate_state *pState;
   mz_uint n, first_call, decomp_flags = TINFL_FLAG_COMPUTE_ADLER32;
@@ -1698,8 +2292,8 @@ int mz_inflate(mz_streamp pStream, int flush) {
   pState->m_has_flushed |= (flush == MZ_FINISH);
 
   if ((flush == MZ_FINISH) && (first_call)) {
-    // MZ_FINISH on the first call implies that the input and output buffers are
-    // large enough to hold the entire compressed/decompressed file.
+    /* MZ_FINISH on the first call implies that the input and output buffers are
+     * large enough to hold the entire compressed/decompressed file. */
     decomp_flags |= TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF;
     in_bytes = pStream->avail_in;
     out_bytes = pStream->avail_out;
@@ -1723,7 +2317,7 @@ int mz_inflate(mz_streamp pStream, int flush) {
     }
     return MZ_STREAM_END;
   }
-  // flush != MZ_FINISH then we must assume there's more input.
+  /* flush != MZ_FINISH then we must assume there's more input. */
   if (flush != MZ_FINISH)
     decomp_flags |= TINFL_FLAG_HAS_MORE_INPUT;
 
@@ -1766,21 +2360,21 @@ int mz_inflate(mz_streamp pStream, int flush) {
     pState->m_dict_ofs = (pState->m_dict_ofs + n) & (TINFL_LZ_DICT_SIZE - 1);
 
     if (status < 0)
-      return MZ_DATA_ERROR; // Stream is corrupted (there could be some
-                            // uncompressed data left in the output dictionary -
-                            // oh well).
+      return MZ_DATA_ERROR; /* Stream is corrupted (there could be some
+                               uncompressed data left in the output dictionary -
+                               oh well). */
     else if ((status == TINFL_STATUS_NEEDS_MORE_INPUT) && (!orig_avail_in))
-      return MZ_BUF_ERROR; // Signal caller that we can't make forward progress
-                           // without supplying more input or by setting flush
-                           // to MZ_FINISH.
+      return MZ_BUF_ERROR; /* Signal caller that we can't make forward progress
+                              without supplying more input or by setting flush
+                              to MZ_FINISH. */
     else if (flush == MZ_FINISH) {
-      // The output buffer MUST be large to hold the remaining uncompressed data
-      // when flush==MZ_FINISH.
+      /* The output buffer MUST be large to hold the remaining uncompressed data
+       * when flush==MZ_FINISH. */
       if (status == TINFL_STATUS_DONE)
         return pState->m_dict_avail ? MZ_BUF_ERROR : MZ_STREAM_END;
-      // status here must be TINFL_STATUS_HAS_MORE_OUTPUT, which means there's
-      // at least 1 more byte on the way. If there's no more room left in the
-      // output buffer then something is wrong.
+      /* status here must be TINFL_STATUS_HAS_MORE_OUTPUT, which means there's
+       * at least 1 more byte on the way. If there's no more room left in the
+       * output buffer then something is wrong. */
       else if (!pStream->avail_out)
         return MZ_BUF_ERROR;
     } else if ((status == TINFL_STATUS_DONE) || (!pStream->avail_in) ||
@@ -1802,19 +2396,21 @@ int mz_inflateEnd(mz_streamp pStream) {
   }
   return MZ_OK;
 }
-
-int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len,
-                  const unsigned char *pSource, mz_ulong source_len) {
+int mz_uncompress2(unsigned char *pDest, mz_ulong *pDest_len,
+                   const unsigned char *pSource, mz_ulong *pSource_len) {
   mz_stream stream;
   int status;
   memset(&stream, 0, sizeof(stream));
 
-  // In case mz_ulong is 64-bits (argh I hate longs).
-  if ((source_len | *pDest_len) > 0xFFFFFFFFU)
+#if defined(__MINGW32__) || defined(__MINGW64__) || defined(__WATCOMC__)
+  /* In case mz_ulong is 64-bits (argh I hate longs). */
+#else
+  if ((mz_uint64)(*pSource_len | *pDest_len) > 0xFFFFFFFFU)
     return MZ_PARAM_ERROR;
+#endif
 
   stream.next_in = pSource;
-  stream.avail_in = (mz_uint32)source_len;
+  stream.avail_in = (mz_uint32)*pSource_len;
   stream.next_out = pDest;
   stream.avail_out = (mz_uint32)*pDest_len;
 
@@ -1823,6 +2419,7 @@ int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len,
     return status;
 
   status = mz_inflate(&stream, MZ_FINISH);
+  *pSource_len = *pSource_len - stream.avail_in;
   if (status != MZ_STREAM_END) {
     mz_inflateEnd(&stream);
     return ((status == MZ_BUF_ERROR) && (!stream.avail_in)) ? MZ_DATA_ERROR
@@ -1833,6 +2430,13 @@ int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len,
   return mz_inflateEnd(&stream);
 }
 
+int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len,
+                  const unsigned char *pSource, mz_ulong source_len) {
+  return mz_uncompress2(pDest, pDest_len, pSource, &source_len);
+}
+
+#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
+
 const char *mz_error(int err) {
   static struct {
     int m_err;
@@ -1854,685 +2458,74 @@ const char *mz_error(int err) {
   return NULL;
 }
 
-#endif // MINIZ_NO_ZLIB_APIS
+#endif /*MINIZ_NO_ZLIB_APIS */
 
-// ------------------- Low-level Decompression (completely independent from all
-// compression API's)
-
-#define TINFL_MEMCPY(d, s, l) memcpy(d, s, l)
-#define TINFL_MEMSET(p, c, l) memset(p, c, l)
-
-#define TINFL_CR_BEGIN                                                         \
-  switch (r->m_state) {                                                        \
-  case 0:
-#define TINFL_CR_RETURN(state_index, result)                                   \
-  do {                                                                         \
-    status = result;                                                           \
-    r->m_state = state_index;                                                  \
-    goto common_exit;                                                          \
-  case state_index:;                                                           \
-  }                                                                            \
-  MZ_MACRO_END
-#define TINFL_CR_RETURN_FOREVER(state_index, result)                           \
-  do {                                                                         \
-    for (;;) {                                                                 \
-      TINFL_CR_RETURN(state_index, result);                                    \
-    }                                                                          \
-  }                                                                            \
-  MZ_MACRO_END
-#define TINFL_CR_FINISH }
-
-// TODO: If the caller has indicated that there's no more input, and we attempt
-// to read beyond the input buf, then something is wrong with the input because
-// the inflator never reads ahead more than it needs to. Currently
-// TINFL_GET_BYTE() pads the end of the stream with 0's in this scenario.
-#define TINFL_GET_BYTE(state_index, c)                                         \
-  do {                                                                         \
-    if (pIn_buf_cur >= pIn_buf_end) {                                          \
-      for (;;) {                                                               \
-        if (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) {                        \
-          TINFL_CR_RETURN(state_index, TINFL_STATUS_NEEDS_MORE_INPUT);         \
-          if (pIn_buf_cur < pIn_buf_end) {                                     \
-            c = *pIn_buf_cur++;                                                \
-            break;                                                             \
-          }                                                                    \
-        } else {                                                               \
-          c = 0;                                                               \
-          break;                                                               \
-        }                                                                      \
-      }                                                                        \
-    } else                                                                     \
-      c = *pIn_buf_cur++;                                                      \
-  }                                                                            \
-  MZ_MACRO_END
-
-#define TINFL_NEED_BITS(state_index, n)                                        \
-  do {                                                                         \
-    mz_uint c;                                                                 \
-    TINFL_GET_BYTE(state_index, c);                                            \
-    bit_buf |= (((tinfl_bit_buf_t)c) << num_bits);                             \
-    num_bits += 8;                                                             \
-  } while (num_bits < (mz_uint)(n))
-#define TINFL_SKIP_BITS(state_index, n)                                        \
-  do {                                                                         \
-    if (num_bits < (mz_uint)(n)) {                                             \
-      TINFL_NEED_BITS(state_index, n);                                         \
-    }                                                                          \
-    bit_buf >>= (n);                                                           \
-    num_bits -= (n);                                                           \
-  }                                                                            \
-  MZ_MACRO_END
-#define TINFL_GET_BITS(state_index, b, n)                                      \
-  do {                                                                         \
-    if (num_bits < (mz_uint)(n)) {                                             \
-      TINFL_NEED_BITS(state_index, n);                                         \
-    }                                                                          \
-    b = bit_buf & ((1 << (n)) - 1);                                            \
-    bit_buf >>= (n);                                                           \
-    num_bits -= (n);                                                           \
-  }                                                                            \
-  MZ_MACRO_END
-
-// TINFL_HUFF_BITBUF_FILL() is only used rarely, when the number of bytes
-// remaining in the input buffer falls below 2. It reads just enough bytes from
-// the input stream that are needed to decode the next Huffman code (and
-// absolutely no more). It works by trying to fully decode a Huffman code by
-// using whatever bits are currently present in the bit buffer. If this fails,
-// it reads another byte, and tries again until it succeeds or until the bit
-// buffer contains >=15 bits (deflate's max. Huffman code size).
-#define TINFL_HUFF_BITBUF_FILL(state_index, pHuff)                             \
-  do {                                                                         \
-    temp = (pHuff)->m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)];         \
-    if (temp >= 0) {                                                           \
-      code_len = temp >> 9;                                                    \
-      if ((code_len) && (num_bits >= code_len))                                \
-        break;                                                                 \
-    } else if (num_bits > TINFL_FAST_LOOKUP_BITS) {                            \
-      code_len = TINFL_FAST_LOOKUP_BITS;                                       \
-      do {                                                                     \
-        temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)];         \
-      } while ((temp < 0) && (num_bits >= (code_len + 1)));                    \
-      if (temp >= 0)                                                           \
-        break;                                                                 \
-    }                                                                          \
-    TINFL_GET_BYTE(state_index, c);                                            \
-    bit_buf |= (((tinfl_bit_buf_t)c) << num_bits);                             \
-    num_bits += 8;                                                             \
-  } while (num_bits < 15);
-
-// TINFL_HUFF_DECODE() decodes the next Huffman coded symbol. It's more complex
-// than you would initially expect because the zlib API expects the decompressor
-// to never read beyond the final byte of the deflate stream. (In other words,
-// when this macro wants to read another byte from the input, it REALLY needs
-// another byte in order to fully decode the next Huffman code.) Handling this
-// properly is particularly important on raw deflate (non-zlib) streams, which
-// aren't followed by a byte aligned adler-32. The slow path is only executed at
-// the very end of the input buffer.
-#define TINFL_HUFF_DECODE(state_index, sym, pHuff)                             \
-  do {                                                                         \
-    int temp;                                                                  \
-    mz_uint code_len, c;                                                       \
-    if (num_bits < 15) {                                                       \
-      if ((pIn_buf_end - pIn_buf_cur) < 2) {                                   \
-        TINFL_HUFF_BITBUF_FILL(state_index, pHuff);                            \
-      } else {                                                                 \
-        bit_buf |= (((tinfl_bit_buf_t)pIn_buf_cur[0]) << num_bits) |           \
-                   (((tinfl_bit_buf_t)pIn_buf_cur[1]) << (num_bits + 8));      \
-        pIn_buf_cur += 2;                                                      \
-        num_bits += 16;                                                        \
-      }                                                                        \
-    }                                                                          \
-    if ((temp = (pHuff)->m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= \
-        0)                                                                     \
-      code_len = temp >> 9, temp &= 511;                                       \
-    else {                                                                     \
-      code_len = TINFL_FAST_LOOKUP_BITS;                                       \
-      do {                                                                     \
-        temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)];         \
-      } while (temp < 0);                                                      \
-    }                                                                          \
-    sym = temp;                                                                \
-    bit_buf >>= code_len;                                                      \
-    num_bits -= code_len;                                                      \
-  }                                                                            \
-  MZ_MACRO_END
-
-tinfl_status tinfl_decompress(tinfl_decompressor *r,
-                              const mz_uint8 *pIn_buf_next,
-                              size_t *pIn_buf_size, mz_uint8 *pOut_buf_start,
-                              mz_uint8 *pOut_buf_next, size_t *pOut_buf_size,
-                              const mz_uint32 decomp_flags) {
-  static const int s_length_base[31] = {
-      3,  4,  5,  6,  7,  8,  9,  10,  11,  13,  15,  17,  19,  23, 27, 31,
-      35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0,  0};
-  static const int s_length_extra[31] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
-                                         1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4,
-                                         4, 4, 5, 5, 5, 5, 0, 0, 0};
-  static const int s_dist_base[32] = {
-      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, 8193, 12289, 16385, 24577, 0,   0};
-  static const int s_dist_extra[32] = {0, 0, 0,  0,  1,  1,  2,  2,  3,  3,
-                                       4, 4, 5,  5,  6,  6,  7,  7,  8,  8,
-                                       9, 9, 10, 10, 11, 11, 12, 12, 13, 13};
-  static const mz_uint8 s_length_dezigzag[19] = {
-      16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-  static const int s_min_table_sizes[3] = {257, 1, 4};
-
-  tinfl_status status = TINFL_STATUS_FAILED;
-  mz_uint32 num_bits, dist, counter, num_extra;
-  tinfl_bit_buf_t bit_buf;
-  const mz_uint8 *pIn_buf_cur = pIn_buf_next, *const pIn_buf_end =
-                                                  pIn_buf_next + *pIn_buf_size;
-  mz_uint8 *pOut_buf_cur = pOut_buf_next, *const pOut_buf_end =
-                                              pOut_buf_next + *pOut_buf_size;
-  size_t out_buf_size_mask =
-             (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)
-                 ? (size_t)-1
-                 : ((pOut_buf_next - pOut_buf_start) + *pOut_buf_size) - 1,
-         dist_from_out_buf_start;
-
-  // Ensure the output buffer's size is a power of 2, unless the output buffer
-  // is large enough to hold the entire output file (in which case it doesn't
-  // matter).
-  if (((out_buf_size_mask + 1) & out_buf_size_mask) ||
-      (pOut_buf_next < pOut_buf_start)) {
-    *pIn_buf_size = *pOut_buf_size = 0;
-    return TINFL_STATUS_BAD_PARAM;
-  }
-
-  num_bits = r->m_num_bits;
-  bit_buf = r->m_bit_buf;
-  dist = r->m_dist;
-  counter = r->m_counter;
-  num_extra = r->m_num_extra;
-  dist_from_out_buf_start = r->m_dist_from_out_buf_start;
-  TINFL_CR_BEGIN
-
-  bit_buf = num_bits = dist = counter = num_extra = r->m_zhdr0 = r->m_zhdr1 = 0;
-  r->m_z_adler32 = r->m_check_adler32 = 1;
-  if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) {
-    TINFL_GET_BYTE(1, r->m_zhdr0);
-    TINFL_GET_BYTE(2, r->m_zhdr1);
-    counter = (((r->m_zhdr0 * 256 + r->m_zhdr1) % 31 != 0) ||
-               (r->m_zhdr1 & 32) || ((r->m_zhdr0 & 15) != 8));
-    if (!(decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF))
-      counter |= (((1U << (8U + (r->m_zhdr0 >> 4))) > 32768U) ||
-                  ((out_buf_size_mask + 1) <
-                   (size_t)(1U << (8U + (r->m_zhdr0 >> 4)))));
-    if (counter) {
-      TINFL_CR_RETURN_FOREVER(36, TINFL_STATUS_FAILED);
-    }
-  }
-
-  do {
-    TINFL_GET_BITS(3, r->m_final, 3);
-    r->m_type = r->m_final >> 1;
-    if (r->m_type == 0) {
-      TINFL_SKIP_BITS(5, num_bits & 7);
-      for (counter = 0; counter < 4; ++counter) {
-        if (num_bits)
-          TINFL_GET_BITS(6, r->m_raw_header[counter], 8);
-        else
-          TINFL_GET_BYTE(7, r->m_raw_header[counter]);
-      }
-      if ((counter = (r->m_raw_header[0] | (r->m_raw_header[1] << 8))) !=
-          (mz_uint)(0xFFFF ^
-                    (r->m_raw_header[2] | (r->m_raw_header[3] << 8)))) {
-        TINFL_CR_RETURN_FOREVER(39, TINFL_STATUS_FAILED);
-      }
-      while ((counter) && (num_bits)) {
-        TINFL_GET_BITS(51, dist, 8);
-        while (pOut_buf_cur >= pOut_buf_end) {
-          TINFL_CR_RETURN(52, TINFL_STATUS_HAS_MORE_OUTPUT);
-        }
-        *pOut_buf_cur++ = (mz_uint8)dist;
-        counter--;
-      }
-      while (counter) {
-        size_t n;
-        while (pOut_buf_cur >= pOut_buf_end) {
-          TINFL_CR_RETURN(9, TINFL_STATUS_HAS_MORE_OUTPUT);
-        }
-        while (pIn_buf_cur >= pIn_buf_end) {
-          if (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) {
-            TINFL_CR_RETURN(38, TINFL_STATUS_NEEDS_MORE_INPUT);
-          } else {
-            TINFL_CR_RETURN_FOREVER(40, TINFL_STATUS_FAILED);
-          }
-        }
-        n = MZ_MIN(MZ_MIN((size_t)(pOut_buf_end - pOut_buf_cur),
-                          (size_t)(pIn_buf_end - pIn_buf_cur)),
-                   counter);
-        TINFL_MEMCPY(pOut_buf_cur, pIn_buf_cur, n);
-        pIn_buf_cur += n;
-        pOut_buf_cur += n;
-        counter -= (mz_uint)n;
-      }
-    } else if (r->m_type == 3) {
-      TINFL_CR_RETURN_FOREVER(10, TINFL_STATUS_FAILED);
-    } else {
-      if (r->m_type == 1) {
-        mz_uint8 *p = r->m_tables[0].m_code_size;
-        mz_uint i;
-        r->m_table_sizes[0] = 288;
-        r->m_table_sizes[1] = 32;
-        TINFL_MEMSET(r->m_tables[1].m_code_size, 5, 32);
-        for (i = 0; i <= 143; ++i)
-          *p++ = 8;
-        for (; i <= 255; ++i)
-          *p++ = 9;
-        for (; i <= 279; ++i)
-          *p++ = 7;
-        for (; i <= 287; ++i)
-          *p++ = 8;
-      } else {
-        for (counter = 0; counter < 3; counter++) {
-          TINFL_GET_BITS(11, r->m_table_sizes[counter], "\05\05\04"[counter]);
-          r->m_table_sizes[counter] += s_min_table_sizes[counter];
-        }
-        MZ_CLEAR_OBJ(r->m_tables[2].m_code_size);
-        for (counter = 0; counter < r->m_table_sizes[2]; counter++) {
-          mz_uint s;
-          TINFL_GET_BITS(14, s, 3);
-          r->m_tables[2].m_code_size[s_length_dezigzag[counter]] = (mz_uint8)s;
-        }
-        r->m_table_sizes[2] = 19;
-      }
-      for (; (int)r->m_type >= 0; r->m_type--) {
-        int tree_next, tree_cur;
-        tinfl_huff_table *pTable;
-        mz_uint i, j, used_syms, total, sym_index, next_code[17],
-            total_syms[16];
-        pTable = &r->m_tables[r->m_type];
-        MZ_CLEAR_OBJ(total_syms);
-        MZ_CLEAR_OBJ(pTable->m_look_up);
-        MZ_CLEAR_OBJ(pTable->m_tree);
-        for (i = 0; i < r->m_table_sizes[r->m_type]; ++i)
-          total_syms[pTable->m_code_size[i]]++;
-        used_syms = 0, total = 0;
-        next_code[0] = next_code[1] = 0;
-        for (i = 1; i <= 15; ++i) {
-          used_syms += total_syms[i];
-          next_code[i + 1] = (total = ((total + total_syms[i]) << 1));
-        }
-        if ((65536 != total) && (used_syms > 1)) {
-          TINFL_CR_RETURN_FOREVER(35, TINFL_STATUS_FAILED);
-        }
-        for (tree_next = -1, sym_index = 0;
-             sym_index < r->m_table_sizes[r->m_type]; ++sym_index) {
-          mz_uint rev_code = 0, l, cur_code,
-                  code_size = pTable->m_code_size[sym_index];
-          if (!code_size)
-            continue;
-          cur_code = next_code[code_size]++;
-          for (l = code_size; l > 0; l--, cur_code >>= 1)
-            rev_code = (rev_code << 1) | (cur_code & 1);
-          if (code_size <= TINFL_FAST_LOOKUP_BITS) {
-            mz_int16 k = (mz_int16)((code_size << 9) | sym_index);
-            while (rev_code < TINFL_FAST_LOOKUP_SIZE) {
-              pTable->m_look_up[rev_code] = k;
-              rev_code += (1 << code_size);
-            }
-            continue;
-          }
-          if (0 ==
-              (tree_cur = pTable->m_look_up[rev_code &
-                                            (TINFL_FAST_LOOKUP_SIZE - 1)])) {
-            pTable->m_look_up[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)] =
-                (mz_int16)tree_next;
-            tree_cur = tree_next;
-            tree_next -= 2;
-          }
-          rev_code >>= (TINFL_FAST_LOOKUP_BITS - 1);
-          for (j = code_size; j > (TINFL_FAST_LOOKUP_BITS + 1); j--) {
-            tree_cur -= ((rev_code >>= 1) & 1);
-            if (!pTable->m_tree[-tree_cur - 1]) {
-              pTable->m_tree[-tree_cur - 1] = (mz_int16)tree_next;
-              tree_cur = tree_next;
-              tree_next -= 2;
-            } else
-              tree_cur = pTable->m_tree[-tree_cur - 1];
-          }
-          rev_code >>= 1;
-          tree_cur -= (rev_code & 1);
-          pTable->m_tree[-tree_cur - 1] = (mz_int16)sym_index;
-        }
-        if (r->m_type == 2) {
-          for (counter = 0;
-               counter < (r->m_table_sizes[0] + r->m_table_sizes[1]);) {
-            mz_uint s;
-            TINFL_HUFF_DECODE(16, dist, &r->m_tables[2]);
-            if (dist < 16) {
-              r->m_len_codes[counter++] = (mz_uint8)dist;
-              continue;
-            }
-            if ((dist == 16) && (!counter)) {
-              TINFL_CR_RETURN_FOREVER(17, TINFL_STATUS_FAILED);
-            }
-            num_extra = "\02\03\07"[dist - 16];
-            TINFL_GET_BITS(18, s, num_extra);
-            s += "\03\03\013"[dist - 16];
-            TINFL_MEMSET(r->m_len_codes + counter,
-                         (dist == 16) ? r->m_len_codes[counter - 1] : 0, s);
-            counter += s;
-          }
-          if ((r->m_table_sizes[0] + r->m_table_sizes[1]) != counter) {
-            TINFL_CR_RETURN_FOREVER(21, TINFL_STATUS_FAILED);
-          }
-          TINFL_MEMCPY(r->m_tables[0].m_code_size, r->m_len_codes,
-                       r->m_table_sizes[0]);
-          TINFL_MEMCPY(r->m_tables[1].m_code_size,
-                       r->m_len_codes + r->m_table_sizes[0],
-                       r->m_table_sizes[1]);
-        }
-      }
-      for (;;) {
-        mz_uint8 *pSrc;
-        for (;;) {
-          if (((pIn_buf_end - pIn_buf_cur) < 4) ||
-              ((pOut_buf_end - pOut_buf_cur) < 2)) {
-            TINFL_HUFF_DECODE(23, counter, &r->m_tables[0]);
-            if (counter >= 256)
-              break;
-            while (pOut_buf_cur >= pOut_buf_end) {
-              TINFL_CR_RETURN(24, TINFL_STATUS_HAS_MORE_OUTPUT);
-            }
-            *pOut_buf_cur++ = (mz_uint8)counter;
-          } else {
-            int sym2;
-            mz_uint code_len;
-#if TINFL_USE_64BIT_BITBUF
-            if (num_bits < 30) {
-              bit_buf |=
-                  (((tinfl_bit_buf_t)MZ_READ_LE32(pIn_buf_cur)) << num_bits);
-              pIn_buf_cur += 4;
-              num_bits += 32;
-            }
-#else
-            if (num_bits < 15) {
-              bit_buf |=
-                  (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits);
-              pIn_buf_cur += 2;
-              num_bits += 16;
-            }
+#ifdef __cplusplus
+}
 #endif
-            if ((sym2 =
-                     r->m_tables[0]
-                         .m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >=
-                0)
-              code_len = sym2 >> 9;
-            else {
-              code_len = TINFL_FAST_LOOKUP_BITS;
-              do {
-                sym2 = r->m_tables[0]
-                           .m_tree[~sym2 + ((bit_buf >> code_len++) & 1)];
-              } while (sym2 < 0);
-            }
-            counter = sym2;
-            bit_buf >>= code_len;
-            num_bits -= code_len;
-            if (counter & 256)
-              break;
 
-#if !TINFL_USE_64BIT_BITBUF
-            if (num_bits < 15) {
-              bit_buf |=
-                  (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits);
-              pIn_buf_cur += 2;
-              num_bits += 16;
-            }
+/*
+  This is free and unencumbered software released into the public domain.
+
+  Anyone is free to copy, modify, publish, use, compile, sell, or
+  distribute this software, either in source code form or as a compiled
+  binary, for any purpose, commercial or non-commercial, and by any
+  means.
+
+  In jurisdictions that recognize copyright laws, the author or authors
+  of this software dedicate any and all copyright interest in the
+  software to the public domain. We make this dedication for the benefit
+  of the public at large and to the detriment of our heirs and
+  successors. We intend this dedication to be an overt act of
+  relinquishment in perpetuity of all present and future rights to this
+  software under copyright law.
+
+  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 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.
+
+  For more information, please refer to <http://unlicense.org/>
+*/
+/**************************************************************************
+ *
+ * Copyright 2013-2014 RAD Game Tools and Valve Software
+ * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
+ * All Rights Reserved.
+ *
+ * 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.
+ *
+ **************************************************************************/
+
+#ifndef MINIZ_NO_DEFLATE_APIS
+
+#ifdef __cplusplus
+extern "C" {
 #endif
-            if ((sym2 =
-                     r->m_tables[0]
-                         .m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >=
-                0)
-              code_len = sym2 >> 9;
-            else {
-              code_len = TINFL_FAST_LOOKUP_BITS;
-              do {
-                sym2 = r->m_tables[0]
-                           .m_tree[~sym2 + ((bit_buf >> code_len++) & 1)];
-              } while (sym2 < 0);
-            }
-            bit_buf >>= code_len;
-            num_bits -= code_len;
 
-            pOut_buf_cur[0] = (mz_uint8)counter;
-            if (sym2 & 256) {
-              pOut_buf_cur++;
-              counter = sym2;
-              break;
-            }
-            pOut_buf_cur[1] = (mz_uint8)sym2;
-            pOut_buf_cur += 2;
-          }
-        }
-        if ((counter &= 511) == 256)
-          break;
+/* ------------------- Low-level Compression (independent from all decompression
+ * API's) */
 
-        num_extra = s_length_extra[counter - 257];
-        counter = s_length_base[counter - 257];
-        if (num_extra) {
-          mz_uint extra_bits;
-          TINFL_GET_BITS(25, extra_bits, num_extra);
-          counter += extra_bits;
-        }
-
-        TINFL_HUFF_DECODE(26, dist, &r->m_tables[1]);
-        num_extra = s_dist_extra[dist];
-        dist = s_dist_base[dist];
-        if (num_extra) {
-          mz_uint extra_bits;
-          TINFL_GET_BITS(27, extra_bits, num_extra);
-          dist += extra_bits;
-        }
-
-        dist_from_out_buf_start = pOut_buf_cur - pOut_buf_start;
-        if ((dist > dist_from_out_buf_start) &&
-            (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)) {
-          TINFL_CR_RETURN_FOREVER(37, TINFL_STATUS_FAILED);
-        }
-
-        pSrc = pOut_buf_start +
-               ((dist_from_out_buf_start - dist) & out_buf_size_mask);
-
-        if ((MZ_MAX(pOut_buf_cur, pSrc) + counter) > pOut_buf_end) {
-          while (counter--) {
-            while (pOut_buf_cur >= pOut_buf_end) {
-              TINFL_CR_RETURN(53, TINFL_STATUS_HAS_MORE_OUTPUT);
-            }
-            *pOut_buf_cur++ =
-                pOut_buf_start[(dist_from_out_buf_start++ - dist) &
-                               out_buf_size_mask];
-          }
-          continue;
-        }
-#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES
-        else if ((counter >= 9) && (counter <= dist)) {
-          const mz_uint8 *pSrc_end = pSrc + (counter & ~7);
-          do {
-            ((mz_uint32 *)pOut_buf_cur)[0] = ((const mz_uint32 *)pSrc)[0];
-            ((mz_uint32 *)pOut_buf_cur)[1] = ((const mz_uint32 *)pSrc)[1];
-            pOut_buf_cur += 8;
-          } while ((pSrc += 8) < pSrc_end);
-          if ((counter &= 7) < 3) {
-            if (counter) {
-              pOut_buf_cur[0] = pSrc[0];
-              if (counter > 1)
-                pOut_buf_cur[1] = pSrc[1];
-              pOut_buf_cur += counter;
-            }
-            continue;
-          }
-        }
-#endif
-        do {
-          pOut_buf_cur[0] = pSrc[0];
-          pOut_buf_cur[1] = pSrc[1];
-          pOut_buf_cur[2] = pSrc[2];
-          pOut_buf_cur += 3;
-          pSrc += 3;
-        } while ((int)(counter -= 3) > 2);
-        if ((int)counter > 0) {
-          pOut_buf_cur[0] = pSrc[0];
-          if ((int)counter > 1)
-            pOut_buf_cur[1] = pSrc[1];
-          pOut_buf_cur += counter;
-        }
-      }
-    }
-  } while (!(r->m_final & 1));
-  if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) {
-    TINFL_SKIP_BITS(32, num_bits & 7);
-    for (counter = 0; counter < 4; ++counter) {
-      mz_uint s;
-      if (num_bits)
-        TINFL_GET_BITS(41, s, 8);
-      else
-        TINFL_GET_BYTE(42, s);
-      r->m_z_adler32 = (r->m_z_adler32 << 8) | s;
-    }
-  }
-  TINFL_CR_RETURN_FOREVER(34, TINFL_STATUS_DONE);
-  TINFL_CR_FINISH
-
-common_exit:
-  r->m_num_bits = num_bits;
-  r->m_bit_buf = bit_buf;
-  r->m_dist = dist;
-  r->m_counter = counter;
-  r->m_num_extra = num_extra;
-  r->m_dist_from_out_buf_start = dist_from_out_buf_start;
-  *pIn_buf_size = pIn_buf_cur - pIn_buf_next;
-  *pOut_buf_size = pOut_buf_cur - pOut_buf_next;
-  if ((decomp_flags &
-       (TINFL_FLAG_PARSE_ZLIB_HEADER | TINFL_FLAG_COMPUTE_ADLER32)) &&
-      (status >= 0)) {
-    const mz_uint8 *ptr = pOut_buf_next;
-    size_t buf_len = *pOut_buf_size;
-    mz_uint32 i, s1 = r->m_check_adler32 & 0xffff,
-                 s2 = r->m_check_adler32 >> 16;
-    size_t block_len = buf_len % 5552;
-    while (buf_len) {
-      for (i = 0; i + 7 < block_len; i += 8, ptr += 8) {
-        s1 += ptr[0], s2 += s1;
-        s1 += ptr[1], s2 += s1;
-        s1 += ptr[2], s2 += s1;
-        s1 += ptr[3], s2 += s1;
-        s1 += ptr[4], s2 += s1;
-        s1 += ptr[5], s2 += s1;
-        s1 += ptr[6], s2 += s1;
-        s1 += ptr[7], s2 += s1;
-      }
-      for (; i < block_len; ++i)
-        s1 += *ptr++, s2 += s1;
-      s1 %= 65521U, s2 %= 65521U;
-      buf_len -= block_len;
-      block_len = 5552;
-    }
-    r->m_check_adler32 = (s2 << 16) + s1;
-    if ((status == TINFL_STATUS_DONE) &&
-        (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) &&
-        (r->m_check_adler32 != r->m_z_adler32))
-      status = TINFL_STATUS_ADLER32_MISMATCH;
-  }
-  return status;
-}
-
-// Higher level helper functions.
-void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len,
-                                   size_t *pOut_len, int flags) {
-  tinfl_decompressor decomp;
-  void *pBuf = NULL, *pNew_buf;
-  size_t src_buf_ofs = 0, out_buf_capacity = 0;
-  *pOut_len = 0;
-  tinfl_init(&decomp);
-  for (;;) {
-    size_t src_buf_size = src_buf_len - src_buf_ofs,
-           dst_buf_size = out_buf_capacity - *pOut_len, new_out_buf_capacity;
-    tinfl_status status = tinfl_decompress(
-        &decomp, (const mz_uint8 *)pSrc_buf + src_buf_ofs, &src_buf_size,
-        (mz_uint8 *)pBuf, pBuf ? (mz_uint8 *)pBuf + *pOut_len : NULL,
-        &dst_buf_size,
-        (flags & ~TINFL_FLAG_HAS_MORE_INPUT) |
-            TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF);
-    if ((status < 0) || (status == TINFL_STATUS_NEEDS_MORE_INPUT)) {
-      MZ_FREE(pBuf);
-      *pOut_len = 0;
-      return NULL;
-    }
-    src_buf_ofs += src_buf_size;
-    *pOut_len += dst_buf_size;
-    if (status == TINFL_STATUS_DONE)
-      break;
-    new_out_buf_capacity = out_buf_capacity * 2;
-    if (new_out_buf_capacity < 128)
-      new_out_buf_capacity = 128;
-    pNew_buf = MZ_REALLOC(pBuf, new_out_buf_capacity);
-    if (!pNew_buf) {
-      MZ_FREE(pBuf);
-      *pOut_len = 0;
-      return NULL;
-    }
-    pBuf = pNew_buf;
-    out_buf_capacity = new_out_buf_capacity;
-  }
-  return pBuf;
-}
-
-size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len,
-                                   const void *pSrc_buf, size_t src_buf_len,
-                                   int flags) {
-  tinfl_decompressor decomp;
-  tinfl_status status;
-  tinfl_init(&decomp);
-  status =
-      tinfl_decompress(&decomp, (const mz_uint8 *)pSrc_buf, &src_buf_len,
-                       (mz_uint8 *)pOut_buf, (mz_uint8 *)pOut_buf, &out_buf_len,
-                       (flags & ~TINFL_FLAG_HAS_MORE_INPUT) |
-                           TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF);
-  return (status != TINFL_STATUS_DONE) ? TINFL_DECOMPRESS_MEM_TO_MEM_FAILED
-                                       : out_buf_len;
-}
-
-int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size,
-                                     tinfl_put_buf_func_ptr pPut_buf_func,
-                                     void *pPut_buf_user, int flags) {
-  int result = 0;
-  tinfl_decompressor decomp;
-  mz_uint8 *pDict = (mz_uint8 *)MZ_MALLOC(TINFL_LZ_DICT_SIZE);
-  size_t in_buf_ofs = 0, dict_ofs = 0;
-  if (!pDict)
-    return TINFL_STATUS_FAILED;
-  tinfl_init(&decomp);
-  for (;;) {
-    size_t in_buf_size = *pIn_buf_size - in_buf_ofs,
-           dst_buf_size = TINFL_LZ_DICT_SIZE - dict_ofs;
-    tinfl_status status =
-        tinfl_decompress(&decomp, (const mz_uint8 *)pIn_buf + in_buf_ofs,
-                         &in_buf_size, pDict, pDict + dict_ofs, &dst_buf_size,
-                         (flags & ~(TINFL_FLAG_HAS_MORE_INPUT |
-                                    TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)));
-    in_buf_ofs += in_buf_size;
-    if ((dst_buf_size) &&
-        (!(*pPut_buf_func)(pDict + dict_ofs, (int)dst_buf_size, pPut_buf_user)))
-      break;
-    if (status != TINFL_STATUS_HAS_MORE_OUTPUT) {
-      result = (status == TINFL_STATUS_DONE);
-      break;
-    }
-    dict_ofs = (dict_ofs + dst_buf_size) & (TINFL_LZ_DICT_SIZE - 1);
-  }
-  MZ_FREE(pDict);
-  *pIn_buf_size = in_buf_ofs;
-  return result;
-}
-
-// ------------------- Low-level Compression (independent from all decompression
-// API's)
-
-// Purposely making these tables static for faster init and thread safety.
+/* Purposely making these tables static for faster init and thread safety. */
 static const mz_uint16 s_tdefl_len_sym[256] = {
     257, 258, 259, 260, 261, 262, 263, 264, 265, 265, 266, 266, 267, 267, 268,
     268, 269, 269, 269, 269, 270, 270, 270, 270, 271, 271, 271, 271, 272, 272,
@@ -2636,8 +2629,8 @@ static const mz_uint8 s_tdefl_large_dist_extra[128] = {
     13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
     13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13};
 
-// Radix sorts tdefl_sym_freq[] array by 16-bit key m_key. Returns ptr to sorted
-// values.
+/* Radix sorts tdefl_sym_freq[] array by 16-bit key m_key. Returns ptr to sorted
+ * values. */
 typedef struct {
   mz_uint16 m_key, m_sym_index;
 } tdefl_sym_freq;
@@ -2646,7 +2639,7 @@ static tdefl_sym_freq *tdefl_radix_sort_syms(mz_uint num_syms,
                                              tdefl_sym_freq *pSyms1) {
   mz_uint32 total_passes = 2, pass_shift, pass, i, hist[256 * 2];
   tdefl_sym_freq *pCur_syms = pSyms0, *pNew_syms = pSyms1;
-  MZ_CLEAR_OBJ(hist);
+  MZ_CLEAR_ARR(hist);
   for (i = 0; i < num_syms; i++) {
     mz_uint freq = pSyms0[i].m_key;
     hist[freq & 0xFF]++;
@@ -2673,8 +2666,8 @@ static tdefl_sym_freq *tdefl_radix_sort_syms(mz_uint num_syms,
   return pCur_syms;
 }
 
-// tdefl_calculate_minimum_redundancy() originally written by: Alistair Moffat,
-// alistair@cs.mu.oz.au, Jyrki Katajainen, jyrki@diku.dk, November 1996.
+/* tdefl_calculate_minimum_redundancy() originally written by: Alistair Moffat,
+ * alistair@cs.mu.oz.au, Jyrki Katajainen, jyrki@diku.dk, November 1996. */
 static void tdefl_calculate_minimum_redundancy(tdefl_sym_freq *A, int n) {
   int root, leaf, next, avbl, used, dpth;
   if (n == 0)
@@ -2720,7 +2713,7 @@ static void tdefl_calculate_minimum_redundancy(tdefl_sym_freq *A, int n) {
   }
 }
 
-// Limits canonical Huffman code table's max code size.
+/* Limits canonical Huffman code table's max code size. */
 enum { TDEFL_MAX_SUPPORTED_HUFF_CODESIZE = 32 };
 static void tdefl_huffman_enforce_max_code_size(int *pNum_codes,
                                                 int code_list_len,
@@ -2750,7 +2743,7 @@ static void tdefl_optimize_huffman_table(tdefl_compressor *d, int table_num,
                                          int static_table) {
   int i, j, l, num_codes[1 + TDEFL_MAX_SUPPORTED_HUFF_CODESIZE];
   mz_uint next_code[TDEFL_MAX_SUPPORTED_HUFF_CODESIZE + 1];
-  MZ_CLEAR_OBJ(num_codes);
+  MZ_CLEAR_ARR(num_codes);
   if (static_table) {
     for (i = 0; i < table_len; i++)
       num_codes[d->m_huff_code_sizes[table_num][i]]++;
@@ -2774,8 +2767,8 @@ static void tdefl_optimize_huffman_table(tdefl_compressor *d, int table_num,
     tdefl_huffman_enforce_max_code_size(num_codes, num_used_syms,
                                         code_size_limit);
 
-    MZ_CLEAR_OBJ(d->m_huff_code_sizes[table_num]);
-    MZ_CLEAR_OBJ(d->m_huff_codes[table_num]);
+    MZ_CLEAR_ARR(d->m_huff_code_sizes[table_num]);
+    MZ_CLEAR_ARR(d->m_huff_codes[table_num]);
     for (i = 1, j = num_used_syms; i <= code_size_limit; i++)
       for (l = num_codes[i]; l > 0; l--)
         d->m_huff_code_sizes[table_num][pSyms[--j].m_sym_index] = (mz_uint8)(i);
@@ -2816,8 +2809,9 @@ static void tdefl_optimize_huffman_table(tdefl_compressor *d, int table_num,
   {                                                                            \
     if (rle_repeat_count) {                                                    \
       if (rle_repeat_count < 3) {                                              \
-        d->m_huff_count[2][prev_code_size] = (mz_uint16)(                      \
-            d->m_huff_count[2][prev_code_size] + rle_repeat_count);            \
+        d->m_huff_count[2][prev_code_size] =                                   \
+            (mz_uint16)(d->m_huff_count[2][prev_code_size] +                   \
+                        rle_repeat_count);                                     \
         while (rle_repeat_count--)                                             \
           packed_code_sizes[num_packed_code_sizes++] = prev_code_size;         \
       } else {                                                                 \
@@ -2853,7 +2847,7 @@ static void tdefl_optimize_huffman_table(tdefl_compressor *d, int table_num,
     }                                                                          \
   }
 
-static mz_uint8 s_tdefl_packed_code_size_syms_swizzle[] = {
+static const mz_uint8 s_tdefl_packed_code_size_syms_swizzle[] = {
     16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
 
 static void tdefl_start_dynamic_block(tdefl_compressor *d) {
@@ -2877,10 +2871,9 @@ static void tdefl_start_dynamic_block(tdefl_compressor *d) {
     if (d->m_huff_code_sizes[1][num_dist_codes - 1])
       break;
 
-  memcpy(code_sizes_to_pack, &d->m_huff_code_sizes[0][0],
-         sizeof(mz_uint8) * num_lit_codes);
+  memcpy(code_sizes_to_pack, &d->m_huff_code_sizes[0][0], num_lit_codes);
   memcpy(code_sizes_to_pack + num_lit_codes, &d->m_huff_code_sizes[1][0],
-         sizeof(mz_uint8) * num_dist_codes);
+         num_dist_codes);
   total_code_sizes_to_pack = num_lit_codes + num_dist_codes;
   num_packed_code_sizes = 0;
   rle_z_count = 0;
@@ -2991,8 +2984,8 @@ static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d) {
 
     if (flags & 1) {
       mz_uint s0, s1, n0, n1, sym, num_extra_bits;
-      mz_uint match_len = pLZ_codes[0],
-              match_dist = *(const mz_uint16 *)(pLZ_codes + 1);
+      mz_uint match_len = pLZ_codes[0];
+      mz_uint match_dist = (pLZ_codes[1] | (pLZ_codes[2] << 8));
       pLZ_codes += 3;
 
       MZ_ASSERT(d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
@@ -3001,7 +2994,7 @@ static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d) {
       TDEFL_PUT_BITS_FAST(match_len & mz_bitmasks[s_tdefl_len_extra[match_len]],
                           s_tdefl_len_extra[match_len]);
 
-      // This sequence coaxes MSVC into using cmov's vs. jmp's.
+      /* This sequence coaxes MSVC into using cmov's vs. jmp's. */
       s0 = s_tdefl_small_dist_sym[match_dist & 511];
       n0 = s_tdefl_small_dist_extra[match_dist & 511];
       s1 = s_tdefl_large_dist_sym[match_dist >> 8];
@@ -3040,7 +3033,7 @@ static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d) {
     if (pOutput_buf >= d->m_pOutput_buf_end)
       return MZ_FALSE;
 
-    *(mz_uint64 *)pOutput_buf = bit_buffer;
+    memcpy(pOutput_buf, &bit_buffer, sizeof(mz_uint64));
     pOutput_buf += (bits_in >> 3);
     bit_buffer >>= (bits_in & ~7);
     bits_in &= 7;
@@ -3092,6 +3085,7 @@ static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d) {
         sym = s_tdefl_large_dist_sym[match_dist >> 8];
         num_extra_bits = s_tdefl_large_dist_extra[match_dist >> 8];
       }
+      MZ_ASSERT(d->m_huff_code_sizes[1][sym]);
       TDEFL_PUT_BITS(d->m_huff_codes[1][sym], d->m_huff_code_sizes[1][sym]);
       TDEFL_PUT_BITS(match_dist & mz_bitmasks[num_extra_bits], num_extra_bits);
     } else {
@@ -3105,8 +3099,8 @@ static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d) {
 
   return (d->m_pOutput_buf < d->m_pOutput_buf_end);
 }
-#endif // MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN &&
-       // MINIZ_HAS_64BIT_REGISTERS
+#endif /* MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN &&       \
+          MINIZ_HAS_64BIT_REGISTERS */
 
 static mz_bool tdefl_compress_block(tdefl_compressor *d, mz_bool static_block) {
   if (static_block)
@@ -3116,6 +3110,9 @@ static mz_bool tdefl_compress_block(tdefl_compressor *d, mz_bool static_block) {
   return tdefl_compress_lz_codes(d);
 }
 
+static const mz_uint s_tdefl_num_probes[11] = {0,   1,   6,   32,  16,  32,
+                                               128, 256, 512, 768, 1500};
+
 static int tdefl_flush_block(tdefl_compressor *d, int flush) {
   mz_uint saved_bit_buf, saved_bits_in;
   mz_uint8 *pSaved_output_buf;
@@ -3140,8 +3137,29 @@ static int tdefl_flush_block(tdefl_compressor *d, int flush) {
   d->m_pLZ_code_buf -= (d->m_num_flags_left == 8);
 
   if ((d->m_flags & TDEFL_WRITE_ZLIB_HEADER) && (!d->m_block_index)) {
-    TDEFL_PUT_BITS(0x78, 8);
-    TDEFL_PUT_BITS(0x01, 8);
+    const mz_uint8 cmf = 0x78;
+    mz_uint8 flg, flevel = 3;
+    mz_uint header, i, mz_un = sizeof(s_tdefl_num_probes) / sizeof(mz_uint);
+
+    /* Determine compression level by reversing the process in
+     * tdefl_create_comp_flags_from_zip_params() */
+    for (i = 0; i < mz_un; i++)
+      if (s_tdefl_num_probes[i] == (d->m_flags & 0xFFF))
+        break;
+
+    if (i < 2)
+      flevel = 0;
+    else if (i < 6)
+      flevel = 1;
+    else if (i == 6)
+      flevel = 2;
+
+    header = cmf << 8 | (flevel << 6);
+    header += 31 - (header % 31);
+    flg = header & 0xFF;
+
+    TDEFL_PUT_BITS(cmf, 8);
+    TDEFL_PUT_BITS(flg, 8);
   }
 
   TDEFL_PUT_BITS(flush == TDEFL_FINISH, 1);
@@ -3155,8 +3173,8 @@ static int tdefl_flush_block(tdefl_compressor *d, int flush) {
         tdefl_compress_block(d, (d->m_flags & TDEFL_FORCE_ALL_STATIC_BLOCKS) ||
                                     (d->m_total_lz_bytes < 48));
 
-  // If the block gets expanded, forget the current contents of the output
-  // buffer and send a raw block instead.
+  /* If the block gets expanded, forget the current contents of the output
+   * buffer and send a raw block instead. */
   if (((use_raw_block) ||
        ((d->m_total_lz_bytes) && ((d->m_pOutput_buf - pSaved_output_buf + 1U) >=
                                   d->m_total_lz_bytes))) &&
@@ -3177,8 +3195,8 @@ static int tdefl_flush_block(tdefl_compressor *d, int flush) {
           8);
     }
   }
-  // Check for the extremely unlikely (if not impossible) case of the compressed
-  // block not fitting into the output buffer when using dynamic codes.
+  /* Check for the extremely unlikely (if not impossible) case of the compressed
+     block not fitting into the output buffer when using dynamic codes. */
   else if (!comp_block_succeeded) {
     d->m_pOutput_buf = pSaved_output_buf;
     d->m_bit_buffer = saved_bit_buf, d->m_bits_in = saved_bits_in;
@@ -3247,7 +3265,21 @@ static int tdefl_flush_block(tdefl_compressor *d, int flush) {
 }
 
 #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES
-#define TDEFL_READ_UNALIGNED_WORD(p) ((p)[0] | (p)[1] << 8)
+#ifdef MINIZ_UNALIGNED_USE_MEMCPY
+static mz_uint16 TDEFL_READ_UNALIGNED_WORD(const mz_uint8 *p) {
+  mz_uint16 ret;
+  memcpy(&ret, p, sizeof(mz_uint16));
+  return ret;
+}
+static mz_uint16 TDEFL_READ_UNALIGNED_WORD2(const mz_uint16 *p) {
+  mz_uint16 ret;
+  memcpy(&ret, p, sizeof(mz_uint16));
+  return ret;
+}
+#else
+#define TDEFL_READ_UNALIGNED_WORD(p) *(const mz_uint16 *)(p)
+#define TDEFL_READ_UNALIGNED_WORD2(p) *(const mz_uint16 *)(p)
+#endif
 static MZ_FORCEINLINE void
 tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist,
                  mz_uint max_match_len, mz_uint *pMatch_dist,
@@ -3258,7 +3290,7 @@ tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist,
   mz_uint num_probes_left = d->m_max_probes[match_len >= 32];
   const mz_uint16 *s = (const mz_uint16 *)(d->m_dict + pos), *p, *q;
   mz_uint16 c01 = TDEFL_READ_UNALIGNED_WORD(&d->m_dict[pos + match_len - 1]),
-            s01 = *s;
+            s01 = TDEFL_READ_UNALIGNED_WORD2(s);
   MZ_ASSERT(max_match_len <= TDEFL_MAX_MATCH_LEN);
   if (max_match_len <= match_len)
     return;
@@ -3281,16 +3313,20 @@ tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist,
     if (!dist)
       break;
     q = (const mz_uint16 *)(d->m_dict + probe_pos);
-    if (*q != s01)
+    if (TDEFL_READ_UNALIGNED_WORD2(q) != s01)
       continue;
     p = s;
     probe_len = 32;
     do {
-    } while ((*(++p) == *(++q)) && (*(++p) == *(++q)) && (*(++p) == *(++q)) &&
-             (*(++p) == *(++q)) && (--probe_len > 0));
+    } while (
+        (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) &&
+        (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) &&
+        (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) &&
+        (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) &&
+        (--probe_len > 0));
     if (!probe_len) {
       *pMatch_dist = dist;
-      *pMatch_len = MZ_MIN(max_match_len, TDEFL_MAX_MATCH_LEN);
+      *pMatch_len = MZ_MIN(max_match_len, (mz_uint)TDEFL_MAX_MATCH_LEN);
       break;
     } else if ((probe_len = ((mz_uint)(p - s) * 2) +
                             (mz_uint)(*(const mz_uint8 *)p ==
@@ -3350,13 +3386,22 @@ tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist,
     }
   }
 }
-#endif // #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES
+#endif /* #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES */
 
 #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
+#ifdef MINIZ_UNALIGNED_USE_MEMCPY
+static mz_uint32 TDEFL_READ_UNALIGNED_WORD32(const mz_uint8 *p) {
+  mz_uint32 ret;
+  memcpy(&ret, p, sizeof(mz_uint32));
+  return ret;
+}
+#else
+#define TDEFL_READ_UNALIGNED_WORD32(p) *(const mz_uint32 *)(p)
+#endif
 static mz_bool tdefl_compress_fast(tdefl_compressor *d) {
-  // Faster, minimally featured LZRW1-style match+parse loop with better
-  // register utilization. Intended for applications where raw throughput is
-  // valued more highly than ratio.
+  /* Faster, minimally featured LZRW1-style match+parse loop with better
+   * register utilization. Intended for applications where raw throughput is
+   * valued more highly than ratio. */
   mz_uint lookahead_pos = d->m_lookahead_pos,
           lookahead_size = d->m_lookahead_size, dict_size = d->m_dict_size,
           total_lz_bytes = d->m_total_lz_bytes,
@@ -3391,7 +3436,7 @@ static mz_bool tdefl_compress_fast(tdefl_compressor *d) {
     while (lookahead_size >= 4) {
       mz_uint cur_match_dist, cur_match_len = 1;
       mz_uint8 *pCur_dict = d->m_dict + cur_pos;
-      mz_uint first_trigram = (*(const mz_uint32 *)pCur_dict) & 0xFFFFFF;
+      mz_uint first_trigram = TDEFL_READ_UNALIGNED_WORD32(pCur_dict) & 0xFFFFFF;
       mz_uint hash =
           (first_trigram ^ (first_trigram >> (24 - (TDEFL_LZ_HASH_BITS - 8)))) &
           TDEFL_LEVEL1_HASH_SIZE_MASK;
@@ -3400,20 +3445,22 @@ static mz_bool tdefl_compress_fast(tdefl_compressor *d) {
 
       if (((cur_match_dist = (mz_uint16)(lookahead_pos - probe_pos)) <=
            dict_size) &&
-          ((mz_uint32)(
-               *(d->m_dict + (probe_pos & TDEFL_LZ_DICT_SIZE_MASK)) |
-               (*(d->m_dict + ((probe_pos & TDEFL_LZ_DICT_SIZE_MASK) + 1))
-                << 8) |
-               (*(d->m_dict + ((probe_pos & TDEFL_LZ_DICT_SIZE_MASK) + 2))
-                << 16)) == first_trigram)) {
+          ((TDEFL_READ_UNALIGNED_WORD32(
+                d->m_dict + (probe_pos &= TDEFL_LZ_DICT_SIZE_MASK)) &
+            0xFFFFFF) == first_trigram)) {
         const mz_uint16 *p = (const mz_uint16 *)pCur_dict;
-        const mz_uint16 *q =
-            (const mz_uint16 *)(d->m_dict +
-                                (probe_pos & TDEFL_LZ_DICT_SIZE_MASK));
+        const mz_uint16 *q = (const mz_uint16 *)(d->m_dict + probe_pos);
         mz_uint32 probe_len = 32;
         do {
-        } while ((*(++p) == *(++q)) && (*(++p) == *(++q)) &&
-                 (*(++p) == *(++q)) && (*(++p) == *(++q)) && (--probe_len > 0));
+        } while ((TDEFL_READ_UNALIGNED_WORD2(++p) ==
+                  TDEFL_READ_UNALIGNED_WORD2(++q)) &&
+                 (TDEFL_READ_UNALIGNED_WORD2(++p) ==
+                  TDEFL_READ_UNALIGNED_WORD2(++q)) &&
+                 (TDEFL_READ_UNALIGNED_WORD2(++p) ==
+                  TDEFL_READ_UNALIGNED_WORD2(++q)) &&
+                 (TDEFL_READ_UNALIGNED_WORD2(++p) ==
+                  TDEFL_READ_UNALIGNED_WORD2(++q)) &&
+                 (--probe_len > 0));
         cur_match_len = ((mz_uint)(p - (const mz_uint16 *)pCur_dict) * 2) +
                         (mz_uint)(*(const mz_uint8 *)p == *(const mz_uint8 *)q);
         if (!probe_len)
@@ -3437,7 +3484,11 @@ static mz_bool tdefl_compress_fast(tdefl_compressor *d) {
           cur_match_dist--;
 
           pLZ_code_buf[0] = (mz_uint8)(cur_match_len - TDEFL_MIN_MATCH_LEN);
+#ifdef MINIZ_UNALIGNED_USE_MEMCPY
+          memcpy(&pLZ_code_buf[1], &cur_match_dist, sizeof(cur_match_dist));
+#else
           *(mz_uint16 *)(&pLZ_code_buf[1]) = (mz_uint16)cur_match_dist;
+#endif
           pLZ_code_buf += 3;
           *pLZ_flags = (mz_uint8)((*pLZ_flags >> 1) | 0x80);
 
@@ -3461,7 +3512,8 @@ static mz_bool tdefl_compress_fast(tdefl_compressor *d) {
 
       total_lz_bytes += cur_match_len;
       lookahead_pos += cur_match_len;
-      dict_size = MZ_MIN(dict_size + cur_match_len, TDEFL_LZ_DICT_SIZE);
+      dict_size =
+          MZ_MIN(dict_size + cur_match_len, (mz_uint)TDEFL_LZ_DICT_SIZE);
       cur_pos = (cur_pos + cur_match_len) & TDEFL_LZ_DICT_SIZE_MASK;
       MZ_ASSERT(lookahead_size >= cur_match_len);
       lookahead_size -= cur_match_len;
@@ -3498,7 +3550,7 @@ static mz_bool tdefl_compress_fast(tdefl_compressor *d) {
       d->m_huff_count[0][lit]++;
 
       lookahead_pos++;
-      dict_size = MZ_MIN(dict_size + 1, TDEFL_LZ_DICT_SIZE);
+      dict_size = MZ_MIN(dict_size + 1, (mz_uint)TDEFL_LZ_DICT_SIZE);
       cur_pos = (cur_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK;
       lookahead_size--;
 
@@ -3530,7 +3582,7 @@ static mz_bool tdefl_compress_fast(tdefl_compressor *d) {
   d->m_num_flags_left = num_flags_left;
   return MZ_TRUE;
 }
-#endif // MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
+#endif /* MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN */
 
 static MZ_FORCEINLINE void tdefl_record_literal(tdefl_compressor *d,
                                                 mz_uint8 lit) {
@@ -3569,9 +3621,7 @@ tdefl_record_match(tdefl_compressor *d, mz_uint match_len, mz_uint match_dist) {
   s0 = s_tdefl_small_dist_sym[match_dist & 511];
   s1 = s_tdefl_large_dist_sym[(match_dist >> 8) & 127];
   d->m_huff_count[1][(match_dist < 512) ? s0 : s1]++;
-
-  if (match_len >= TDEFL_MIN_MATCH_LEN)
-    d->m_huff_count[0][s_tdefl_len_sym[match_len - TDEFL_MIN_MATCH_LEN]]++;
+  d->m_huff_count[0][s_tdefl_len_sym[match_len - TDEFL_MIN_MATCH_LEN]]++;
 }
 
 static mz_bool tdefl_compress_normal(tdefl_compressor *d) {
@@ -3581,8 +3631,8 @@ static mz_bool tdefl_compress_normal(tdefl_compressor *d) {
 
   while ((src_buf_left) || ((flush) && (d->m_lookahead_size))) {
     mz_uint len_to_move, cur_match_dist, cur_match_len, cur_pos;
-    // Update dictionary and hash chains. Keeps the lookahead size equal to
-    // TDEFL_MAX_MATCH_LEN.
+    /* Update dictionary and hash chains. Keeps the lookahead size equal to
+     * TDEFL_MAX_MATCH_LEN. */
     if ((d->m_lookahead_size + d->m_dict_size) >= (TDEFL_MIN_MATCH_LEN - 1)) {
       mz_uint dst_pos = (d->m_lookahead_pos + d->m_lookahead_size) &
                         TDEFL_LZ_DICT_SIZE_MASK,
@@ -3592,7 +3642,7 @@ static mz_bool tdefl_compress_normal(tdefl_compressor *d) {
                      d->m_dict[(ins_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK];
       mz_uint num_bytes_to_process = (mz_uint)MZ_MIN(
           src_buf_left, TDEFL_MAX_MATCH_LEN - d->m_lookahead_size);
-      const mz_uint8 *pSrc_end = pSrc + num_bytes_to_process;
+      const mz_uint8 *pSrc_end = pSrc ? pSrc + num_bytes_to_process : NULL;
       src_buf_left -= num_bytes_to_process;
       d->m_lookahead_size += num_bytes_to_process;
       while (pSrc != pSrc_end) {
@@ -3633,7 +3683,7 @@ static mz_bool tdefl_compress_normal(tdefl_compressor *d) {
     if ((!flush) && (d->m_lookahead_size < TDEFL_MAX_MATCH_LEN))
       break;
 
-    // Simple lazy/greedy parsing state machine.
+    /* Simple lazy/greedy parsing state machine. */
     len_to_move = 1;
     cur_match_dist = 0;
     cur_match_len =
@@ -3692,13 +3742,14 @@ static mz_bool tdefl_compress_normal(tdefl_compressor *d) {
       d->m_saved_match_dist = cur_match_dist;
       d->m_saved_match_len = cur_match_len;
     }
-    // Move the lookahead forward by len_to_move bytes.
+    /* Move the lookahead forward by len_to_move bytes. */
     d->m_lookahead_pos += len_to_move;
     MZ_ASSERT(d->m_lookahead_size >= len_to_move);
     d->m_lookahead_size -= len_to_move;
-    d->m_dict_size = MZ_MIN(d->m_dict_size + len_to_move, TDEFL_LZ_DICT_SIZE);
-    // Check if it's time to flush the current LZ codes to the internal output
-    // buffer.
+    d->m_dict_size =
+        MZ_MIN(d->m_dict_size + len_to_move, (mz_uint)TDEFL_LZ_DICT_SIZE);
+    /* Check if it's time to flush the current LZ codes to the internal output
+     * buffer. */
     if ((d->m_pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8]) ||
         ((d->m_total_lz_bytes > 31 * 1024) &&
          (((((mz_uint)(d->m_pLZ_code_buf - d->m_lz_code_buf) * 115) >> 7) >=
@@ -3783,7 +3834,7 @@ tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf,
     if (!tdefl_compress_fast(d))
       return d->m_prev_return_status;
   } else
-#endif // #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
+#endif /* #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN */
   {
     if (!tdefl_compress_normal(d))
       return d->m_prev_return_status;
@@ -3801,8 +3852,8 @@ tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf,
       return d->m_prev_return_status;
     d->m_finished = (flush == TDEFL_FINISH);
     if (flush == TDEFL_FULL_FLUSH) {
-      MZ_CLEAR_OBJ(d->m_hash);
-      MZ_CLEAR_OBJ(d->m_next);
+      MZ_CLEAR_ARR(d->m_hash);
+      MZ_CLEAR_ARR(d->m_next);
       d->m_dict_size = 0;
     }
   }
@@ -3826,13 +3877,14 @@ tdefl_status tdefl_init(tdefl_compressor *d,
   d->m_greedy_parsing = (flags & TDEFL_GREEDY_PARSING_FLAG) != 0;
   d->m_max_probes[1] = 1 + (((flags & 0xFFF) >> 2) + 2) / 3;
   if (!(flags & TDEFL_NONDETERMINISTIC_PARSING_FLAG))
-    MZ_CLEAR_OBJ(d->m_hash);
+    MZ_CLEAR_ARR(d->m_hash);
   d->m_lookahead_pos = d->m_lookahead_size = d->m_dict_size =
       d->m_total_lz_bytes = d->m_lz_code_buf_dict_pos = d->m_bits_in = 0;
   d->m_output_flush_ofs = d->m_output_flush_remaining = d->m_finished =
       d->m_block_index = d->m_bit_buffer = d->m_wants_to_finish = 0;
   d->m_pLZ_code_buf = d->m_lz_code_buf + 1;
   d->m_pLZ_flags = d->m_lz_code_buf;
+  *d->m_pLZ_flags = 0;
   d->m_num_flags_left = 8;
   d->m_pOutput_buf = d->m_output_buf;
   d->m_pOutput_buf_end = d->m_output_buf;
@@ -3847,6 +3899,8 @@ tdefl_status tdefl_init(tdefl_compressor *d,
   d->m_pSrc = NULL;
   d->m_src_buf_left = 0;
   d->m_out_buf_ofs = 0;
+  if (!(flags & TDEFL_NONDETERMINISTIC_PARSING_FLAG))
+    MZ_CLEAR_ARR(d->m_dict);
   memset(&d->m_huff_count[0][0], 0,
          sizeof(d->m_huff_count[0][0]) * TDEFL_MAX_HUFF_SYMBOLS_0);
   memset(&d->m_huff_count[1][0], 0,
@@ -3939,13 +3993,9 @@ size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len,
   return out_buf.m_size;
 }
 
-#ifndef MINIZ_NO_ZLIB_APIS
-static const mz_uint s_tdefl_num_probes[11] = {0,   1,   6,   32,  16,  32,
-                                               128, 256, 512, 768, 1500};
-
-// level may actually range from [0,10] (10 is a "hidden" max level, where we
-// want a bit more compression and it's fine if throughput to fall off a cliff
-// on some files).
+/* level may actually range from [0,10] (10 is a "hidden" max level, where we
+ * want a bit more compression and it's fine if throughput to fall off a cliff
+ * on some files). */
 mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits,
                                                 int strategy) {
   mz_uint comp_flags =
@@ -3967,27 +4017,25 @@ mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits,
 
   return comp_flags;
 }
-#endif // MINIZ_NO_ZLIB_APIS
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4121 4127 4244)
-#pragma warning(disable : 4204) // nonstandard extension used : non-constant
-                                // aggregate initializer (also supported by GNU
-                                // C and C99, so no big deal)
+#pragma warning(disable : 4204) /* nonstandard extension used : non-constant   \
+                                   aggregate initializer (also supported by    \
+                                   GNU C and C99, so no big deal) */
 #endif
 
-// Simple PNG writer function by Alex Evans, 2011. Released into the public
-// domain: https://gist.github.com/908299, more context at
-// http://altdevblogaday.org/2011/04/06/a-smaller-jpg-encoder/.
-// This is actually a modification of Alex's original code so PNG files
-// generated by this function pass pngcheck.
+/* Simple PNG writer function by Alex Evans, 2011. Released into the public
+ domain: https://gist.github.com/908299, more context at
+ http://altdevblogaday.org/2011/04/06/a-smaller-jpg-encoder/.
+ This is actually a modification of Alex's original code so PNG files generated
+ by this function pass pngcheck. */
 void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w,
                                                  int h, int num_chans,
                                                  size_t *pLen_out,
                                                  mz_uint level, mz_bool flip) {
-  // Using a local copy of this array here in case MINIZ_NO_ZLIB_APIS was
-  // defined.
+  /* Using a local copy of this array here in case MINIZ_NO_ZLIB_APIS was
+   * defined. */
   static const mz_uint s_tdefl_png_num_probes[11] = {
       0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500};
   tdefl_compressor *pComp =
@@ -4005,10 +4053,10 @@ void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w,
     MZ_FREE(pComp);
     return NULL;
   }
-  // write dummy header
+  /* write dummy header */
   for (z = 41; z; --z)
     tdefl_output_buffer_putter(&z, 1, &out_buf);
-  // compress image data
+  /* compress image data */
   tdefl_init(pComp, tdefl_output_buffer_putter, &out_buf,
              s_tdefl_png_num_probes[MZ_MIN(10, level)] |
                  TDEFL_WRITE_ZLIB_HEADER);
@@ -4024,57 +4072,30 @@ void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w,
     MZ_FREE(out_buf.m_pBuf);
     return NULL;
   }
-  // write real header
+  /* write real header */
   *pLen_out = out_buf.m_size - 41;
   {
     static const mz_uint8 chans[] = {0x00, 0x00, 0x04, 0x02, 0x06};
-    mz_uint8 pnghdr[41] = {0x89,
-                           0x50,
-                           0x4e,
-                           0x47,
-                           0x0d,
-                           0x0a,
-                           0x1a,
-                           0x0a,
-                           0x00,
-                           0x00,
-                           0x00,
-                           0x0d,
-                           0x49,
-                           0x48,
-                           0x44,
-                           0x52,
-                           0,
-                           0,
-                           (mz_uint8)(w >> 8),
-                           (mz_uint8)w,
-                           0,
-                           0,
-                           (mz_uint8)(h >> 8),
-                           (mz_uint8)h,
-                           8,
-                           chans[num_chans],
-                           0,
-                           0,
-                           0,
-                           0,
-                           0,
-                           0,
-                           0,
-                           (mz_uint8)(*pLen_out >> 24),
-                           (mz_uint8)(*pLen_out >> 16),
-                           (mz_uint8)(*pLen_out >> 8),
-                           (mz_uint8)*pLen_out,
-                           0x49,
-                           0x44,
-                           0x41,
-                           0x54};
+    mz_uint8 pnghdr[41] = {0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00,
+                           0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00,
+                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00,
+                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                           0x00, 0x49, 0x44, 0x41, 0x54};
+    pnghdr[18] = (mz_uint8)(w >> 8);
+    pnghdr[19] = (mz_uint8)w;
+    pnghdr[22] = (mz_uint8)(h >> 8);
+    pnghdr[23] = (mz_uint8)h;
+    pnghdr[25] = chans[num_chans];
+    pnghdr[33] = (mz_uint8)(*pLen_out >> 24);
+    pnghdr[34] = (mz_uint8)(*pLen_out >> 16);
+    pnghdr[35] = (mz_uint8)(*pLen_out >> 8);
+    pnghdr[36] = (mz_uint8)*pLen_out;
     c = (mz_uint32)mz_crc32(MZ_CRC32_INIT, pnghdr + 12, 17);
     for (i = 0; i < 4; ++i, c <<= 8)
       ((mz_uint8 *)(pnghdr + 29))[i] = (mz_uint8)(c >> 24);
     memcpy(out_buf.m_pBuf, pnghdr, 41);
   }
-  // write footer (IDAT CRC-32, followed by IEND chunk)
+  /* write footer (IDAT CRC-32, followed by IEND chunk) */
   if (!tdefl_output_buffer_putter(
           "\0\0\0\0\0\0\0\0\x49\x45\x4e\x44\xae\x42\x60\x82", 16, &out_buf)) {
     *pLen_out = 0;
@@ -4086,99 +4107,952 @@ void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w,
                           *pLen_out + 4);
   for (i = 0; i < 4; ++i, c <<= 8)
     (out_buf.m_pBuf + out_buf.m_size - 16)[i] = (mz_uint8)(c >> 24);
-  // compute final size of file, grab compressed data buffer and return
+  /* compute final size of file, grab compressed data buffer and return */
   *pLen_out += 57;
   MZ_FREE(pComp);
   return out_buf.m_pBuf;
 }
 void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h,
                                               int num_chans, size_t *pLen_out) {
-  // Level 6 corresponds to TDEFL_DEFAULT_MAX_PROBES or MZ_DEFAULT_LEVEL (but we
-  // can't depend on MZ_DEFAULT_LEVEL being available in case the zlib API's
-  // where #defined out)
+  /* Level 6 corresponds to TDEFL_DEFAULT_MAX_PROBES or MZ_DEFAULT_LEVEL (but we
+   * can't depend on MZ_DEFAULT_LEVEL being available in case the zlib API's
+   * where #defined out) */
   return tdefl_write_image_to_png_file_in_memory_ex(pImage, w, h, num_chans,
                                                     pLen_out, 6, MZ_FALSE);
 }
 
-// ------------------- .ZIP archive reading
+#ifndef MINIZ_NO_MALLOC
+/* Allocate the tdefl_compressor and tinfl_decompressor structures in C so that
+ */
+/* non-C language bindings to tdefL_ and tinfl_ API don't need to worry about */
+/* structure size and allocation mechanism. */
+tdefl_compressor *tdefl_compressor_alloc(void) {
+  return (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor));
+}
+
+void tdefl_compressor_free(tdefl_compressor *pComp) { MZ_FREE(pComp); }
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*#ifndef MINIZ_NO_DEFLATE_APIS*/
+/**************************************************************************
+ *
+ * Copyright 2013-2014 RAD Game Tools and Valve Software
+ * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
+ * All Rights Reserved.
+ *
+ * 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.
+ *
+ **************************************************************************/
+
+#ifndef MINIZ_NO_INFLATE_APIS
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ------------------- Low-level Decompression (completely independent from all
+ * compression API's) */
+
+#define TINFL_MEMCPY(d, s, l) memcpy(d, s, l)
+#define TINFL_MEMSET(p, c, l) memset(p, c, l)
+
+#define TINFL_CR_BEGIN                                                         \
+  switch (r->m_state) {                                                        \
+  case 0:
+#define TINFL_CR_RETURN(state_index, result)                                   \
+  do {                                                                         \
+    status = result;                                                           \
+    r->m_state = state_index;                                                  \
+    goto common_exit;                                                          \
+  case state_index:;                                                           \
+  }                                                                            \
+  MZ_MACRO_END
+#define TINFL_CR_RETURN_FOREVER(state_index, result)                           \
+  do {                                                                         \
+    for (;;) {                                                                 \
+      TINFL_CR_RETURN(state_index, result);                                    \
+    }                                                                          \
+  }                                                                            \
+  MZ_MACRO_END
+#define TINFL_CR_FINISH }
+
+#define TINFL_GET_BYTE(state_index, c)                                         \
+  do {                                                                         \
+    while (pIn_buf_cur >= pIn_buf_end) {                                       \
+      TINFL_CR_RETURN(state_index,                                             \
+                      (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT)               \
+                          ? TINFL_STATUS_NEEDS_MORE_INPUT                      \
+                          : TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS);         \
+    }                                                                          \
+    c = *pIn_buf_cur++;                                                        \
+  }                                                                            \
+  MZ_MACRO_END
+
+#define TINFL_NEED_BITS(state_index, n)                                        \
+  do {                                                                         \
+    mz_uint c;                                                                 \
+    TINFL_GET_BYTE(state_index, c);                                            \
+    bit_buf |= (((tinfl_bit_buf_t)c) << num_bits);                             \
+    num_bits += 8;                                                             \
+  } while (num_bits < (mz_uint)(n))
+#define TINFL_SKIP_BITS(state_index, n)                                        \
+  do {                                                                         \
+    if (num_bits < (mz_uint)(n)) {                                             \
+      TINFL_NEED_BITS(state_index, n);                                         \
+    }                                                                          \
+    bit_buf >>= (n);                                                           \
+    num_bits -= (n);                                                           \
+  }                                                                            \
+  MZ_MACRO_END
+#define TINFL_GET_BITS(state_index, b, n)                                      \
+  do {                                                                         \
+    if (num_bits < (mz_uint)(n)) {                                             \
+      TINFL_NEED_BITS(state_index, n);                                         \
+    }                                                                          \
+    b = bit_buf & ((1 << (n)) - 1);                                            \
+    bit_buf >>= (n);                                                           \
+    num_bits -= (n);                                                           \
+  }                                                                            \
+  MZ_MACRO_END
+
+/* TINFL_HUFF_BITBUF_FILL() is only used rarely, when the number of bytes
+ * remaining in the input buffer falls below 2. */
+/* It reads just enough bytes from the input stream that are needed to decode
+ * the next Huffman code (and absolutely no more). It works by trying to fully
+ * decode a */
+/* Huffman code by using whatever bits are currently present in the bit buffer.
+ * If this fails, it reads another byte, and tries again until it succeeds or
+ * until the */
+/* bit buffer contains >=15 bits (deflate's max. Huffman code size). */
+#define TINFL_HUFF_BITBUF_FILL(state_index, pLookUp, pTree)                    \
+  do {                                                                         \
+    temp = pLookUp[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)];                    \
+    if (temp >= 0) {                                                           \
+      code_len = temp >> 9;                                                    \
+      if ((code_len) && (num_bits >= code_len))                                \
+        break;                                                                 \
+    } else if (num_bits > TINFL_FAST_LOOKUP_BITS) {                            \
+      code_len = TINFL_FAST_LOOKUP_BITS;                                       \
+      do {                                                                     \
+        temp = pTree[~temp + ((bit_buf >> code_len++) & 1)];                   \
+      } while ((temp < 0) && (num_bits >= (code_len + 1)));                    \
+      if (temp >= 0)                                                           \
+        break;                                                                 \
+    }                                                                          \
+    TINFL_GET_BYTE(state_index, c);                                            \
+    bit_buf |= (((tinfl_bit_buf_t)c) << num_bits);                             \
+    num_bits += 8;                                                             \
+  } while (num_bits < 15);
+
+/* TINFL_HUFF_DECODE() decodes the next Huffman coded symbol. It's more complex
+ * than you would initially expect because the zlib API expects the decompressor
+ * to never read */
+/* beyond the final byte of the deflate stream. (In other words, when this macro
+ * wants to read another byte from the input, it REALLY needs another byte in
+ * order to fully */
+/* decode the next Huffman code.) Handling this properly is particularly
+ * important on raw deflate (non-zlib) streams, which aren't followed by a byte
+ * aligned adler-32. */
+/* The slow path is only executed at the very end of the input buffer. */
+/* v1.16: The original macro handled the case at the very end of the passed-in
+ * input buffer, but we also need to handle the case where the user passes in
+ * 1+zillion bytes */
+/* following the deflate data and our non-conservative read-ahead path won't
+ * kick in here on this code. This is much trickier. */
+#define TINFL_HUFF_DECODE(state_index, sym, pLookUp, pTree)                    \
+  do {                                                                         \
+    int temp;                                                                  \
+    mz_uint code_len, c;                                                       \
+    if (num_bits < 15) {                                                       \
+      if ((pIn_buf_end - pIn_buf_cur) < 2) {                                   \
+        TINFL_HUFF_BITBUF_FILL(state_index, pLookUp, pTree);                   \
+      } else {                                                                 \
+        bit_buf |= (((tinfl_bit_buf_t)pIn_buf_cur[0]) << num_bits) |           \
+                   (((tinfl_bit_buf_t)pIn_buf_cur[1]) << (num_bits + 8));      \
+        pIn_buf_cur += 2;                                                      \
+        num_bits += 16;                                                        \
+      }                                                                        \
+    }                                                                          \
+    if ((temp = pLookUp[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0)         \
+      code_len = temp >> 9, temp &= 511;                                       \
+    else {                                                                     \
+      code_len = TINFL_FAST_LOOKUP_BITS;                                       \
+      do {                                                                     \
+        temp = pTree[~temp + ((bit_buf >> code_len++) & 1)];                   \
+      } while (temp < 0);                                                      \
+    }                                                                          \
+    sym = temp;                                                                \
+    bit_buf >>= code_len;                                                      \
+    num_bits -= code_len;                                                      \
+  }                                                                            \
+  MZ_MACRO_END
+
+static void tinfl_clear_tree(tinfl_decompressor *r) {
+  if (r->m_type == 0)
+    MZ_CLEAR_ARR(r->m_tree_0);
+  else if (r->m_type == 1)
+    MZ_CLEAR_ARR(r->m_tree_1);
+  else
+    MZ_CLEAR_ARR(r->m_tree_2);
+}
+
+tinfl_status tinfl_decompress(tinfl_decompressor *r,
+                              const mz_uint8 *pIn_buf_next,
+                              size_t *pIn_buf_size, mz_uint8 *pOut_buf_start,
+                              mz_uint8 *pOut_buf_next, size_t *pOut_buf_size,
+                              const mz_uint32 decomp_flags) {
+  static const mz_uint16 s_length_base[31] = {
+      3,  4,  5,  6,  7,  8,  9,  10,  11,  13,  15,  17,  19,  23, 27, 31,
+      35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0,  0};
+  static const mz_uint8 s_length_extra[31] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
+                                              1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4,
+                                              4, 4, 5, 5, 5, 5, 0, 0, 0};
+  static const mz_uint16 s_dist_base[32] = {
+      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, 8193, 12289, 16385, 24577, 0,   0};
+  static const mz_uint8 s_dist_extra[32] = {
+      0, 0, 0, 0, 1, 1, 2, 2,  3,  3,  4,  4,  5,  5,  6,
+      6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13};
+  static const mz_uint8 s_length_dezigzag[19] = {
+      16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+  static const mz_uint16 s_min_table_sizes[3] = {257, 1, 4};
+
+  mz_int16 *pTrees[3];
+  mz_uint8 *pCode_sizes[3];
+
+  tinfl_status status = TINFL_STATUS_FAILED;
+  mz_uint32 num_bits, dist, counter, num_extra;
+  tinfl_bit_buf_t bit_buf;
+  const mz_uint8 *pIn_buf_cur = pIn_buf_next, *const pIn_buf_end =
+                                                  pIn_buf_next + *pIn_buf_size;
+  mz_uint8 *pOut_buf_cur = pOut_buf_next, *const pOut_buf_end =
+                                              pOut_buf_next ? pOut_buf_next +
+                                                                  *pOut_buf_size
+                                                            : NULL;
+  size_t out_buf_size_mask =
+             (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)
+                 ? (size_t)-1
+                 : ((pOut_buf_next - pOut_buf_start) + *pOut_buf_size) - 1,
+         dist_from_out_buf_start;
+
+  /* Ensure the output buffer's size is a power of 2, unless the output buffer
+   * is large enough to hold the entire output file (in which case it doesn't
+   * matter). */
+  if (((out_buf_size_mask + 1) & out_buf_size_mask) ||
+      (pOut_buf_next < pOut_buf_start)) {
+    *pIn_buf_size = *pOut_buf_size = 0;
+    return TINFL_STATUS_BAD_PARAM;
+  }
+
+  pTrees[0] = r->m_tree_0;
+  pTrees[1] = r->m_tree_1;
+  pTrees[2] = r->m_tree_2;
+  pCode_sizes[0] = r->m_code_size_0;
+  pCode_sizes[1] = r->m_code_size_1;
+  pCode_sizes[2] = r->m_code_size_2;
+
+  num_bits = r->m_num_bits;
+  bit_buf = r->m_bit_buf;
+  dist = r->m_dist;
+  counter = r->m_counter;
+  num_extra = r->m_num_extra;
+  dist_from_out_buf_start = r->m_dist_from_out_buf_start;
+  TINFL_CR_BEGIN
+
+  bit_buf = num_bits = dist = counter = num_extra = r->m_zhdr0 = r->m_zhdr1 = 0;
+  r->m_z_adler32 = r->m_check_adler32 = 1;
+  if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) {
+    TINFL_GET_BYTE(1, r->m_zhdr0);
+    TINFL_GET_BYTE(2, r->m_zhdr1);
+    counter = (((r->m_zhdr0 * 256 + r->m_zhdr1) % 31 != 0) ||
+               (r->m_zhdr1 & 32) || ((r->m_zhdr0 & 15) != 8));
+    if (!(decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF))
+      counter |= (((1U << (8U + (r->m_zhdr0 >> 4))) > 32768U) ||
+                  ((out_buf_size_mask + 1) <
+                   (size_t)((size_t)1 << (8U + (r->m_zhdr0 >> 4)))));
+    if (counter) {
+      TINFL_CR_RETURN_FOREVER(36, TINFL_STATUS_FAILED);
+    }
+  }
+
+  do {
+    TINFL_GET_BITS(3, r->m_final, 3);
+    r->m_type = r->m_final >> 1;
+    if (r->m_type == 0) {
+      TINFL_SKIP_BITS(5, num_bits & 7);
+      for (counter = 0; counter < 4; ++counter) {
+        if (num_bits)
+          TINFL_GET_BITS(6, r->m_raw_header[counter], 8);
+        else
+          TINFL_GET_BYTE(7, r->m_raw_header[counter]);
+      }
+      if ((counter = (r->m_raw_header[0] | (r->m_raw_header[1] << 8))) !=
+          (mz_uint)(0xFFFF ^
+                    (r->m_raw_header[2] | (r->m_raw_header[3] << 8)))) {
+        TINFL_CR_RETURN_FOREVER(39, TINFL_STATUS_FAILED);
+      }
+      while ((counter) && (num_bits)) {
+        TINFL_GET_BITS(51, dist, 8);
+        while (pOut_buf_cur >= pOut_buf_end) {
+          TINFL_CR_RETURN(52, TINFL_STATUS_HAS_MORE_OUTPUT);
+        }
+        *pOut_buf_cur++ = (mz_uint8)dist;
+        counter--;
+      }
+      while (counter) {
+        size_t n;
+        while (pOut_buf_cur >= pOut_buf_end) {
+          TINFL_CR_RETURN(9, TINFL_STATUS_HAS_MORE_OUTPUT);
+        }
+        while (pIn_buf_cur >= pIn_buf_end) {
+          TINFL_CR_RETURN(38, (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT)
+                                  ? TINFL_STATUS_NEEDS_MORE_INPUT
+                                  : TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS);
+        }
+        n = MZ_MIN(MZ_MIN((size_t)(pOut_buf_end - pOut_buf_cur),
+                          (size_t)(pIn_buf_end - pIn_buf_cur)),
+                   counter);
+        TINFL_MEMCPY(pOut_buf_cur, pIn_buf_cur, n);
+        pIn_buf_cur += n;
+        pOut_buf_cur += n;
+        counter -= (mz_uint)n;
+      }
+    } else if (r->m_type == 3) {
+      TINFL_CR_RETURN_FOREVER(10, TINFL_STATUS_FAILED);
+    } else {
+      if (r->m_type == 1) {
+        mz_uint8 *p = r->m_code_size_0;
+        mz_uint i;
+        r->m_table_sizes[0] = 288;
+        r->m_table_sizes[1] = 32;
+        TINFL_MEMSET(r->m_code_size_1, 5, 32);
+        for (i = 0; i <= 143; ++i)
+          *p++ = 8;
+        for (; i <= 255; ++i)
+          *p++ = 9;
+        for (; i <= 279; ++i)
+          *p++ = 7;
+        for (; i <= 287; ++i)
+          *p++ = 8;
+      } else {
+        for (counter = 0; counter < 3; counter++) {
+          TINFL_GET_BITS(11, r->m_table_sizes[counter], "\05\05\04"[counter]);
+          r->m_table_sizes[counter] += s_min_table_sizes[counter];
+        }
+        MZ_CLEAR_ARR(r->m_code_size_2);
+        for (counter = 0; counter < r->m_table_sizes[2]; counter++) {
+          mz_uint s;
+          TINFL_GET_BITS(14, s, 3);
+          r->m_code_size_2[s_length_dezigzag[counter]] = (mz_uint8)s;
+        }
+        r->m_table_sizes[2] = 19;
+      }
+      for (; (int)r->m_type >= 0; r->m_type--) {
+        int tree_next, tree_cur;
+        mz_int16 *pLookUp;
+        mz_int16 *pTree;
+        mz_uint8 *pCode_size;
+        mz_uint i, j, used_syms, total, sym_index, next_code[17],
+            total_syms[16];
+        pLookUp = r->m_look_up[r->m_type];
+        pTree = pTrees[r->m_type];
+        pCode_size = pCode_sizes[r->m_type];
+        MZ_CLEAR_ARR(total_syms);
+        TINFL_MEMSET(pLookUp, 0, sizeof(r->m_look_up[0]));
+        tinfl_clear_tree(r);
+        for (i = 0; i < r->m_table_sizes[r->m_type]; ++i)
+          total_syms[pCode_size[i]]++;
+        used_syms = 0, total = 0;
+        next_code[0] = next_code[1] = 0;
+        for (i = 1; i <= 15; ++i) {
+          used_syms += total_syms[i];
+          next_code[i + 1] = (total = ((total + total_syms[i]) << 1));
+        }
+        if ((65536 != total) && (used_syms > 1)) {
+          TINFL_CR_RETURN_FOREVER(35, TINFL_STATUS_FAILED);
+        }
+        for (tree_next = -1, sym_index = 0;
+             sym_index < r->m_table_sizes[r->m_type]; ++sym_index) {
+          mz_uint rev_code = 0, l, cur_code, code_size = pCode_size[sym_index];
+          if (!code_size)
+            continue;
+          cur_code = next_code[code_size]++;
+          for (l = code_size; l > 0; l--, cur_code >>= 1)
+            rev_code = (rev_code << 1) | (cur_code & 1);
+          if (code_size <= TINFL_FAST_LOOKUP_BITS) {
+            mz_int16 k = (mz_int16)((code_size << 9) | sym_index);
+            while (rev_code < TINFL_FAST_LOOKUP_SIZE) {
+              pLookUp[rev_code] = k;
+              rev_code += (1 << code_size);
+            }
+            continue;
+          }
+          if (0 ==
+              (tree_cur = pLookUp[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)])) {
+            pLookUp[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)] =
+                (mz_int16)tree_next;
+            tree_cur = tree_next;
+            tree_next -= 2;
+          }
+          rev_code >>= (TINFL_FAST_LOOKUP_BITS - 1);
+          for (j = code_size; j > (TINFL_FAST_LOOKUP_BITS + 1); j--) {
+            tree_cur -= ((rev_code >>= 1) & 1);
+            if (!pTree[-tree_cur - 1]) {
+              pTree[-tree_cur - 1] = (mz_int16)tree_next;
+              tree_cur = tree_next;
+              tree_next -= 2;
+            } else
+              tree_cur = pTree[-tree_cur - 1];
+          }
+          tree_cur -= ((rev_code >>= 1) & 1);
+          pTree[-tree_cur - 1] = (mz_int16)sym_index;
+        }
+        if (r->m_type == 2) {
+          for (counter = 0;
+               counter < (r->m_table_sizes[0] + r->m_table_sizes[1]);) {
+            mz_uint s;
+            TINFL_HUFF_DECODE(16, dist, r->m_look_up[2], r->m_tree_2);
+            if (dist < 16) {
+              r->m_len_codes[counter++] = (mz_uint8)dist;
+              continue;
+            }
+            if ((dist == 16) && (!counter)) {
+              TINFL_CR_RETURN_FOREVER(17, TINFL_STATUS_FAILED);
+            }
+            num_extra = "\02\03\07"[dist - 16];
+            TINFL_GET_BITS(18, s, num_extra);
+            s += "\03\03\013"[dist - 16];
+            TINFL_MEMSET(r->m_len_codes + counter,
+                         (dist == 16) ? r->m_len_codes[counter - 1] : 0, s);
+            counter += s;
+          }
+          if ((r->m_table_sizes[0] + r->m_table_sizes[1]) != counter) {
+            TINFL_CR_RETURN_FOREVER(21, TINFL_STATUS_FAILED);
+          }
+          TINFL_MEMCPY(r->m_code_size_0, r->m_len_codes, r->m_table_sizes[0]);
+          TINFL_MEMCPY(r->m_code_size_1, r->m_len_codes + r->m_table_sizes[0],
+                       r->m_table_sizes[1]);
+        }
+      }
+      for (;;) {
+        mz_uint8 *pSrc;
+        for (;;) {
+          if (((pIn_buf_end - pIn_buf_cur) < 4) ||
+              ((pOut_buf_end - pOut_buf_cur) < 2)) {
+            TINFL_HUFF_DECODE(23, counter, r->m_look_up[0], r->m_tree_0);
+            if (counter >= 256)
+              break;
+            while (pOut_buf_cur >= pOut_buf_end) {
+              TINFL_CR_RETURN(24, TINFL_STATUS_HAS_MORE_OUTPUT);
+            }
+            *pOut_buf_cur++ = (mz_uint8)counter;
+          } else {
+            int sym2;
+            mz_uint code_len;
+#if TINFL_USE_64BIT_BITBUF
+            if (num_bits < 30) {
+              bit_buf |=
+                  (((tinfl_bit_buf_t)MZ_READ_LE32(pIn_buf_cur)) << num_bits);
+              pIn_buf_cur += 4;
+              num_bits += 32;
+            }
+#else
+            if (num_bits < 15) {
+              bit_buf |=
+                  (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits);
+              pIn_buf_cur += 2;
+              num_bits += 16;
+            }
+#endif
+            if ((sym2 =
+                     r->m_look_up[0][bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >=
+                0)
+              code_len = sym2 >> 9;
+            else {
+              code_len = TINFL_FAST_LOOKUP_BITS;
+              do {
+                sym2 = r->m_tree_0[~sym2 + ((bit_buf >> code_len++) & 1)];
+              } while (sym2 < 0);
+            }
+            counter = sym2;
+            bit_buf >>= code_len;
+            num_bits -= code_len;
+            if (counter & 256)
+              break;
+
+#if !TINFL_USE_64BIT_BITBUF
+            if (num_bits < 15) {
+              bit_buf |=
+                  (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits);
+              pIn_buf_cur += 2;
+              num_bits += 16;
+            }
+#endif
+            if ((sym2 =
+                     r->m_look_up[0][bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >=
+                0)
+              code_len = sym2 >> 9;
+            else {
+              code_len = TINFL_FAST_LOOKUP_BITS;
+              do {
+                sym2 = r->m_tree_0[~sym2 + ((bit_buf >> code_len++) & 1)];
+              } while (sym2 < 0);
+            }
+            bit_buf >>= code_len;
+            num_bits -= code_len;
+
+            pOut_buf_cur[0] = (mz_uint8)counter;
+            if (sym2 & 256) {
+              pOut_buf_cur++;
+              counter = sym2;
+              break;
+            }
+            pOut_buf_cur[1] = (mz_uint8)sym2;
+            pOut_buf_cur += 2;
+          }
+        }
+        if ((counter &= 511) == 256)
+          break;
+
+        num_extra = s_length_extra[counter - 257];
+        counter = s_length_base[counter - 257];
+        if (num_extra) {
+          mz_uint extra_bits;
+          TINFL_GET_BITS(25, extra_bits, num_extra);
+          counter += extra_bits;
+        }
+
+        TINFL_HUFF_DECODE(26, dist, r->m_look_up[1], r->m_tree_1);
+        num_extra = s_dist_extra[dist];
+        dist = s_dist_base[dist];
+        if (num_extra) {
+          mz_uint extra_bits;
+          TINFL_GET_BITS(27, extra_bits, num_extra);
+          dist += extra_bits;
+        }
+
+        dist_from_out_buf_start = pOut_buf_cur - pOut_buf_start;
+        if ((dist == 0 || dist > dist_from_out_buf_start ||
+             dist_from_out_buf_start == 0) &&
+            (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)) {
+          TINFL_CR_RETURN_FOREVER(37, TINFL_STATUS_FAILED);
+        }
+
+        pSrc = pOut_buf_start +
+               ((dist_from_out_buf_start - dist) & out_buf_size_mask);
+
+        if ((MZ_MAX(pOut_buf_cur, pSrc) + counter) > pOut_buf_end) {
+          while (counter--) {
+            while (pOut_buf_cur >= pOut_buf_end) {
+              TINFL_CR_RETURN(53, TINFL_STATUS_HAS_MORE_OUTPUT);
+            }
+            *pOut_buf_cur++ =
+                pOut_buf_start[(dist_from_out_buf_start++ - dist) &
+                               out_buf_size_mask];
+          }
+          continue;
+        }
+#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES
+        else if ((counter >= 9) && (counter <= dist)) {
+          const mz_uint8 *pSrc_end = pSrc + (counter & ~7);
+          do {
+#ifdef MINIZ_UNALIGNED_USE_MEMCPY
+            memcpy(pOut_buf_cur, pSrc, sizeof(mz_uint32) * 2);
+#else
+            ((mz_uint32 *)pOut_buf_cur)[0] = ((const mz_uint32 *)pSrc)[0];
+            ((mz_uint32 *)pOut_buf_cur)[1] = ((const mz_uint32 *)pSrc)[1];
+#endif
+            pOut_buf_cur += 8;
+          } while ((pSrc += 8) < pSrc_end);
+          if ((counter &= 7) < 3) {
+            if (counter) {
+              pOut_buf_cur[0] = pSrc[0];
+              if (counter > 1)
+                pOut_buf_cur[1] = pSrc[1];
+              pOut_buf_cur += counter;
+            }
+            continue;
+          }
+        }
+#endif
+        while (counter > 2) {
+          pOut_buf_cur[0] = pSrc[0];
+          pOut_buf_cur[1] = pSrc[1];
+          pOut_buf_cur[2] = pSrc[2];
+          pOut_buf_cur += 3;
+          pSrc += 3;
+          counter -= 3;
+        }
+        if (counter > 0) {
+          pOut_buf_cur[0] = pSrc[0];
+          if (counter > 1)
+            pOut_buf_cur[1] = pSrc[1];
+          pOut_buf_cur += counter;
+        }
+      }
+    }
+  } while (!(r->m_final & 1));
+
+  /* Ensure byte alignment and put back any bytes from the bitbuf if we've
+   * looked ahead too far on gzip, or other Deflate streams followed by
+   * arbitrary data. */
+  /* I'm being super conservative here. A number of simplifications can be made
+   * to the byte alignment part, and the Adler32 check shouldn't ever need to
+   * worry about reading from the bitbuf now. */
+  TINFL_SKIP_BITS(32, num_bits & 7);
+  while ((pIn_buf_cur > pIn_buf_next) && (num_bits >= 8)) {
+    --pIn_buf_cur;
+    num_bits -= 8;
+  }
+  bit_buf &= ~(~(tinfl_bit_buf_t)0 << num_bits);
+  MZ_ASSERT(!num_bits); /* if this assert fires then we've read beyond the end
+                           of non-deflate/zlib streams with following data (such
+                           as gzip streams). */
+
+  if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) {
+    for (counter = 0; counter < 4; ++counter) {
+      mz_uint s;
+      if (num_bits)
+        TINFL_GET_BITS(41, s, 8);
+      else
+        TINFL_GET_BYTE(42, s);
+      r->m_z_adler32 = (r->m_z_adler32 << 8) | s;
+    }
+  }
+  TINFL_CR_RETURN_FOREVER(34, TINFL_STATUS_DONE);
+
+  TINFL_CR_FINISH
+
+common_exit:
+  /* As long as we aren't telling the caller that we NEED more input to make
+   * forward progress: */
+  /* Put back any bytes from the bitbuf in case we've looked ahead too far on
+   * gzip, or other Deflate streams followed by arbitrary data. */
+  /* We need to be very careful here to NOT push back any bytes we definitely
+   * know we need to make forward progress, though, or we'll lock the caller up
+   * into an inf loop. */
+  if ((status != TINFL_STATUS_NEEDS_MORE_INPUT) &&
+      (status != TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS)) {
+    while ((pIn_buf_cur > pIn_buf_next) && (num_bits >= 8)) {
+      --pIn_buf_cur;
+      num_bits -= 8;
+    }
+  }
+  r->m_num_bits = num_bits;
+  r->m_bit_buf = bit_buf & ~(~(tinfl_bit_buf_t)0 << num_bits);
+  r->m_dist = dist;
+  r->m_counter = counter;
+  r->m_num_extra = num_extra;
+  r->m_dist_from_out_buf_start = dist_from_out_buf_start;
+  *pIn_buf_size = pIn_buf_cur - pIn_buf_next;
+  *pOut_buf_size = pOut_buf_cur - pOut_buf_next;
+  if ((decomp_flags &
+       (TINFL_FLAG_PARSE_ZLIB_HEADER | TINFL_FLAG_COMPUTE_ADLER32)) &&
+      (status >= 0)) {
+    const mz_uint8 *ptr = pOut_buf_next;
+    size_t buf_len = *pOut_buf_size;
+    mz_uint32 i, s1 = r->m_check_adler32 & 0xffff,
+                 s2 = r->m_check_adler32 >> 16;
+    size_t block_len = buf_len % 5552;
+    while (buf_len) {
+      for (i = 0; i + 7 < block_len; i += 8, ptr += 8) {
+        s1 += ptr[0], s2 += s1;
+        s1 += ptr[1], s2 += s1;
+        s1 += ptr[2], s2 += s1;
+        s1 += ptr[3], s2 += s1;
+        s1 += ptr[4], s2 += s1;
+        s1 += ptr[5], s2 += s1;
+        s1 += ptr[6], s2 += s1;
+        s1 += ptr[7], s2 += s1;
+      }
+      for (; i < block_len; ++i)
+        s1 += *ptr++, s2 += s1;
+      s1 %= 65521U, s2 %= 65521U;
+      buf_len -= block_len;
+      block_len = 5552;
+    }
+    r->m_check_adler32 = (s2 << 16) + s1;
+    if ((status == TINFL_STATUS_DONE) &&
+        (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) &&
+        (r->m_check_adler32 != r->m_z_adler32))
+      status = TINFL_STATUS_ADLER32_MISMATCH;
+  }
+  return status;
+}
+
+/* Higher level helper functions. */
+void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len,
+                                   size_t *pOut_len, int flags) {
+  tinfl_decompressor decomp;
+  void *pBuf = NULL, *pNew_buf;
+  size_t src_buf_ofs = 0, out_buf_capacity = 0;
+  *pOut_len = 0;
+  tinfl_init(&decomp);
+  for (;;) {
+    size_t src_buf_size = src_buf_len - src_buf_ofs,
+           dst_buf_size = out_buf_capacity - *pOut_len, new_out_buf_capacity;
+    tinfl_status status = tinfl_decompress(
+        &decomp, (const mz_uint8 *)pSrc_buf + src_buf_ofs, &src_buf_size,
+        (mz_uint8 *)pBuf, pBuf ? (mz_uint8 *)pBuf + *pOut_len : NULL,
+        &dst_buf_size,
+        (flags & ~TINFL_FLAG_HAS_MORE_INPUT) |
+            TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF);
+    if ((status < 0) || (status == TINFL_STATUS_NEEDS_MORE_INPUT)) {
+      MZ_FREE(pBuf);
+      *pOut_len = 0;
+      return NULL;
+    }
+    src_buf_ofs += src_buf_size;
+    *pOut_len += dst_buf_size;
+    if (status == TINFL_STATUS_DONE)
+      break;
+    new_out_buf_capacity = out_buf_capacity * 2;
+    if (new_out_buf_capacity < 128)
+      new_out_buf_capacity = 128;
+    pNew_buf = MZ_REALLOC(pBuf, new_out_buf_capacity);
+    if (!pNew_buf) {
+      MZ_FREE(pBuf);
+      *pOut_len = 0;
+      return NULL;
+    }
+    pBuf = pNew_buf;
+    out_buf_capacity = new_out_buf_capacity;
+  }
+  return pBuf;
+}
+
+size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len,
+                                   const void *pSrc_buf, size_t src_buf_len,
+                                   int flags) {
+  tinfl_decompressor decomp;
+  tinfl_status status;
+  tinfl_init(&decomp);
+  status =
+      tinfl_decompress(&decomp, (const mz_uint8 *)pSrc_buf, &src_buf_len,
+                       (mz_uint8 *)pOut_buf, (mz_uint8 *)pOut_buf, &out_buf_len,
+                       (flags & ~TINFL_FLAG_HAS_MORE_INPUT) |
+                           TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF);
+  return (status != TINFL_STATUS_DONE) ? TINFL_DECOMPRESS_MEM_TO_MEM_FAILED
+                                       : out_buf_len;
+}
+
+int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size,
+                                     tinfl_put_buf_func_ptr pPut_buf_func,
+                                     void *pPut_buf_user, int flags) {
+  int result = 0;
+  tinfl_decompressor decomp;
+  mz_uint8 *pDict = (mz_uint8 *)MZ_MALLOC(TINFL_LZ_DICT_SIZE);
+  size_t in_buf_ofs = 0, dict_ofs = 0;
+  if (!pDict)
+    return TINFL_STATUS_FAILED;
+  memset(pDict, 0, TINFL_LZ_DICT_SIZE);
+  tinfl_init(&decomp);
+  for (;;) {
+    size_t in_buf_size = *pIn_buf_size - in_buf_ofs,
+           dst_buf_size = TINFL_LZ_DICT_SIZE - dict_ofs;
+    tinfl_status status =
+        tinfl_decompress(&decomp, (const mz_uint8 *)pIn_buf + in_buf_ofs,
+                         &in_buf_size, pDict, pDict + dict_ofs, &dst_buf_size,
+                         (flags & ~(TINFL_FLAG_HAS_MORE_INPUT |
+                                    TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)));
+    in_buf_ofs += in_buf_size;
+    if ((dst_buf_size) &&
+        (!(*pPut_buf_func)(pDict + dict_ofs, (int)dst_buf_size, pPut_buf_user)))
+      break;
+    if (status != TINFL_STATUS_HAS_MORE_OUTPUT) {
+      result = (status == TINFL_STATUS_DONE);
+      break;
+    }
+    dict_ofs = (dict_ofs + dst_buf_size) & (TINFL_LZ_DICT_SIZE - 1);
+  }
+  MZ_FREE(pDict);
+  *pIn_buf_size = in_buf_ofs;
+  return result;
+}
+
+#ifndef MINIZ_NO_MALLOC
+tinfl_decompressor *tinfl_decompressor_alloc(void) {
+  tinfl_decompressor *pDecomp =
+      (tinfl_decompressor *)MZ_MALLOC(sizeof(tinfl_decompressor));
+  if (pDecomp)
+    tinfl_init(pDecomp);
+  return pDecomp;
+}
+
+void tinfl_decompressor_free(tinfl_decompressor *pDecomp) { MZ_FREE(pDecomp); }
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
+/**************************************************************************
+ *
+ * Copyright 2013-2014 RAD Game Tools and Valve Software
+ * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
+ * Copyright 2016 Martin Raiber
+ * All Rights Reserved.
+ *
+ * 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.
+ *
+ **************************************************************************/
 
 #ifndef MINIZ_NO_ARCHIVE_APIS
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ------------------- .ZIP archive reading */
+
 #ifdef MINIZ_NO_STDIO
 #define MZ_FILE void *
 #else
-#include <stdio.h>
 #include <sys/stat.h>
 
-#if defined(_MSC_VER) || defined(__MINGW32__)
+#if defined(_MSC_VER) || defined(__MINGW64__)
 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 
-static wchar_t *str2wstr(const char *str) {
-  int len = (int) strlen(str) + 1;
-  wchar_t *wstr = malloc(len * sizeof(wchar_t));
-  MultiByteToWideChar(CP_UTF8, 0, str, len * sizeof(char), wstr, len);
-  return wstr;
+static WCHAR *mz_utf8z_to_widechar(const char *str) {
+  int reqChars = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0);
+  WCHAR *wStr = (WCHAR *)malloc(reqChars * sizeof(WCHAR));
+  MultiByteToWideChar(CP_UTF8, 0, str, -1, wStr, reqChars);
+  return wStr;
 }
 
 static FILE *mz_fopen(const char *pFilename, const char *pMode) {
-  wchar_t *wFilename = str2wstr(pFilename);
-  wchar_t *wMode = str2wstr(pMode);
-  FILE *pFile = _wfopen(wFilename, wMode);
-
+  WCHAR *wFilename = mz_utf8z_to_widechar(pFilename);
+  WCHAR *wMode = mz_utf8z_to_widechar(pMode);
+  FILE *pFile = NULL;
+#ifdef ZIP_ENABLE_SHARABLE_FILE_OPEN
+  pFile = _wfopen(wFilename, wMode);
+#else
+  errno_t err = _wfopen_s(&pFile, wFilename, wMode);
+#endif
   free(wFilename);
   free(wMode);
-
+#ifdef ZIP_ENABLE_SHARABLE_FILE_OPEN
   return pFile;
+#else
+  return err ? NULL : pFile;
+#endif
 }
 
 static FILE *mz_freopen(const char *pPath, const char *pMode, FILE *pStream) {
-  wchar_t *wPath = str2wstr(pPath);
-  wchar_t *wMode = str2wstr(pMode);
-  FILE *pFile = _wfreopen(wPath, wMode, pStream);
-
+  WCHAR *wPath = mz_utf8z_to_widechar(pPath);
+  WCHAR *wMode = mz_utf8z_to_widechar(pMode);
+  FILE *pFile = NULL;
+#ifdef ZIP_ENABLE_SHARABLE_FILE_OPEN
+  pFile = _wfreopen(wPath, wMode, pStream);
+#else
+  errno_t err = _wfreopen_s(&pFile, wPath, wMode, pStream);
+#endif
   free(wPath);
   free(wMode);
-
+#ifdef ZIP_ENABLE_SHARABLE_FILE_OPEN
   return pFile;
+#else
+  return err ? NULL : pFile;
+#endif
+}
+
+static int mz_stat64(const char *path, struct __stat64 *buffer) {
+  WCHAR *wPath = mz_utf8z_to_widechar(path);
+  int res = _wstat64(wPath, buffer);
+  free(wPath);
+  return res;
+}
+
+static int mz_mkdir(const char *pDirname) {
+  WCHAR *wDirname = mz_utf8z_to_widechar(pDirname);
+  int res = _wmkdir(wDirname);
+  free(wDirname);
+  return res;
 }
 
 #ifndef MINIZ_NO_TIME
 #include <sys/utime.h>
 #endif
-#define MZ_FILE FILE
 #define MZ_FOPEN mz_fopen
 #define MZ_FCLOSE fclose
 #define MZ_FREAD fread
 #define MZ_FWRITE fwrite
 #define MZ_FTELL64 _ftelli64
 #define MZ_FSEEK64 _fseeki64
-#define MZ_FILE_STAT_STRUCT _stat
-#define MZ_FILE_STAT _stat
+#define MZ_FILE_STAT_STRUCT _stat64
+#define MZ_FILE_STAT mz_stat64
 #define MZ_FFLUSH fflush
 #define MZ_FREOPEN mz_freopen
 #define MZ_DELETE_FILE remove
-#elif defined(__MINGW32__)
+#define MZ_MKDIR(d) mz_mkdir(d)
+
+#elif defined(__MINGW32__) || defined(__WATCOMC__)
 #ifndef MINIZ_NO_TIME
 #include <sys/utime.h>
 #endif
-#define MZ_FILE FILE
-#define MZ_FOPEN(f, m) mz_fopen
+#define MZ_FOPEN(f, m) fopen(f, m)
 #define MZ_FCLOSE fclose
 #define MZ_FREAD fread
 #define MZ_FWRITE fwrite
-#define MZ_FTELL64 ftell
-#define MZ_FSEEK64 fseek
-#define MZ_FILE_STAT_STRUCT _stat
-#define MZ_FILE_STAT _stat
+#define MZ_FTELL64 _ftelli64
+#define MZ_FSEEK64 _fseeki64
+#define MZ_FILE_STAT_STRUCT stat
+#define MZ_FILE_STAT stat
 #define MZ_FFLUSH fflush
-#define MZ_FREOPEN(f, m, s) mz_freopen
+#define MZ_FREOPEN(f, m, s) freopen(f, m, s)
 #define MZ_DELETE_FILE remove
+#define MZ_MKDIR(d) _mkdir(d)
+
 #elif defined(__TINYC__)
 #ifndef MINIZ_NO_TIME
 #include <sys/utime.h>
 #endif
-#define MZ_FILE FILE
 #define MZ_FOPEN(f, m) fopen(f, m)
 #define MZ_FCLOSE fclose
 #define MZ_FREAD fread
@@ -4190,11 +5064,16 @@ static FILE *mz_freopen(const char *pPath, const char *pMode, FILE *pStream) {
 #define MZ_FFLUSH fflush
 #define MZ_FREOPEN(f, m, s) freopen(f, m, s)
 #define MZ_DELETE_FILE remove
-#elif defined(__GNUC__) && _LARGEFILE64_SOURCE
+#if defined(_WIN32) || defined(_WIN64)
+#define MZ_MKDIR(d) _mkdir(d)
+#else
+#define MZ_MKDIR(d) mkdir(d, 0755)
+#endif
+
+#elif defined(__USE_LARGEFILE64) /* gcc, clang */
 #ifndef MINIZ_NO_TIME
 #include <utime.h>
 #endif
-#define MZ_FILE FILE
 #define MZ_FOPEN(f, m) fopen64(f, m)
 #define MZ_FCLOSE fclose
 #define MZ_FREAD fread
@@ -4206,37 +5085,65 @@ static FILE *mz_freopen(const char *pPath, const char *pMode, FILE *pStream) {
 #define MZ_FFLUSH fflush
 #define MZ_FREOPEN(p, m, s) freopen64(p, m, s)
 #define MZ_DELETE_FILE remove
-#else
+#define MZ_MKDIR(d) mkdir(d, 0755)
+
+#elif defined(__APPLE__) || defined(__FreeBSD__)
 #ifndef MINIZ_NO_TIME
 #include <utime.h>
 #endif
-#define MZ_FILE FILE
 #define MZ_FOPEN(f, m) fopen(f, m)
 #define MZ_FCLOSE fclose
 #define MZ_FREAD fread
 #define MZ_FWRITE fwrite
-#if _FILE_OFFSET_BITS == 64 || _POSIX_C_SOURCE >= 200112L
 #define MZ_FTELL64 ftello
 #define MZ_FSEEK64 fseeko
+#define MZ_FILE_STAT_STRUCT stat
+#define MZ_FILE_STAT stat
+#define MZ_FFLUSH fflush
+#define MZ_FREOPEN(p, m, s) freopen(p, m, s)
+#define MZ_DELETE_FILE remove
+#define MZ_MKDIR(d) mkdir(d, 0755)
+
 #else
+#pragma message(                                                               \
+    "Using fopen, ftello, fseeko, stat() etc. path for file I/O - this path may not support large files.")
+#ifndef MINIZ_NO_TIME
+#include <utime.h>
+#endif
+#define MZ_FOPEN(f, m) fopen(f, m)
+#define MZ_FCLOSE fclose
+#define MZ_FREAD fread
+#define MZ_FWRITE fwrite
+#ifdef __STRICT_ANSI__
 #define MZ_FTELL64 ftell
 #define MZ_FSEEK64 fseek
+#else
+#define MZ_FTELL64 ftello
+#define MZ_FSEEK64 fseeko
 #endif
 #define MZ_FILE_STAT_STRUCT stat
 #define MZ_FILE_STAT stat
 #define MZ_FFLUSH fflush
 #define MZ_FREOPEN(f, m, s) freopen(f, m, s)
 #define MZ_DELETE_FILE remove
-#endif // #ifdef _MSC_VER
-#endif // #ifdef MINIZ_NO_STDIO
+#define MZ_MKDIR(d) mkdir(d, 0755)
+#endif /* #ifdef _MSC_VER */
+#endif /* #ifdef MINIZ_NO_STDIO */
+
+#ifndef CHMOD
+// Upon successful completion, a value of 0 is returned.
+// Otherwise, a value of -1 is returned and errno is set to indicate the error.
+// int chmod(const char *path, mode_t mode);
+#define CHMOD(f, m) chmod(f, m)
+#endif
 
 #define MZ_TOLOWER(c) ((((c) >= 'A') && ((c) <= 'Z')) ? ((c) - 'A' + 'a') : (c))
 
-// Various ZIP archive enums. To completely avoid cross platform compiler
-// alignment and platform endian issues, miniz.c doesn't use structs for any of
-// this stuff.
+/* Various ZIP archive enums. To completely avoid cross platform compiler
+ * alignment and platform endian issues, miniz.c doesn't use structs for any of
+ * this stuff. */
 enum {
-  // ZIP archive identifiers and record sizes
+  /* ZIP archive identifiers and record sizes */
   MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG = 0x06054b50,
   MZ_ZIP_CENTRAL_DIR_HEADER_SIG = 0x02014b50,
   MZ_ZIP_LOCAL_DIR_HEADER_SIG = 0x04034b50,
@@ -4254,7 +5161,7 @@ enum {
   MZ_ZIP_DATA_DESCRIPTER_SIZE64 = 24,
   MZ_ZIP_DATA_DESCRIPTER_SIZE32 = 16,
 
-  // Central directory header record offsets
+  /* Central directory header record offsets */
   MZ_ZIP_CDH_SIG_OFS = 0,
   MZ_ZIP_CDH_VERSION_MADE_BY_OFS = 4,
   MZ_ZIP_CDH_VERSION_NEEDED_OFS = 6,
@@ -4272,7 +5179,8 @@ enum {
   MZ_ZIP_CDH_INTERNAL_ATTR_OFS = 36,
   MZ_ZIP_CDH_EXTERNAL_ATTR_OFS = 38,
   MZ_ZIP_CDH_LOCAL_HEADER_OFS = 42,
-  // Local directory header offsets
+
+  /* Local directory header offsets */
   MZ_ZIP_LDH_SIG_OFS = 0,
   MZ_ZIP_LDH_VERSION_NEEDED_OFS = 4,
   MZ_ZIP_LDH_BIT_FLAG_OFS = 6,
@@ -4284,7 +5192,9 @@ enum {
   MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS = 22,
   MZ_ZIP_LDH_FILENAME_LEN_OFS = 26,
   MZ_ZIP_LDH_EXTRA_LEN_OFS = 28,
-  // End of central directory offsets
+  MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR = 1 << 3,
+
+  /* End of central directory offsets */
   MZ_ZIP_ECDH_SIG_OFS = 0,
   MZ_ZIP_ECDH_NUM_THIS_DISK_OFS = 4,
   MZ_ZIP_ECDH_NUM_DISK_CDIR_OFS = 6,
@@ -4332,7 +5242,7 @@ struct mz_zip_internal_state_tag {
   mz_zip_array m_sorted_central_dir_offsets;
 
   /* The flags passed in when the archive is initially opened. */
-  uint32_t m_init_flags;
+  mz_uint32 m_init_flags;
 
   /* MZ_TRUE if the archive has a zip64 end of central directory headers, etc.
    */
@@ -4355,8 +5265,26 @@ struct mz_zip_internal_state_tag {
 
 #define MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(array_ptr, element_size)                 \
   (array_ptr)->m_element_size = element_size
+
+#if defined(DEBUG) || defined(_DEBUG)
+static MZ_FORCEINLINE size_t
+mz_zip_array_range_check(const mz_zip_array *pArray, mz_uint index) {
+  MZ_ASSERT(index < pArray->m_size);
+  return index;
+}
+#define MZ_ZIP_ARRAY_ELEMENT(array_ptr, element_type, index)                   \
+  ((element_type *)((array_ptr)                                                \
+                        ->m_p))[mz_zip_array_range_check(array_ptr, index)]
+#else
 #define MZ_ZIP_ARRAY_ELEMENT(array_ptr, element_type, index)                   \
   ((element_type *)((array_ptr)->m_p))[index]
+#endif
+
+static MZ_FORCEINLINE void mz_zip_array_init(mz_zip_array *pArray,
+                                             mz_uint32 element_size) {
+  memset(pArray, 0, sizeof(mz_zip_array));
+  pArray->m_element_size = element_size;
+}
 
 static MZ_FORCEINLINE void mz_zip_array_clear(mz_zip_archive *pZip,
                                               mz_zip_array *pArray) {
@@ -4419,21 +5347,17 @@ static MZ_FORCEINLINE mz_bool mz_zip_array_push_back(mz_zip_archive *pZip,
                                                      mz_zip_array *pArray,
                                                      const void *pElements,
                                                      size_t n) {
-  if (0 == n)
-    return MZ_TRUE;
-  if (!pElements)
-    return MZ_FALSE;
-
   size_t orig_size = pArray->m_size;
   if (!mz_zip_array_resize(pZip, pArray, orig_size + n, MZ_TRUE))
     return MZ_FALSE;
-  memcpy((mz_uint8 *)pArray->m_p + orig_size * pArray->m_element_size,
-         pElements, n * pArray->m_element_size);
+  if (n > 0)
+    memcpy((mz_uint8 *)pArray->m_p + orig_size * pArray->m_element_size,
+           pElements, n * pArray->m_element_size);
   return MZ_TRUE;
 }
 
 #ifndef MINIZ_NO_TIME
-static time_t mz_zip_dos_to_time_t(int dos_time, int dos_date) {
+static MZ_TIME_T mz_zip_dos_to_time_t(int dos_time, int dos_date) {
   struct tm tm;
   memset(&tm, 0, sizeof(tm));
   tm.tm_isdst = -1;
@@ -4447,7 +5371,7 @@ static time_t mz_zip_dos_to_time_t(int dos_time, int dos_date) {
 }
 
 #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
-static void mz_zip_time_t_to_dos_time(time_t time, mz_uint16 *pDOS_time,
+static void mz_zip_time_t_to_dos_time(MZ_TIME_T time, mz_uint16 *pDOS_time,
                                       mz_uint16 *pDOS_date) {
 #ifdef _MSC_VER
   struct tm tm_struct;
@@ -4472,7 +5396,7 @@ static void mz_zip_time_t_to_dos_time(time_t time, mz_uint16 *pDOS_time,
 #ifndef MINIZ_NO_STDIO
 #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
 static mz_bool mz_zip_get_file_modified_time(const char *pFilename,
-                                             time_t *pTime) {
+                                             MZ_TIME_T *pTime) {
   struct MZ_FILE_STAT_STRUCT file_stat;
 
   /* On Linux with x86 glibc, this call will fail on large files (I think >=
@@ -4486,8 +5410,9 @@ static mz_bool mz_zip_get_file_modified_time(const char *pFilename,
 }
 #endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS*/
 
-static mz_bool mz_zip_set_file_times(const char *pFilename, time_t access_time,
-                                     time_t modified_time) {
+static mz_bool mz_zip_set_file_times(const char *pFilename,
+                                     MZ_TIME_T access_time,
+                                     MZ_TIME_T modified_time) {
   struct utimbuf t;
 
   memset(&t, 0, sizeof(t));
@@ -4507,26 +5432,27 @@ static MZ_FORCEINLINE mz_bool mz_zip_set_error(mz_zip_archive *pZip,
 }
 
 static mz_bool mz_zip_reader_init_internal(mz_zip_archive *pZip,
-                                           mz_uint32 flags) {
+                                           mz_uint flags) {
   (void)flags;
   if ((!pZip) || (pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_INVALID))
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
 
   if (!pZip->m_pAlloc)
-    pZip->m_pAlloc = def_alloc_func;
+    pZip->m_pAlloc = miniz_def_alloc_func;
   if (!pZip->m_pFree)
-    pZip->m_pFree = def_free_func;
+    pZip->m_pFree = miniz_def_free_func;
   if (!pZip->m_pRealloc)
-    pZip->m_pRealloc = def_realloc_func;
+    pZip->m_pRealloc = miniz_def_realloc_func;
 
-  pZip->m_zip_mode = MZ_ZIP_MODE_READING;
   pZip->m_archive_size = 0;
   pZip->m_central_directory_file_ofs = 0;
   pZip->m_total_files = 0;
+  pZip->m_last_error = MZ_ZIP_NO_ERROR;
 
   if (NULL == (pZip->m_pState = (mz_zip_internal_state *)pZip->m_pAlloc(
                    pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_internal_state))))
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
   memset(pZip->m_pState, 0, sizeof(mz_zip_internal_state));
   MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir,
                                 sizeof(mz_uint8));
@@ -4534,6 +5460,12 @@ static mz_bool mz_zip_reader_init_internal(mz_zip_archive *pZip,
                                 sizeof(mz_uint32));
   MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets,
                                 sizeof(mz_uint32));
+  pZip->m_pState->m_init_flags = flags;
+  pZip->m_pState->m_zip64 = MZ_FALSE;
+  pZip->m_pState->m_zip64_has_extended_info_fields = MZ_FALSE;
+
+  pZip->m_zip_mode = MZ_ZIP_MODE_READING;
+
   return MZ_TRUE;
 }
 
@@ -4572,47 +5504,56 @@ mz_zip_reader_filename_less(const mz_zip_array *pCentral_dir_array,
   }                                                                            \
   MZ_MACRO_END
 
-// Heap sort of lowercased filenames, used to help accelerate plain central
-// directory searches by mz_zip_reader_locate_file(). (Could also use qsort(),
-// but it could allocate memory.)
+/* Heap sort of lowercased filenames, used to help accelerate plain central
+ * directory searches by mz_zip_reader_locate_file(). (Could also use qsort(),
+ * but it could allocate memory.) */
 static void
 mz_zip_reader_sort_central_dir_offsets_by_filename(mz_zip_archive *pZip) {
   mz_zip_internal_state *pState = pZip->m_pState;
   const mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets;
   const mz_zip_array *pCentral_dir = &pState->m_central_dir;
-  mz_uint32 *pIndices = &MZ_ZIP_ARRAY_ELEMENT(
-      &pState->m_sorted_central_dir_offsets, mz_uint32, 0);
-  const int size = pZip->m_total_files;
-  int start = (size - 2) >> 1, end;
-  while (start >= 0) {
-    int child, root = start;
+  mz_uint32 *pIndices;
+  mz_uint32 start, end;
+  const mz_uint32 size = pZip->m_total_files;
+
+  if (size <= 1U)
+    return;
+
+  pIndices = &MZ_ZIP_ARRAY_ELEMENT(&pState->m_sorted_central_dir_offsets,
+                                   mz_uint32, 0);
+
+  start = (size - 2U) >> 1U;
+  for (;;) {
+    mz_uint64 child, root = start;
     for (;;) {
-      if ((child = (root << 1) + 1) >= size)
+      if ((child = (root << 1U) + 1U) >= size)
         break;
-      child +=
-          (((child + 1) < size) &&
-           (mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets,
-                                        pIndices[child], pIndices[child + 1])));
+      child += (((child + 1U) < size) &&
+                (mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets,
+                                             pIndices[child],
+                                             pIndices[child + 1U])));
       if (!mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets,
                                        pIndices[root], pIndices[child]))
         break;
       MZ_SWAP_UINT32(pIndices[root], pIndices[child]);
       root = child;
     }
+    if (!start)
+      break;
     start--;
   }
 
   end = size - 1;
   while (end > 0) {
-    int child, root = 0;
+    mz_uint64 child, root = 0;
     MZ_SWAP_UINT32(pIndices[end], pIndices[0]);
     for (;;) {
-      if ((child = (root << 1) + 1) >= end)
+      if ((child = (root << 1U) + 1U) >= end)
         break;
       child +=
-          (((child + 1) < end) &&
+          (((child + 1U) < end) &&
            mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets,
-                                       pIndices[child], pIndices[child + 1]));
+                                       pIndices[child], pIndices[child + 1U]));
       if (!mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets,
                                        pIndices[root], pIndices[child]))
         break;
@@ -4807,7 +5748,8 @@ static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip,
       ((num_this_disk != 1) || (cdir_disk_index != 1)))
     return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK);
 
-  if (cdir_size < pZip->m_total_files * MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)
+  if (cdir_size <
+      (mz_uint64)pZip->m_total_files * MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)
     return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
 
   if ((cdir_ofs + (mz_uint64)cdir_size) > pZip->m_archive_size)
@@ -4974,17 +5916,73 @@ static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip,
   return MZ_TRUE;
 }
 
-mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size,
-                           mz_uint32 flags) {
-  if ((!pZip) || (!pZip->m_pRead))
+void mz_zip_zero_struct(mz_zip_archive *pZip) {
+  if (pZip)
+    MZ_CLEAR_PTR(pZip);
+}
+
+static mz_bool mz_zip_reader_end_internal(mz_zip_archive *pZip,
+                                          mz_bool set_last_error) {
+  mz_bool status = MZ_TRUE;
+
+  if (!pZip)
     return MZ_FALSE;
-  if (!mz_zip_reader_init_internal(pZip, flags))
-    return MZ_FALSE;
-  pZip->m_archive_size = size;
-  if (!mz_zip_reader_read_central_dir(pZip, flags)) {
-    mz_zip_reader_end(pZip);
+
+  if ((!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) ||
+      (pZip->m_zip_mode != MZ_ZIP_MODE_READING)) {
+    if (set_last_error)
+      pZip->m_last_error = MZ_ZIP_INVALID_PARAMETER;
+
     return MZ_FALSE;
   }
+
+  if (pZip->m_pState) {
+    mz_zip_internal_state *pState = pZip->m_pState;
+    pZip->m_pState = NULL;
+
+    mz_zip_array_clear(pZip, &pState->m_central_dir);
+    mz_zip_array_clear(pZip, &pState->m_central_dir_offsets);
+    mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets);
+
+#ifndef MINIZ_NO_STDIO
+    if (pState->m_pFile) {
+      if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE) {
+        if (MZ_FCLOSE(pState->m_pFile) == EOF) {
+          if (set_last_error)
+            pZip->m_last_error = MZ_ZIP_FILE_CLOSE_FAILED;
+          status = MZ_FALSE;
+        }
+      }
+      pState->m_pFile = NULL;
+    }
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+    pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+  }
+  pZip->m_zip_mode = MZ_ZIP_MODE_INVALID;
+
+  return status;
+}
+
+mz_bool mz_zip_reader_end(mz_zip_archive *pZip) {
+  return mz_zip_reader_end_internal(pZip, MZ_TRUE);
+}
+mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size,
+                           mz_uint flags) {
+  if ((!pZip) || (!pZip->m_pRead))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  if (!mz_zip_reader_init_internal(pZip, flags))
+    return MZ_FALSE;
+
+  pZip->m_zip_type = MZ_ZIP_TYPE_USER;
+  pZip->m_archive_size = size;
+
+  if (!mz_zip_reader_read_central_dir(pZip, flags)) {
+    mz_zip_reader_end_internal(pZip, MZ_FALSE);
+    return MZ_FALSE;
+  }
+
   return MZ_TRUE;
 }
 
@@ -4999,22 +5997,35 @@ static size_t mz_zip_mem_read_func(void *pOpaque, mz_uint64 file_ofs,
 }
 
 mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, const void *pMem,
-                               size_t size, mz_uint32 flags) {
+                               size_t size, mz_uint flags) {
+  if (!pMem)
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  if (size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
+    return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
+
   if (!mz_zip_reader_init_internal(pZip, flags))
     return MZ_FALSE;
+
+  pZip->m_zip_type = MZ_ZIP_TYPE_MEMORY;
   pZip->m_archive_size = size;
   pZip->m_pRead = mz_zip_mem_read_func;
   pZip->m_pIO_opaque = pZip;
+  pZip->m_pNeeds_keepalive = NULL;
+
 #ifdef __cplusplus
   pZip->m_pState->m_pMem = const_cast<void *>(pMem);
 #else
   pZip->m_pState->m_pMem = (void *)pMem;
 #endif
+
   pZip->m_pState->m_mem_size = size;
+
   if (!mz_zip_reader_read_central_dir(pZip, flags)) {
-    mz_zip_reader_end(pZip);
+    mz_zip_reader_end_internal(pZip, MZ_FALSE);
     return MZ_FALSE;
   }
+
   return MZ_TRUE;
 }
 
@@ -5023,48 +6034,172 @@ static size_t mz_zip_file_read_func(void *pOpaque, mz_uint64 file_ofs,
                                     void *pBuf, size_t n) {
   mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
   mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile);
+
+  file_ofs += pZip->m_pState->m_file_archive_start_ofs;
+
   if (((mz_int64)file_ofs < 0) ||
       (((cur_ofs != (mz_int64)file_ofs)) &&
        (MZ_FSEEK64(pZip->m_pState->m_pFile, (mz_int64)file_ofs, SEEK_SET))))
     return 0;
+
   return MZ_FREAD(pBuf, 1, n, pZip->m_pState->m_pFile);
 }
 
 mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, const char *pFilename,
                                 mz_uint32 flags) {
+  return mz_zip_reader_init_file_v2(pZip, pFilename, flags, 0, 0);
+}
+
+mz_bool mz_zip_reader_init_file_v2(mz_zip_archive *pZip, const char *pFilename,
+                                   mz_uint flags, mz_uint64 file_start_ofs,
+                                   mz_uint64 archive_size) {
   mz_uint64 file_size;
-  MZ_FILE *pFile = MZ_FOPEN(pFilename, "rb");
+  MZ_FILE *pFile;
+
+  if ((!pZip) || (!pFilename) ||
+      ((archive_size) &&
+       (archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  pFile = MZ_FOPEN(pFilename, "rb");
   if (!pFile)
-    return MZ_FALSE;
-  if (MZ_FSEEK64(pFile, 0, SEEK_END)) {
-    MZ_FCLOSE(pFile);
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
+
+  file_size = archive_size;
+  if (!file_size) {
+    if (MZ_FSEEK64(pFile, 0, SEEK_END)) {
+      MZ_FCLOSE(pFile);
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED);
+    }
+
+    file_size = MZ_FTELL64(pFile);
   }
-  file_size = MZ_FTELL64(pFile);
+
+  /* TODO: Better sanity check archive_size and the # of actual remaining bytes
+   */
+
+  if (file_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) {
+    MZ_FCLOSE(pFile);
+    return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
+  }
+
   if (!mz_zip_reader_init_internal(pZip, flags)) {
     MZ_FCLOSE(pFile);
     return MZ_FALSE;
   }
+
+  pZip->m_zip_type = MZ_ZIP_TYPE_FILE;
   pZip->m_pRead = mz_zip_file_read_func;
   pZip->m_pIO_opaque = pZip;
   pZip->m_pState->m_pFile = pFile;
   pZip->m_archive_size = file_size;
+  pZip->m_pState->m_file_archive_start_ofs = file_start_ofs;
+
   if (!mz_zip_reader_read_central_dir(pZip, flags)) {
-    mz_zip_reader_end(pZip);
+    mz_zip_reader_end_internal(pZip, MZ_FALSE);
     return MZ_FALSE;
   }
+
   return MZ_TRUE;
 }
-#endif // #ifndef MINIZ_NO_STDIO
 
-mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip) {
-  return pZip ? pZip->m_total_files : 0;
+mz_bool mz_zip_reader_init_file_v2_rpb(mz_zip_archive *pZip,
+                                       const char *pFilename, mz_uint flags,
+                                       mz_uint64 file_start_ofs,
+                                       mz_uint64 archive_size) {
+  mz_uint64 file_size;
+  MZ_FILE *pFile;
+
+  if ((!pZip) || (!pFilename) ||
+      ((archive_size) &&
+       (archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  pFile = MZ_FOPEN(pFilename, "r+b");
+  if (!pFile)
+    return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
+
+  file_size = archive_size;
+  if (!file_size) {
+    if (MZ_FSEEK64(pFile, 0, SEEK_END)) {
+      MZ_FCLOSE(pFile);
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED);
+    }
+
+    file_size = MZ_FTELL64(pFile);
+  }
+
+  /* TODO: Better sanity check archive_size and the # of actual remaining bytes
+   */
+
+  if (file_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) {
+    MZ_FCLOSE(pFile);
+    return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
+  }
+
+  if (!mz_zip_reader_init_internal(pZip, flags)) {
+    MZ_FCLOSE(pFile);
+    return MZ_FALSE;
+  }
+
+  pZip->m_zip_type = MZ_ZIP_TYPE_FILE;
+  pZip->m_pRead = mz_zip_file_read_func;
+  pZip->m_pIO_opaque = pZip;
+  pZip->m_pState->m_pFile = pFile;
+  pZip->m_archive_size = file_size;
+  pZip->m_pState->m_file_archive_start_ofs = file_start_ofs;
+
+  if (!mz_zip_reader_read_central_dir(pZip, flags)) {
+    mz_zip_reader_end_internal(pZip, MZ_FALSE);
+    return MZ_FALSE;
+  }
+
+  return MZ_TRUE;
 }
 
-static MZ_FORCEINLINE const mz_uint8 *
-mz_zip_reader_get_cdh(mz_zip_archive *pZip, mz_uint file_index) {
-  if ((!pZip) || (!pZip->m_pState) || (file_index >= pZip->m_total_files) ||
-      (pZip->m_zip_mode != MZ_ZIP_MODE_READING))
+mz_bool mz_zip_reader_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile,
+                                 mz_uint64 archive_size, mz_uint flags) {
+  mz_uint64 cur_file_ofs;
+
+  if ((!pZip) || (!pFile))
+    return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
+
+  cur_file_ofs = MZ_FTELL64(pFile);
+
+  if (!archive_size) {
+    if (MZ_FSEEK64(pFile, 0, SEEK_END))
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED);
+
+    archive_size = MZ_FTELL64(pFile) - cur_file_ofs;
+
+    if (archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
+      return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
+  }
+
+  if (!mz_zip_reader_init_internal(pZip, flags))
+    return MZ_FALSE;
+
+  pZip->m_zip_type = MZ_ZIP_TYPE_CFILE;
+  pZip->m_pRead = mz_zip_file_read_func;
+
+  pZip->m_pIO_opaque = pZip;
+  pZip->m_pState->m_pFile = pFile;
+  pZip->m_archive_size = archive_size;
+  pZip->m_pState->m_file_archive_start_ofs = cur_file_ofs;
+
+  if (!mz_zip_reader_read_central_dir(pZip, flags)) {
+    mz_zip_reader_end_internal(pZip, MZ_FALSE);
+    return MZ_FALSE;
+  }
+
+  return MZ_TRUE;
+}
+
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+static MZ_FORCEINLINE const mz_uint8 *mz_zip_get_cdh(mz_zip_archive *pZip,
+                                                     mz_uint file_index) {
+  if ((!pZip) || (!pZip->m_pState) || (file_index >= pZip->m_total_files))
     return NULL;
   return &MZ_ZIP_ARRAY_ELEMENT(
       &pZip->m_pState->m_central_dir, mz_uint8,
@@ -5075,47 +6210,99 @@ mz_zip_reader_get_cdh(mz_zip_archive *pZip, mz_uint file_index) {
 mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip,
                                         mz_uint file_index) {
   mz_uint m_bit_flag;
-  const mz_uint8 *p = mz_zip_reader_get_cdh(pZip, file_index);
-  if (!p)
+  const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
+  if (!p) {
+    mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
     return MZ_FALSE;
+  }
+
   m_bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
-  return (m_bit_flag & 1);
+  return (m_bit_flag &
+          (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED |
+           MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION)) != 0;
+}
+
+mz_bool mz_zip_reader_is_file_supported(mz_zip_archive *pZip,
+                                        mz_uint file_index) {
+  mz_uint bit_flag;
+  mz_uint method;
+
+  const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
+  if (!p) {
+    mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+    return MZ_FALSE;
+  }
+
+  method = MZ_READ_LE16(p + MZ_ZIP_CDH_METHOD_OFS);
+  bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
+
+  if ((method != 0) && (method != MZ_DEFLATED)) {
+    mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
+    return MZ_FALSE;
+  }
+
+  if (bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED |
+                  MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION)) {
+    mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
+    return MZ_FALSE;
+  }
+
+  if (bit_flag & MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG) {
+    mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
+    return MZ_FALSE;
+  }
+
+  return MZ_TRUE;
 }
 
 mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip,
                                           mz_uint file_index) {
-  mz_uint filename_len, external_attr;
-  const mz_uint8 *p = mz_zip_reader_get_cdh(pZip, file_index);
-  if (!p)
+  mz_uint filename_len, attribute_mapping_id, external_attr;
+  const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
+  if (!p) {
+    mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
     return MZ_FALSE;
+  }
 
-  // First see if the filename ends with a '/' character.
   filename_len = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
   if (filename_len) {
     if (*(p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_len - 1) == '/')
       return MZ_TRUE;
   }
 
-  // Bugfix: This code was also checking if the internal attribute was non-zero,
-  // which wasn't correct. Most/all zip writers (hopefully) set DOS
-  // file/directory attributes in the low 16-bits, so check for the DOS
-  // directory flag and ignore the source OS ID in the created by field.
-  // FIXME: Remove this check? Is it necessary - we already check the filename.
+  /* Bugfix: This code was also checking if the internal attribute was non-zero,
+   * which wasn't correct. */
+  /* Most/all zip writers (hopefully) set DOS file/directory attributes in the
+   * low 16-bits, so check for the DOS directory flag and ignore the source OS
+   * ID in the created by field. */
+  /* FIXME: Remove this check? Is it necessary - we already check the filename.
+   */
+  attribute_mapping_id = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_MADE_BY_OFS) >> 8;
+  (void)attribute_mapping_id;
+
   external_attr = MZ_READ_LE32(p + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS);
-  if ((external_attr & 0x10) != 0)
+  if ((external_attr & MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG) != 0) {
     return MZ_TRUE;
+  }
 
   return MZ_FALSE;
 }
 
-mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index,
-                                mz_zip_archive_file_stat *pStat) {
+static mz_bool mz_zip_file_stat_internal(mz_zip_archive *pZip,
+                                         mz_uint file_index,
+                                         const mz_uint8 *pCentral_dir_header,
+                                         mz_zip_archive_file_stat *pStat,
+                                         mz_bool *pFound_zip64_extra_data) {
   mz_uint n;
-  const mz_uint8 *p = mz_zip_reader_get_cdh(pZip, file_index);
-  if ((!p) || (!pStat))
-    return MZ_FALSE;
+  const mz_uint8 *p = pCentral_dir_header;
 
-  // Unpack the central directory record.
+  if (pFound_zip64_extra_data)
+    *pFound_zip64_extra_data = MZ_FALSE;
+
+  if ((!p) || (!pStat))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  /* Extract fields from the central directory record. */
   pStat->m_file_index = file_index;
   pStat->m_central_dir_ofs = MZ_ZIP_ARRAY_ELEMENT(
       &pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index);
@@ -5135,7 +6322,7 @@ mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index,
   pStat->m_external_attr = MZ_READ_LE32(p + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS);
   pStat->m_local_header_ofs = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS);
 
-  // Copy as much of the filename and comment as possible.
+  /* Copy as much of the filename and comment as possible. */
   n = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
   n = MZ_MIN(n, MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE - 1);
   memcpy(pStat->m_filename, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n);
@@ -5151,31 +6338,88 @@ mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index,
          n);
   pStat->m_comment[n] = '\0';
 
+  /* Set some flags for convienance */
+  pStat->m_is_directory = mz_zip_reader_is_file_a_directory(pZip, file_index);
+  pStat->m_is_encrypted = mz_zip_reader_is_file_encrypted(pZip, file_index);
+  pStat->m_is_supported = mz_zip_reader_is_file_supported(pZip, file_index);
+
+  /* See if we need to read any zip64 extended information fields. */
+  /* Confusingly, these zip64 fields can be present even on non-zip64 archives
+   * (Debian zip on a huge files from stdin piped to stdout creates them). */
+  if (MZ_MAX(MZ_MAX(pStat->m_comp_size, pStat->m_uncomp_size),
+             pStat->m_local_header_ofs) == MZ_UINT32_MAX) {
+    /* Attempt to find zip64 extended information field in the entry's extra
+     * data */
+    mz_uint32 extra_size_remaining = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS);
+
+    if (extra_size_remaining) {
+      const mz_uint8 *pExtra_data =
+          p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE +
+          MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
+
+      do {
+        mz_uint32 field_id;
+        mz_uint32 field_data_size;
+
+        if (extra_size_remaining < (sizeof(mz_uint16) * 2))
+          return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+        field_id = MZ_READ_LE16(pExtra_data);
+        field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
+
+        if ((field_data_size + sizeof(mz_uint16) * 2) > extra_size_remaining)
+          return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+        if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) {
+          const mz_uint8 *pField_data = pExtra_data + sizeof(mz_uint16) * 2;
+          mz_uint32 field_data_remaining = field_data_size;
+
+          if (pFound_zip64_extra_data)
+            *pFound_zip64_extra_data = MZ_TRUE;
+
+          if (pStat->m_uncomp_size == MZ_UINT32_MAX) {
+            if (field_data_remaining < sizeof(mz_uint64))
+              return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+            pStat->m_uncomp_size = MZ_READ_LE64(pField_data);
+            pField_data += sizeof(mz_uint64);
+            field_data_remaining -= sizeof(mz_uint64);
+          }
+
+          if (pStat->m_comp_size == MZ_UINT32_MAX) {
+            if (field_data_remaining < sizeof(mz_uint64))
+              return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+            pStat->m_comp_size = MZ_READ_LE64(pField_data);
+            pField_data += sizeof(mz_uint64);
+            field_data_remaining -= sizeof(mz_uint64);
+          }
+
+          if (pStat->m_local_header_ofs == MZ_UINT32_MAX) {
+            if (field_data_remaining < sizeof(mz_uint64))
+              return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+            pStat->m_local_header_ofs = MZ_READ_LE64(pField_data);
+            pField_data += sizeof(mz_uint64);
+            field_data_remaining -= sizeof(mz_uint64);
+          }
+
+          break;
+        }
+
+        pExtra_data += sizeof(mz_uint16) * 2 + field_data_size;
+        extra_size_remaining =
+            extra_size_remaining - sizeof(mz_uint16) * 2 - field_data_size;
+      } while (extra_size_remaining);
+    }
+  }
+
   return MZ_TRUE;
 }
 
-mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index,
-                                   char *pFilename, mz_uint filename_buf_size) {
-  mz_uint n;
-  const mz_uint8 *p = mz_zip_reader_get_cdh(pZip, file_index);
-  if (!p) {
-    if (filename_buf_size)
-      pFilename[0] = '\0';
-    return 0;
-  }
-  n = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
-  if (filename_buf_size) {
-    n = MZ_MIN(n, filename_buf_size - 1);
-    memcpy(pFilename, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n);
-    pFilename[n] = '\0';
-  }
-  return n + 1;
-}
-
-static MZ_FORCEINLINE mz_bool mz_zip_reader_string_equal(const char *pA,
-                                                         const char *pB,
-                                                         mz_uint len,
-                                                         mz_uint flags) {
+static MZ_FORCEINLINE mz_bool mz_zip_string_equal(const char *pA,
+                                                  const char *pB, mz_uint len,
+                                                  mz_uint flags) {
   mz_uint i;
   if (flags & MZ_ZIP_FLAG_CASE_SENSITIVE)
     return 0 == memcmp(pA, pB, len);
@@ -5186,9 +6430,9 @@ static MZ_FORCEINLINE mz_bool mz_zip_reader_string_equal(const char *pA,
 }
 
 static MZ_FORCEINLINE int
-mz_zip_reader_filename_compare(const mz_zip_array *pCentral_dir_array,
-                               const mz_zip_array *pCentral_dir_offsets,
-                               mz_uint l_index, const char *pR, mz_uint r_len) {
+mz_zip_filename_compare(const mz_zip_array *pCentral_dir_array,
+                        const mz_zip_array *pCentral_dir_offsets,
+                        mz_uint l_index, const char *pR, mz_uint r_len) {
   const mz_uint8 *pL = &MZ_ZIP_ARRAY_ELEMENT(
                      pCentral_dir_array, mz_uint8,
                      MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32,
@@ -5207,47 +6451,86 @@ mz_zip_reader_filename_compare(const mz_zip_array *pCentral_dir_array,
   return (pL == pE) ? (int)(l_len - r_len) : (l - r);
 }
 
-static int mz_zip_reader_locate_file_binary_search(mz_zip_archive *pZip,
-                                                   const char *pFilename) {
+static mz_bool mz_zip_locate_file_binary_search(mz_zip_archive *pZip,
+                                                const char *pFilename,
+                                                mz_uint32 *pIndex) {
   mz_zip_internal_state *pState = pZip->m_pState;
   const mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets;
   const mz_zip_array *pCentral_dir = &pState->m_central_dir;
   mz_uint32 *pIndices = &MZ_ZIP_ARRAY_ELEMENT(
       &pState->m_sorted_central_dir_offsets, mz_uint32, 0);
-  const int size = pZip->m_total_files;
+  const mz_uint32 size = pZip->m_total_files;
   const mz_uint filename_len = (mz_uint)strlen(pFilename);
-  int l = 0, h = size - 1;
-  while (l <= h) {
-    int m = (l + h) >> 1, file_index = pIndices[m],
-        comp =
-            mz_zip_reader_filename_compare(pCentral_dir, pCentral_dir_offsets,
-                                           file_index, pFilename, filename_len);
-    if (!comp)
-      return file_index;
-    else if (comp < 0)
-      l = m + 1;
-    else
-      h = m - 1;
+
+  if (pIndex)
+    *pIndex = 0;
+
+  if (size) {
+    /* yes I could use uint32_t's, but then we would have to add some special
+     * case checks in the loop, argh, and */
+    /* honestly the major expense here on 32-bit CPU's will still be the
+     * filename compare */
+    mz_int64 l = 0, h = (mz_int64)size - 1;
+
+    while (l <= h) {
+      mz_int64 m = l + ((h - l) >> 1);
+      mz_uint32 file_index = pIndices[(mz_uint32)m];
+
+      int comp = mz_zip_filename_compare(pCentral_dir, pCentral_dir_offsets,
+                                         file_index, pFilename, filename_len);
+      if (!comp) {
+        if (pIndex)
+          *pIndex = file_index;
+        return MZ_TRUE;
+      } else if (comp < 0)
+        l = m + 1;
+      else
+        h = m - 1;
+    }
   }
-  return -1;
+
+  return mz_zip_set_error(pZip, MZ_ZIP_FILE_NOT_FOUND);
 }
 
 int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName,
                               const char *pComment, mz_uint flags) {
+  mz_uint32 index;
+  if (!mz_zip_reader_locate_file_v2(pZip, pName, pComment, flags, &index))
+    return -1;
+  else
+    return (int)index;
+}
+
+mz_bool mz_zip_reader_locate_file_v2(mz_zip_archive *pZip, const char *pName,
+                                     const char *pComment, mz_uint flags,
+                                     mz_uint32 *pIndex) {
   mz_uint file_index;
   size_t name_len, comment_len;
-  if ((!pZip) || (!pZip->m_pState) || (!pName) ||
-      (pZip->m_zip_mode != MZ_ZIP_MODE_READING))
-    return -1;
-  if (((flags & (MZ_ZIP_FLAG_IGNORE_PATH | MZ_ZIP_FLAG_CASE_SENSITIVE)) == 0) &&
-      (!pComment) && (pZip->m_pState->m_sorted_central_dir_offsets.m_size))
-    return mz_zip_reader_locate_file_binary_search(pZip, pName);
+
+  if (pIndex)
+    *pIndex = 0;
+
+  if ((!pZip) || (!pZip->m_pState) || (!pName))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  /* See if we can use a binary search */
+  if (((pZip->m_pState->m_init_flags &
+        MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0) &&
+      (pZip->m_zip_mode == MZ_ZIP_MODE_READING) &&
+      ((flags & (MZ_ZIP_FLAG_IGNORE_PATH | MZ_ZIP_FLAG_CASE_SENSITIVE)) == 0) &&
+      (!pComment) && (pZip->m_pState->m_sorted_central_dir_offsets.m_size)) {
+    return mz_zip_locate_file_binary_search(pZip, pName, pIndex);
+  }
+
+  /* Locate the entry by scanning the entire central directory */
   name_len = strlen(pName);
-  if (name_len > 0xFFFF)
-    return -1;
+  if (name_len > MZ_UINT16_MAX)
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
   comment_len = pComment ? strlen(pComment) : 0;
-  if (comment_len > 0xFFFF)
-    return -1;
+  if (comment_len > MZ_UINT16_MAX)
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
   for (file_index = 0; file_index < pZip->m_total_files; file_index++) {
     const mz_uint8 *pHeader = &MZ_ZIP_ARRAY_ELEMENT(
         &pZip->m_pState->m_central_dir, mz_uint8,
@@ -5264,8 +6547,8 @@ int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName,
                   MZ_READ_LE16(pHeader + MZ_ZIP_CDH_COMMENT_LEN_OFS);
       const char *pFile_comment = pFilename + filename_len + file_extra_len;
       if ((file_comment_len != comment_len) ||
-          (!mz_zip_reader_string_equal(pComment, pFile_comment,
-                                       file_comment_len, flags)))
+          (!mz_zip_string_equal(pComment, pFile_comment, file_comment_len,
+                                flags)))
         continue;
     }
     if ((flags & MZ_ZIP_FLAG_IGNORE_PATH) && (filename_len)) {
@@ -5280,17 +6563,20 @@ int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName,
       filename_len -= ofs;
     }
     if ((filename_len == name_len) &&
-        (mz_zip_reader_string_equal(pName, pFilename, filename_len, flags)))
-      return file_index;
+        (mz_zip_string_equal(pName, pFilename, filename_len, flags))) {
+      if (pIndex)
+        *pIndex = file_index;
+      return MZ_TRUE;
+    }
   }
-  return -1;
+
+  return mz_zip_set_error(pZip, MZ_ZIP_FILE_NOT_FOUND);
 }
 
-mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip,
-                                              mz_uint file_index, void *pBuf,
-                                              size_t buf_size, mz_uint flags,
-                                              void *pUser_read_buf,
-                                              size_t user_read_buf_size) {
+static mz_bool mz_zip_reader_extract_to_mem_no_alloc1(
+    mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size,
+    mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size,
+    const mz_zip_archive_file_stat *st) {
   int status = TINFL_STATUS_DONE;
   mz_uint64 needed_size, cur_file_ofs, comp_remaining,
       out_buf_ofs = 0, read_buf_size, read_buf_ofs = 0, read_buf_avail;
@@ -5302,75 +6588,81 @@ mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip,
   mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
   tinfl_decompressor inflator;
 
-  if ((buf_size) && (!pBuf))
+  if ((!pZip) || (!pZip->m_pState) || ((buf_size) && (!pBuf)) ||
+      ((user_read_buf_size) && (!pUser_read_buf)) || (!pZip->m_pRead))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  if (st) {
+    file_stat = *st;
+  } else if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
     return MZ_FALSE;
 
-  if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
-    return MZ_FALSE;
-
-  // Empty file, or a directory (but not always a directory - I've seen odd zips
-  // with directories that have compressed data which inflates to 0 bytes)
-  if (!file_stat.m_comp_size)
+  /* A directory or zero length file */
+  if ((file_stat.m_is_directory) || (!file_stat.m_comp_size))
     return MZ_TRUE;
 
-  // Entry is a subdirectory (I've seen old zips with dir entries which have
-  // compressed deflate data which inflates to 0 bytes, but these entries claim
-  // to uncompress to 512 bytes in the headers). I'm torn how to handle this
-  // case - should it fail instead?
-  if (mz_zip_reader_is_file_a_directory(pZip, file_index))
-    return MZ_TRUE;
+  /* Encryption and patch files are not supported. */
+  if (file_stat.m_bit_flag &
+      (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED |
+       MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION |
+       MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG))
+    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
 
-  // Encryption and patch files are not supported.
-  if (file_stat.m_bit_flag & (1 | 32))
-    return MZ_FALSE;
-
-  // This function only supports stored and deflate.
+  /* This function only supports decompressing stored and deflate. */
   if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (file_stat.m_method != 0) &&
       (file_stat.m_method != MZ_DEFLATED))
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
 
-  // Ensure supplied output buffer is large enough.
+  /* Ensure supplied output buffer is large enough. */
   needed_size = (flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ? file_stat.m_comp_size
                                                       : file_stat.m_uncomp_size;
   if (buf_size < needed_size)
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_BUF_TOO_SMALL);
 
-  // Read and parse the local directory entry.
+  /* Read and parse the local directory entry. */
   cur_file_ofs = file_stat.m_local_header_ofs;
   if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pLocal_header,
                     MZ_ZIP_LOCAL_DIR_HEADER_SIZE) !=
       MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+
   if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
 
   cur_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE +
                   MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) +
                   MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
   if ((cur_file_ofs + file_stat.m_comp_size) > pZip->m_archive_size)
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
 
   if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!file_stat.m_method)) {
-    // The file is stored or the caller has requested the compressed data.
+    /* The file is stored or the caller has requested the compressed data. */
     if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf,
                       (size_t)needed_size) != needed_size)
-      return MZ_FALSE;
-    return ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) != 0) ||
-           (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf,
-                     (size_t)file_stat.m_uncomp_size) == file_stat.m_crc32);
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+    if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) == 0) {
+      if (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf,
+                   (size_t)file_stat.m_uncomp_size) != file_stat.m_crc32)
+        return mz_zip_set_error(pZip, MZ_ZIP_CRC_CHECK_FAILED);
+    }
+#endif
+
+    return MZ_TRUE;
   }
 
-  // Decompress the file either directly from memory or from a file input
-  // buffer.
+  /* Decompress the file either directly from memory or from a file input
+   * buffer. */
   tinfl_init(&inflator);
 
   if (pZip->m_pState->m_pMem) {
-    // Read directly from the archive in memory.
+    /* Read directly from the archive in memory. */
     pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs;
     read_buf_size = read_buf_avail = file_stat.m_comp_size;
     comp_remaining = 0;
   } else if (pUser_read_buf) {
-    // Use a user provided read buffer.
+    /* Use a user provided read buffer. */
     if (!user_read_buf_size)
       return MZ_FALSE;
     pRead_buf = (mz_uint8 *)pUser_read_buf;
@@ -5378,19 +6670,26 @@ mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip,
     read_buf_avail = 0;
     comp_remaining = file_stat.m_comp_size;
   } else {
-    // Temporarily allocate a read buffer.
-    read_buf_size = MZ_MIN(file_stat.m_comp_size, MZ_ZIP_MAX_IO_BUF_SIZE);
-    if (((sizeof(size_t) == sizeof(mz_uint32))) && (read_buf_size > 0x7FFFFFFF))
-      return MZ_FALSE;
+    /* Temporarily allocate a read buffer. */
+    read_buf_size =
+        MZ_MIN(file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE);
+#ifdef _MSC_VER
+#pragma warning ( disable : 4127 )
+#endif
+  if (((sizeof(size_t) == sizeof(mz_uint32))) && (read_buf_size > 0x7FFFFFFF))
+      return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
 
     if (NULL == (pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1,
                                             (size_t)read_buf_size)))
-      return MZ_FALSE;
+      return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
     read_buf_avail = 0;
     comp_remaining = file_stat.m_comp_size;
   }
 
   do {
+    /* The size_t cast here should be OK because we've verified that the output
+     * buffer is >= file_stat.m_uncomp_size above */
     size_t in_buf_size,
         out_buf_size = (size_t)(file_stat.m_uncomp_size - out_buf_ofs);
     if ((!read_buf_avail) && (!pZip->m_pState->m_pMem)) {
@@ -5398,6 +6697,7 @@ mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip,
       if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf,
                         (size_t)read_buf_avail) != read_buf_avail) {
         status = TINFL_STATUS_FAILED;
+        mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED);
         break;
       }
       cur_file_ofs += read_buf_avail;
@@ -5416,11 +6716,18 @@ mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip,
   } while (status == TINFL_STATUS_NEEDS_MORE_INPUT);
 
   if (status == TINFL_STATUS_DONE) {
-    // Make sure the entire file was decompressed, and check its CRC.
-    if ((out_buf_ofs != file_stat.m_uncomp_size) ||
-        (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf,
-                  (size_t)file_stat.m_uncomp_size) != file_stat.m_crc32))
+    /* Make sure the entire file was decompressed, and check its CRC. */
+    if (out_buf_ofs != file_stat.m_uncomp_size) {
+      mz_zip_set_error(pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE);
       status = TINFL_STATUS_FAILED;
+    }
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+    else if (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf,
+                      (size_t)file_stat.m_uncomp_size) != file_stat.m_crc32) {
+      mz_zip_set_error(pZip, MZ_ZIP_CRC_CHECK_FAILED);
+      status = TINFL_STATUS_FAILED;
+    }
+#endif
   }
 
   if ((!pZip->m_pState->m_pMem) && (!pUser_read_buf))
@@ -5429,22 +6736,32 @@ mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip,
   return status == TINFL_STATUS_DONE;
 }
 
+mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip,
+                                              mz_uint file_index, void *pBuf,
+                                              size_t buf_size, mz_uint flags,
+                                              void *pUser_read_buf,
+                                              size_t user_read_buf_size) {
+  return mz_zip_reader_extract_to_mem_no_alloc1(pZip, file_index, pBuf,
+                                                buf_size, flags, pUser_read_buf,
+                                                user_read_buf_size, NULL);
+}
+
 mz_bool mz_zip_reader_extract_file_to_mem_no_alloc(
     mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size,
     mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size) {
-  int file_index = mz_zip_reader_locate_file(pZip, pFilename, NULL, flags);
-  if (file_index < 0)
+  mz_uint32 file_index;
+  if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index))
     return MZ_FALSE;
-  return mz_zip_reader_extract_to_mem_no_alloc(pZip, file_index, pBuf, buf_size,
-                                               flags, pUser_read_buf,
-                                               user_read_buf_size);
+  return mz_zip_reader_extract_to_mem_no_alloc1(pZip, file_index, pBuf,
+                                                buf_size, flags, pUser_read_buf,
+                                                user_read_buf_size, NULL);
 }
 
 mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip, mz_uint file_index,
                                      void *pBuf, size_t buf_size,
                                      mz_uint flags) {
-  return mz_zip_reader_extract_to_mem_no_alloc(pZip, file_index, pBuf, buf_size,
-                                               flags, NULL, 0);
+  return mz_zip_reader_extract_to_mem_no_alloc1(pZip, file_index, pBuf,
+                                                buf_size, flags, NULL, 0, NULL);
 }
 
 mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip,
@@ -5456,27 +6773,32 @@ mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip,
 
 void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index,
                                     size_t *pSize, mz_uint flags) {
-  mz_uint64 comp_size, uncomp_size, alloc_size;
-  const mz_uint8 *p = mz_zip_reader_get_cdh(pZip, file_index);
+  mz_zip_archive_file_stat file_stat;
+  mz_uint64 alloc_size;
   void *pBuf;
 
   if (pSize)
     *pSize = 0;
-  if (!p)
+
+  if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
     return NULL;
 
-  comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS);
-  uncomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS);
-
-  alloc_size = (flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ? comp_size : uncomp_size;
-  if (((sizeof(size_t) == sizeof(mz_uint32))) && (alloc_size > 0x7FFFFFFF))
+  alloc_size = (flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ? file_stat.m_comp_size
+                                                     : file_stat.m_uncomp_size;
+  if (((sizeof(size_t) == sizeof(mz_uint32))) && (alloc_size > 0x7FFFFFFF)) {
+    mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
     return NULL;
+  }
+
   if (NULL ==
-      (pBuf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)alloc_size)))
+      (pBuf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)alloc_size))) {
+    mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
     return NULL;
+  }
 
-  if (!mz_zip_reader_extract_to_mem(pZip, file_index, pBuf, (size_t)alloc_size,
-                                    flags)) {
+  if (!mz_zip_reader_extract_to_mem_no_alloc1(pZip, file_index, pBuf,
+                                              (size_t)alloc_size, flags, NULL,
+                                              0, &file_stat)) {
     pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
     return NULL;
   }
@@ -5489,8 +6811,9 @@ void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index,
 void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip,
                                          const char *pFilename, size_t *pSize,
                                          mz_uint flags) {
-  int file_index = mz_zip_reader_locate_file(pZip, pFilename, NULL, flags);
-  if (file_index < 0) {
+  mz_uint32 file_index;
+  if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags,
+                                    &file_index)) {
     if (pSize)
       *pSize = 0;
     return MZ_FALSE;
@@ -5503,7 +6826,9 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip,
                                           mz_file_write_func pCallback,
                                           void *pOpaque, mz_uint flags) {
   int status = TINFL_STATUS_DONE;
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
   mz_uint file_crc32 = MZ_CRC32_INIT;
+#endif
   mz_uint64 read_buf_size, read_buf_ofs = 0, read_buf_avail, comp_remaining,
                            out_buf_ofs = 0, cur_file_ofs;
   mz_zip_archive_file_stat file_stat;
@@ -5514,95 +6839,109 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip,
                        sizeof(mz_uint32)];
   mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
 
+  if ((!pZip) || (!pZip->m_pState) || (!pCallback) || (!pZip->m_pRead))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
   if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
     return MZ_FALSE;
 
-  // Empty file, or a directory (but not always a directory - I've seen odd zips
-  // with directories that have compressed data which inflates to 0 bytes)
-  if (!file_stat.m_comp_size)
+  /* A directory or zero length file */
+  if ((file_stat.m_is_directory) || (!file_stat.m_comp_size))
     return MZ_TRUE;
 
-  // Entry is a subdirectory (I've seen old zips with dir entries which have
-  // compressed deflate data which inflates to 0 bytes, but these entries claim
-  // to uncompress to 512 bytes in the headers). I'm torn how to handle this
-  // case - should it fail instead?
-  if (mz_zip_reader_is_file_a_directory(pZip, file_index))
-    return MZ_TRUE;
+  /* Encryption and patch files are not supported. */
+  if (file_stat.m_bit_flag &
+      (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED |
+       MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION |
+       MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG))
+    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
 
-  // Encryption and patch files are not supported.
-  if (file_stat.m_bit_flag & (1 | 32))
-    return MZ_FALSE;
-
-  // This function only supports stored and deflate.
+  /* This function only supports decompressing stored and deflate. */
   if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (file_stat.m_method != 0) &&
       (file_stat.m_method != MZ_DEFLATED))
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
 
-  // Read and parse the local directory entry.
+  /* Read and do some minimal validation of the local directory entry (this
+   * doesn't crack the zip64 stuff, which we already have from the central dir)
+   */
   cur_file_ofs = file_stat.m_local_header_ofs;
   if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pLocal_header,
                     MZ_ZIP_LOCAL_DIR_HEADER_SIZE) !=
       MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+
   if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
 
   cur_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE +
                   MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) +
                   MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
   if ((cur_file_ofs + file_stat.m_comp_size) > pZip->m_archive_size)
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
 
-  // Decompress the file either directly from memory or from a file input
-  // buffer.
+  /* Decompress the file either directly from memory or from a file input
+   * buffer. */
   if (pZip->m_pState->m_pMem) {
     pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs;
     read_buf_size = read_buf_avail = file_stat.m_comp_size;
     comp_remaining = 0;
   } else {
-    read_buf_size = MZ_MIN(file_stat.m_comp_size, MZ_ZIP_MAX_IO_BUF_SIZE);
+    read_buf_size =
+        MZ_MIN(file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE);
     if (NULL == (pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1,
                                             (size_t)read_buf_size)))
-      return MZ_FALSE;
+      return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
     read_buf_avail = 0;
     comp_remaining = file_stat.m_comp_size;
   }
 
   if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!file_stat.m_method)) {
-    // The file is stored or the caller has requested the compressed data.
+    /* The file is stored or the caller has requested the compressed data. */
     if (pZip->m_pState->m_pMem) {
       if (((sizeof(size_t) == sizeof(mz_uint32))) &&
-          (file_stat.m_comp_size > 0xFFFFFFFF))
-        return MZ_FALSE;
+          (file_stat.m_comp_size > MZ_UINT32_MAX))
+        return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
 
       if (pCallback(pOpaque, out_buf_ofs, pRead_buf,
-                    (size_t)file_stat.m_comp_size) != file_stat.m_comp_size)
+                    (size_t)file_stat.m_comp_size) != file_stat.m_comp_size) {
+        mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED);
         status = TINFL_STATUS_FAILED;
-      else if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
+      } else if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) {
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
         file_crc32 =
             (mz_uint32)mz_crc32(file_crc32, (const mz_uint8 *)pRead_buf,
                                 (size_t)file_stat.m_comp_size);
-      // cur_file_ofs += file_stat.m_comp_size;
+#endif
+      }
+
+      cur_file_ofs += file_stat.m_comp_size;
       out_buf_ofs += file_stat.m_comp_size;
-      // comp_remaining = 0;
+      comp_remaining = 0;
     } else {
       while (comp_remaining) {
         read_buf_avail = MZ_MIN(read_buf_size, comp_remaining);
         if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf,
                           (size_t)read_buf_avail) != read_buf_avail) {
+          mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
           status = TINFL_STATUS_FAILED;
           break;
         }
 
-        if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+        if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) {
           file_crc32 = (mz_uint32)mz_crc32(
               file_crc32, (const mz_uint8 *)pRead_buf, (size_t)read_buf_avail);
+        }
+#endif
 
         if (pCallback(pOpaque, out_buf_ofs, pRead_buf,
                       (size_t)read_buf_avail) != read_buf_avail) {
+          mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED);
           status = TINFL_STATUS_FAILED;
           break;
         }
+
         cur_file_ofs += read_buf_avail;
         out_buf_ofs += read_buf_avail;
         comp_remaining -= read_buf_avail;
@@ -5613,9 +6952,10 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip,
     tinfl_init(&inflator);
 
     if (NULL == (pWrite_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1,
-                                             TINFL_LZ_DICT_SIZE)))
+                                             TINFL_LZ_DICT_SIZE))) {
+      mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
       status = TINFL_STATUS_FAILED;
-    else {
+    } else {
       do {
         mz_uint8 *pWrite_buf_cur =
             (mz_uint8 *)pWrite_buf + (out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
@@ -5626,6 +6966,7 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip,
           read_buf_avail = MZ_MIN(read_buf_size, comp_remaining);
           if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf,
                             (size_t)read_buf_avail) != read_buf_avail) {
+            mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
             status = TINFL_STATUS_FAILED;
             break;
           }
@@ -5645,12 +6986,17 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip,
         if (out_buf_size) {
           if (pCallback(pOpaque, out_buf_ofs, pWrite_buf_cur, out_buf_size) !=
               out_buf_size) {
+            mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED);
             status = TINFL_STATUS_FAILED;
             break;
           }
+
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
           file_crc32 =
               (mz_uint32)mz_crc32(file_crc32, pWrite_buf_cur, out_buf_size);
+#endif
           if ((out_buf_ofs += out_buf_size) > file_stat.m_uncomp_size) {
+            mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED);
             status = TINFL_STATUS_FAILED;
             break;
           }
@@ -5662,14 +7008,22 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip,
 
   if ((status == TINFL_STATUS_DONE) &&
       (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA))) {
-    // Make sure the entire file was decompressed, and check its CRC.
-    if ((out_buf_ofs != file_stat.m_uncomp_size) ||
-        (file_crc32 != file_stat.m_crc32))
+    /* Make sure the entire file was decompressed, and check its CRC. */
+    if (out_buf_ofs != file_stat.m_uncomp_size) {
+      mz_zip_set_error(pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE);
       status = TINFL_STATUS_FAILED;
+    }
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+    else if (file_crc32 != file_stat.m_crc32) {
+      mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED);
+      status = TINFL_STATUS_FAILED;
+    }
+#endif
   }
 
   if (!pZip->m_pState->m_pMem)
     pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
+
   if (pWrite_buf)
     pZip->m_pFree(pZip->m_pAlloc_opaque, pWrite_buf);
 
@@ -5680,17 +7034,335 @@ mz_bool mz_zip_reader_extract_file_to_callback(mz_zip_archive *pZip,
                                                const char *pFilename,
                                                mz_file_write_func pCallback,
                                                void *pOpaque, mz_uint flags) {
-  int file_index = mz_zip_reader_locate_file(pZip, pFilename, NULL, flags);
-  if (file_index < 0)
+  mz_uint32 file_index;
+  if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index))
     return MZ_FALSE;
+
   return mz_zip_reader_extract_to_callback(pZip, file_index, pCallback, pOpaque,
                                            flags);
 }
 
+mz_zip_reader_extract_iter_state *
+mz_zip_reader_extract_iter_new(mz_zip_archive *pZip, mz_uint file_index,
+                               mz_uint flags) {
+  mz_zip_reader_extract_iter_state *pState;
+  mz_uint32
+      local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) /
+                       sizeof(mz_uint32)];
+  mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
+
+  /* Argument sanity check */
+  if ((!pZip) || (!pZip->m_pState))
+    return NULL;
+
+  /* Allocate an iterator status structure */
+  pState = (mz_zip_reader_extract_iter_state *)pZip->m_pAlloc(
+      pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_reader_extract_iter_state));
+  if (!pState) {
+    mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+    return NULL;
+  }
+
+  /* Fetch file details */
+  if (!mz_zip_reader_file_stat(pZip, file_index, &pState->file_stat)) {
+    pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+    return NULL;
+  }
+
+  /* Encryption and patch files are not supported. */
+  if (pState->file_stat.m_bit_flag &
+      (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED |
+       MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION |
+       MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG)) {
+    mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
+    pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+    return NULL;
+  }
+
+  /* This function only supports decompressing stored and deflate. */
+  if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) &&
+      (pState->file_stat.m_method != 0) &&
+      (pState->file_stat.m_method != MZ_DEFLATED)) {
+    mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
+    pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+    return NULL;
+  }
+
+  /* Init state - save args */
+  pState->pZip = pZip;
+  pState->flags = flags;
+
+  /* Init state - reset variables to defaults */
+  pState->status = TINFL_STATUS_DONE;
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+  pState->file_crc32 = MZ_CRC32_INIT;
+#endif
+  pState->read_buf_ofs = 0;
+  pState->out_buf_ofs = 0;
+  pState->pRead_buf = NULL;
+  pState->pWrite_buf = NULL;
+  pState->out_blk_remain = 0;
+
+  /* Read and parse the local directory entry. */
+  pState->cur_file_ofs = pState->file_stat.m_local_header_ofs;
+  if (pZip->m_pRead(pZip->m_pIO_opaque, pState->cur_file_ofs, pLocal_header,
+                    MZ_ZIP_LOCAL_DIR_HEADER_SIZE) !=
+      MZ_ZIP_LOCAL_DIR_HEADER_SIZE) {
+    mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+    pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+    return NULL;
+  }
+
+  if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG) {
+    mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+    pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+    return NULL;
+  }
+
+  pState->cur_file_ofs +=
+      MZ_ZIP_LOCAL_DIR_HEADER_SIZE +
+      MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) +
+      MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
+  if ((pState->cur_file_ofs + pState->file_stat.m_comp_size) >
+      pZip->m_archive_size) {
+    mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+    pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+    return NULL;
+  }
+
+  /* Decompress the file either directly from memory or from a file input
+   * buffer. */
+  if (pZip->m_pState->m_pMem) {
+    pState->pRead_buf =
+        (mz_uint8 *)pZip->m_pState->m_pMem + pState->cur_file_ofs;
+    pState->read_buf_size = pState->read_buf_avail =
+        pState->file_stat.m_comp_size;
+    pState->comp_remaining = pState->file_stat.m_comp_size;
+  } else {
+    if (!((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ||
+          (!pState->file_stat.m_method))) {
+      /* Decompression required, therefore intermediate read buffer required */
+      pState->read_buf_size = MZ_MIN(pState->file_stat.m_comp_size,
+                                     (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE);
+      if (NULL ==
+          (pState->pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1,
+                                              (size_t)pState->read_buf_size))) {
+        mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+        return NULL;
+      }
+    } else {
+      /* Decompression not required - we will be reading directly into user
+       * buffer, no temp buf required */
+      pState->read_buf_size = 0;
+    }
+    pState->read_buf_avail = 0;
+    pState->comp_remaining = pState->file_stat.m_comp_size;
+  }
+
+  if (!((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ||
+        (!pState->file_stat.m_method))) {
+    /* Decompression required, init decompressor */
+    tinfl_init(&pState->inflator);
+
+    /* Allocate write buffer */
+    if (NULL == (pState->pWrite_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1,
+                                                     TINFL_LZ_DICT_SIZE))) {
+      mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+      if (pState->pRead_buf)
+        pZip->m_pFree(pZip->m_pAlloc_opaque, pState->pRead_buf);
+      pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+      return NULL;
+    }
+  }
+
+  return pState;
+}
+
+mz_zip_reader_extract_iter_state *
+mz_zip_reader_extract_file_iter_new(mz_zip_archive *pZip, const char *pFilename,
+                                    mz_uint flags) {
+  mz_uint32 file_index;
+
+  /* Locate file index by name */
+  if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index))
+    return NULL;
+
+  /* Construct iterator */
+  return mz_zip_reader_extract_iter_new(pZip, file_index, flags);
+}
+
+size_t mz_zip_reader_extract_iter_read(mz_zip_reader_extract_iter_state *pState,
+                                       void *pvBuf, size_t buf_size) {
+  size_t copied_to_caller = 0;
+
+  /* Argument sanity check */
+  if ((!pState) || (!pState->pZip) || (!pState->pZip->m_pState) || (!pvBuf))
+    return 0;
+
+  if ((pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ||
+      (!pState->file_stat.m_method)) {
+    /* The file is stored or the caller has requested the compressed data, calc
+     * amount to return. */
+    copied_to_caller = (size_t)MZ_MIN(buf_size, pState->comp_remaining);
+
+    /* Zip is in memory....or requires reading from a file? */
+    if (pState->pZip->m_pState->m_pMem) {
+      /* Copy data to caller's buffer */
+      memcpy(pvBuf, pState->pRead_buf, copied_to_caller);
+      pState->pRead_buf = ((mz_uint8 *)pState->pRead_buf) + copied_to_caller;
+    } else {
+      /* Read directly into caller's buffer */
+      if (pState->pZip->m_pRead(pState->pZip->m_pIO_opaque,
+                                pState->cur_file_ofs, pvBuf,
+                                copied_to_caller) != copied_to_caller) {
+        /* Failed to read all that was asked for, flag failure and alert user */
+        mz_zip_set_error(pState->pZip, MZ_ZIP_FILE_READ_FAILED);
+        pState->status = TINFL_STATUS_FAILED;
+        copied_to_caller = 0;
+      }
+    }
+
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+    /* Compute CRC if not returning compressed data only */
+    if (!(pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
+      pState->file_crc32 = (mz_uint32)mz_crc32(
+          pState->file_crc32, (const mz_uint8 *)pvBuf, copied_to_caller);
+#endif
+
+    /* Advance offsets, dec counters */
+    pState->cur_file_ofs += copied_to_caller;
+    pState->out_buf_ofs += copied_to_caller;
+    pState->comp_remaining -= copied_to_caller;
+  } else {
+    do {
+      /* Calc ptr to write buffer - given current output pos and block size */
+      mz_uint8 *pWrite_buf_cur =
+          (mz_uint8 *)pState->pWrite_buf +
+          (pState->out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
+
+      /* Calc max output size - given current output pos and block size */
+      size_t in_buf_size,
+          out_buf_size = TINFL_LZ_DICT_SIZE -
+                         (pState->out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
+
+      if (!pState->out_blk_remain) {
+        /* Read more data from file if none available (and reading from file) */
+        if ((!pState->read_buf_avail) && (!pState->pZip->m_pState->m_pMem)) {
+          /* Calc read size */
+          pState->read_buf_avail =
+              MZ_MIN(pState->read_buf_size, pState->comp_remaining);
+          if (pState->pZip->m_pRead(pState->pZip->m_pIO_opaque,
+                                    pState->cur_file_ofs, pState->pRead_buf,
+                                    (size_t)pState->read_buf_avail) !=
+              pState->read_buf_avail) {
+            mz_zip_set_error(pState->pZip, MZ_ZIP_FILE_READ_FAILED);
+            pState->status = TINFL_STATUS_FAILED;
+            break;
+          }
+
+          /* Advance offsets, dec counters */
+          pState->cur_file_ofs += pState->read_buf_avail;
+          pState->comp_remaining -= pState->read_buf_avail;
+          pState->read_buf_ofs = 0;
+        }
+
+        /* Perform decompression */
+        in_buf_size = (size_t)pState->read_buf_avail;
+        pState->status = tinfl_decompress(
+            &pState->inflator,
+            (const mz_uint8 *)pState->pRead_buf + pState->read_buf_ofs,
+            &in_buf_size, (mz_uint8 *)pState->pWrite_buf, pWrite_buf_cur,
+            &out_buf_size,
+            pState->comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0);
+        pState->read_buf_avail -= in_buf_size;
+        pState->read_buf_ofs += in_buf_size;
+
+        /* Update current output block size remaining */
+        pState->out_blk_remain = out_buf_size;
+      }
+
+      if (pState->out_blk_remain) {
+        /* Calc amount to return. */
+        size_t to_copy =
+            MZ_MIN((buf_size - copied_to_caller), pState->out_blk_remain);
+
+        /* Copy data to caller's buffer */
+        memcpy((mz_uint8 *)pvBuf + copied_to_caller, pWrite_buf_cur, to_copy);
+
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+        /* Perform CRC */
+        pState->file_crc32 =
+            (mz_uint32)mz_crc32(pState->file_crc32, pWrite_buf_cur, to_copy);
+#endif
+
+        /* Decrement data consumed from block */
+        pState->out_blk_remain -= to_copy;
+
+        /* Inc output offset, while performing sanity check */
+        if ((pState->out_buf_ofs += to_copy) >
+            pState->file_stat.m_uncomp_size) {
+          mz_zip_set_error(pState->pZip, MZ_ZIP_DECOMPRESSION_FAILED);
+          pState->status = TINFL_STATUS_FAILED;
+          break;
+        }
+
+        /* Increment counter of data copied to caller */
+        copied_to_caller += to_copy;
+      }
+    } while ((copied_to_caller < buf_size) &&
+             ((pState->status == TINFL_STATUS_NEEDS_MORE_INPUT) ||
+              (pState->status == TINFL_STATUS_HAS_MORE_OUTPUT)));
+  }
+
+  /* Return how many bytes were copied into user buffer */
+  return copied_to_caller;
+}
+
+mz_bool
+mz_zip_reader_extract_iter_free(mz_zip_reader_extract_iter_state *pState) {
+  int status;
+
+  /* Argument sanity check */
+  if ((!pState) || (!pState->pZip) || (!pState->pZip->m_pState))
+    return MZ_FALSE;
+
+  /* Was decompression completed and requested? */
+  if ((pState->status == TINFL_STATUS_DONE) &&
+      (!(pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA))) {
+    /* Make sure the entire file was decompressed, and check its CRC. */
+    if (pState->out_buf_ofs != pState->file_stat.m_uncomp_size) {
+      mz_zip_set_error(pState->pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE);
+      pState->status = TINFL_STATUS_FAILED;
+    }
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+    else if (pState->file_crc32 != pState->file_stat.m_crc32) {
+      mz_zip_set_error(pState->pZip, MZ_ZIP_DECOMPRESSION_FAILED);
+      pState->status = TINFL_STATUS_FAILED;
+    }
+#endif
+  }
+
+  /* Free buffers */
+  if (!pState->pZip->m_pState->m_pMem)
+    pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState->pRead_buf);
+  if (pState->pWrite_buf)
+    pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState->pWrite_buf);
+
+  /* Save status */
+  status = pState->status;
+
+  /* Free context */
+  pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState);
+
+  return status == TINFL_STATUS_DONE;
+}
+
 #ifndef MINIZ_NO_STDIO
 static size_t mz_zip_file_write_callback(void *pOpaque, mz_uint64 ofs,
                                          const void *pBuf, size_t n) {
   (void)ofs;
+
   return MZ_FWRITE(pBuf, 1, n, (MZ_FILE *)pOpaque);
 }
 
@@ -5700,116 +7372,464 @@ mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip, mz_uint file_index,
   mz_bool status;
   mz_zip_archive_file_stat file_stat;
   MZ_FILE *pFile;
+
   if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
     return MZ_FALSE;
 
+  if ((file_stat.m_is_directory) || (!file_stat.m_is_supported))
+    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
+
   pFile = MZ_FOPEN(pDst_filename, "wb");
   if (!pFile)
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
+
   status = mz_zip_reader_extract_to_callback(
       pZip, file_index, mz_zip_file_write_callback, pFile, flags);
-  if (MZ_FCLOSE(pFile) == EOF)
-    return MZ_FALSE;
-#ifndef MINIZ_NO_TIME
-  if (status) {
-    mz_zip_set_file_times(pDst_filename, file_stat.m_time, file_stat.m_time);
+
+  if (MZ_FCLOSE(pFile) == EOF) {
+    if (status)
+      mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED);
+
+    status = MZ_FALSE;
   }
+
+#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_STDIO)
+  if (status)
+    mz_zip_set_file_times(pDst_filename, file_stat.m_time, file_stat.m_time);
 #endif
 
   return status;
 }
-#endif // #ifndef MINIZ_NO_STDIO
 
-mz_bool mz_zip_reader_end(mz_zip_archive *pZip) {
-  if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) ||
-      (pZip->m_zip_mode != MZ_ZIP_MODE_READING))
-    return MZ_FALSE;
-
-  mz_zip_internal_state *pState = pZip->m_pState;
-  pZip->m_pState = NULL;
-  mz_zip_array_clear(pZip, &pState->m_central_dir);
-  mz_zip_array_clear(pZip, &pState->m_central_dir_offsets);
-  mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets);
-
-#ifndef MINIZ_NO_STDIO
-  if (pState->m_pFile) {
-    MZ_FCLOSE(pState->m_pFile);
-    pState->m_pFile = NULL;
-  }
-#endif // #ifndef MINIZ_NO_STDIO
-
-  pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
-
-  pZip->m_zip_mode = MZ_ZIP_MODE_INVALID;
-
-  return MZ_TRUE;
-}
-
-#ifndef MINIZ_NO_STDIO
 mz_bool mz_zip_reader_extract_file_to_file(mz_zip_archive *pZip,
                                            const char *pArchive_filename,
                                            const char *pDst_filename,
                                            mz_uint flags) {
-  int file_index =
-      mz_zip_reader_locate_file(pZip, pArchive_filename, NULL, flags);
-  if (file_index < 0)
+  mz_uint32 file_index;
+  if (!mz_zip_reader_locate_file_v2(pZip, pArchive_filename, NULL, flags,
+                                    &file_index))
     return MZ_FALSE;
+
   return mz_zip_reader_extract_to_file(pZip, file_index, pDst_filename, flags);
 }
-#endif
 
-// ------------------- .ZIP archive writing
+mz_bool mz_zip_reader_extract_to_cfile(mz_zip_archive *pZip, mz_uint file_index,
+                                       MZ_FILE *pFile, mz_uint flags) {
+  mz_zip_archive_file_stat file_stat;
+
+  if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
+    return MZ_FALSE;
+
+  if ((file_stat.m_is_directory) || (!file_stat.m_is_supported))
+    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
+
+  return mz_zip_reader_extract_to_callback(
+      pZip, file_index, mz_zip_file_write_callback, pFile, flags);
+}
+
+mz_bool mz_zip_reader_extract_file_to_cfile(mz_zip_archive *pZip,
+                                            const char *pArchive_filename,
+                                            MZ_FILE *pFile, mz_uint flags) {
+  mz_uint32 file_index;
+  if (!mz_zip_reader_locate_file_v2(pZip, pArchive_filename, NULL, flags,
+                                    &file_index))
+    return MZ_FALSE;
+
+  return mz_zip_reader_extract_to_cfile(pZip, file_index, pFile, flags);
+}
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+static size_t mz_zip_compute_crc32_callback(void *pOpaque, mz_uint64 file_ofs,
+                                            const void *pBuf, size_t n) {
+  mz_uint32 *p = (mz_uint32 *)pOpaque;
+  (void)file_ofs;
+  *p = (mz_uint32)mz_crc32(*p, (const mz_uint8 *)pBuf, n);
+  return n;
+}
+
+mz_bool mz_zip_validate_file(mz_zip_archive *pZip, mz_uint file_index,
+                             mz_uint flags) {
+  mz_zip_archive_file_stat file_stat;
+  mz_zip_internal_state *pState;
+  const mz_uint8 *pCentral_dir_header;
+  mz_bool found_zip64_ext_data_in_cdir = MZ_FALSE;
+  mz_bool found_zip64_ext_data_in_ldir = MZ_FALSE;
+  mz_uint32
+      local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) /
+                       sizeof(mz_uint32)];
+  mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
+  mz_uint64 local_header_ofs = 0;
+  mz_uint32 local_header_filename_len, local_header_extra_len,
+      local_header_crc32;
+  mz_uint64 local_header_comp_size, local_header_uncomp_size;
+  mz_uint32 uncomp_crc32 = MZ_CRC32_INIT;
+  mz_bool has_data_descriptor;
+  mz_uint32 local_header_bit_flags;
+
+  mz_zip_array file_data_array;
+  mz_zip_array_init(&file_data_array, 1);
+
+  if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) ||
+      (!pZip->m_pRead))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  if (file_index > pZip->m_total_files)
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  pState = pZip->m_pState;
+
+  pCentral_dir_header = mz_zip_get_cdh(pZip, file_index);
+
+  if (!mz_zip_file_stat_internal(pZip, file_index, pCentral_dir_header,
+                                 &file_stat, &found_zip64_ext_data_in_cdir))
+    return MZ_FALSE;
+
+  /* A directory or zero length file */
+  if ((file_stat.m_is_directory) || (!file_stat.m_uncomp_size))
+    return MZ_TRUE;
+
+  /* Encryption and patch files are not supported. */
+  if (file_stat.m_is_encrypted)
+    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
+
+  /* This function only supports stored and deflate. */
+  if ((file_stat.m_method != 0) && (file_stat.m_method != MZ_DEFLATED))
+    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
+
+  if (!file_stat.m_is_supported)
+    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
+
+  /* Read and parse the local directory entry. */
+  local_header_ofs = file_stat.m_local_header_ofs;
+  if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs, pLocal_header,
+                    MZ_ZIP_LOCAL_DIR_HEADER_SIZE) !=
+      MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
+    return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+
+  if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+  local_header_filename_len =
+      MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS);
+  local_header_extra_len =
+      MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
+  local_header_comp_size =
+      MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS);
+  local_header_uncomp_size =
+      MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS);
+  local_header_crc32 = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_CRC32_OFS);
+  local_header_bit_flags =
+      MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_BIT_FLAG_OFS);
+  has_data_descriptor = (local_header_bit_flags & 8) != 0;
+
+  if (local_header_filename_len != strlen(file_stat.m_filename))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+  if ((local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE +
+       local_header_filename_len + local_header_extra_len +
+       file_stat.m_comp_size) > pZip->m_archive_size)
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+  if (!mz_zip_array_resize(
+          pZip, &file_data_array,
+          MZ_MAX(local_header_filename_len, local_header_extra_len),
+          MZ_FALSE)) {
+    mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+    goto handle_failure;
+  }
+
+  if (local_header_filename_len) {
+    if (pZip->m_pRead(pZip->m_pIO_opaque,
+                      local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE,
+                      file_data_array.m_p,
+                      local_header_filename_len) != local_header_filename_len) {
+      mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+      goto handle_failure;
+    }
+
+    /* I've seen 1 archive that had the same pathname, but used backslashes in
+     * the local dir and forward slashes in the central dir. Do we care about
+     * this? For now, this case will fail validation. */
+    if (memcmp(file_stat.m_filename, file_data_array.m_p,
+               local_header_filename_len) != 0) {
+      mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
+      goto handle_failure;
+    }
+  }
+
+  if ((local_header_extra_len) &&
+      ((local_header_comp_size == MZ_UINT32_MAX) ||
+       (local_header_uncomp_size == MZ_UINT32_MAX))) {
+    mz_uint32 extra_size_remaining = local_header_extra_len;
+    const mz_uint8 *pExtra_data = (const mz_uint8 *)file_data_array.m_p;
+
+    if (pZip->m_pRead(pZip->m_pIO_opaque,
+                      local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE +
+                          local_header_filename_len,
+                      file_data_array.m_p,
+                      local_header_extra_len) != local_header_extra_len) {
+      mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+      goto handle_failure;
+    }
+
+    do {
+      mz_uint32 field_id, field_data_size, field_total_size;
+
+      if (extra_size_remaining < (sizeof(mz_uint16) * 2)) {
+        mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+        goto handle_failure;
+      }
+
+      field_id = MZ_READ_LE16(pExtra_data);
+      field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
+      field_total_size = field_data_size + sizeof(mz_uint16) * 2;
+
+      if (field_total_size > extra_size_remaining) {
+        mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+        goto handle_failure;
+      }
+
+      if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) {
+        const mz_uint8 *pSrc_field_data = pExtra_data + sizeof(mz_uint32);
+
+        if (field_data_size < sizeof(mz_uint64) * 2) {
+          mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+          goto handle_failure;
+        }
+
+        local_header_uncomp_size = MZ_READ_LE64(pSrc_field_data);
+        local_header_comp_size =
+            MZ_READ_LE64(pSrc_field_data + sizeof(mz_uint64));
+
+        found_zip64_ext_data_in_ldir = MZ_TRUE;
+        break;
+      }
+
+      pExtra_data += field_total_size;
+      extra_size_remaining -= field_total_size;
+    } while (extra_size_remaining);
+  }
+
+  /* TODO: parse local header extra data when local_header_comp_size is
+   * 0xFFFFFFFF! (big_descriptor.zip) */
+  /* I've seen zips in the wild with the data descriptor bit set, but proper
+   * local header values and bogus data descriptors */
+  if ((has_data_descriptor) && (!local_header_comp_size) &&
+      (!local_header_crc32)) {
+    mz_uint8 descriptor_buf[32];
+    mz_bool has_id;
+    const mz_uint8 *pSrc;
+    mz_uint32 file_crc32;
+    mz_uint64 comp_size = 0, uncomp_size = 0;
+
+    mz_uint32 num_descriptor_uint32s =
+        ((pState->m_zip64) || (found_zip64_ext_data_in_ldir)) ? 6 : 4;
+
+    if (pZip->m_pRead(pZip->m_pIO_opaque,
+                      local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE +
+                          local_header_filename_len + local_header_extra_len +
+                          file_stat.m_comp_size,
+                      descriptor_buf,
+                      sizeof(mz_uint32) * num_descriptor_uint32s) !=
+        (sizeof(mz_uint32) * num_descriptor_uint32s)) {
+      mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+      goto handle_failure;
+    }
+
+    has_id = (MZ_READ_LE32(descriptor_buf) == MZ_ZIP_DATA_DESCRIPTOR_ID);
+    pSrc = has_id ? (descriptor_buf + sizeof(mz_uint32)) : descriptor_buf;
+
+    file_crc32 = MZ_READ_LE32(pSrc);
+
+    if ((pState->m_zip64) || (found_zip64_ext_data_in_ldir)) {
+      comp_size = MZ_READ_LE64(pSrc + sizeof(mz_uint32));
+      uncomp_size = MZ_READ_LE64(pSrc + sizeof(mz_uint32) + sizeof(mz_uint64));
+    } else {
+      comp_size = MZ_READ_LE32(pSrc + sizeof(mz_uint32));
+      uncomp_size = MZ_READ_LE32(pSrc + sizeof(mz_uint32) + sizeof(mz_uint32));
+    }
+
+    if ((file_crc32 != file_stat.m_crc32) ||
+        (comp_size != file_stat.m_comp_size) ||
+        (uncomp_size != file_stat.m_uncomp_size)) {
+      mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
+      goto handle_failure;
+    }
+  } else {
+    if ((local_header_crc32 != file_stat.m_crc32) ||
+        (local_header_comp_size != file_stat.m_comp_size) ||
+        (local_header_uncomp_size != file_stat.m_uncomp_size)) {
+      mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
+      goto handle_failure;
+    }
+  }
+
+  mz_zip_array_clear(pZip, &file_data_array);
+
+  if ((flags & MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY) == 0) {
+    if (!mz_zip_reader_extract_to_callback(
+            pZip, file_index, mz_zip_compute_crc32_callback, &uncomp_crc32, 0))
+      return MZ_FALSE;
+
+    /* 1 more check to be sure, although the extract checks too. */
+    if (uncomp_crc32 != file_stat.m_crc32) {
+      mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
+      return MZ_FALSE;
+    }
+  }
+
+  return MZ_TRUE;
+
+handle_failure:
+  mz_zip_array_clear(pZip, &file_data_array);
+  return MZ_FALSE;
+}
+
+mz_bool mz_zip_validate_archive(mz_zip_archive *pZip, mz_uint flags) {
+  mz_zip_internal_state *pState;
+  mz_uint32 i;
+
+  if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) ||
+      (!pZip->m_pRead))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  pState = pZip->m_pState;
+
+  /* Basic sanity checks */
+  if (!pState->m_zip64) {
+    if (pZip->m_total_files > MZ_UINT16_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+
+    if (pZip->m_archive_size > MZ_UINT32_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+  } else {
+    if (pState->m_central_dir.m_size >= MZ_UINT32_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+  }
+
+  for (i = 0; i < pZip->m_total_files; i++) {
+    if (MZ_ZIP_FLAG_VALIDATE_LOCATE_FILE_FLAG & flags) {
+      mz_uint32 found_index;
+      mz_zip_archive_file_stat stat;
+
+      if (!mz_zip_reader_file_stat(pZip, i, &stat))
+        return MZ_FALSE;
+
+      if (!mz_zip_reader_locate_file_v2(pZip, stat.m_filename, NULL, 0,
+                                        &found_index))
+        return MZ_FALSE;
+
+      /* This check can fail if there are duplicate filenames in the archive
+       * (which we don't check for when writing - that's up to the user) */
+      if (found_index != i)
+        return mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
+    }
+
+    if (!mz_zip_validate_file(pZip, i, flags))
+      return MZ_FALSE;
+  }
+
+  return MZ_TRUE;
+}
+
+mz_bool mz_zip_validate_mem_archive(const void *pMem, size_t size,
+                                    mz_uint flags, mz_zip_error *pErr) {
+  mz_bool success = MZ_TRUE;
+  mz_zip_archive zip;
+  mz_zip_error actual_err = MZ_ZIP_NO_ERROR;
+
+  if ((!pMem) || (!size)) {
+    if (pErr)
+      *pErr = MZ_ZIP_INVALID_PARAMETER;
+    return MZ_FALSE;
+  }
+
+  mz_zip_zero_struct(&zip);
+
+  if (!mz_zip_reader_init_mem(&zip, pMem, size, flags)) {
+    if (pErr)
+      *pErr = zip.m_last_error;
+    return MZ_FALSE;
+  }
+
+  if (!mz_zip_validate_archive(&zip, flags)) {
+    actual_err = zip.m_last_error;
+    success = MZ_FALSE;
+  }
+
+  if (!mz_zip_reader_end_internal(&zip, success)) {
+    if (!actual_err)
+      actual_err = zip.m_last_error;
+    success = MZ_FALSE;
+  }
+
+  if (pErr)
+    *pErr = actual_err;
+
+  return success;
+}
+
+#ifndef MINIZ_NO_STDIO
+mz_bool mz_zip_validate_file_archive(const char *pFilename, mz_uint flags,
+                                     mz_zip_error *pErr) {
+  mz_bool success = MZ_TRUE;
+  mz_zip_archive zip;
+  mz_zip_error actual_err = MZ_ZIP_NO_ERROR;
+
+  if (!pFilename) {
+    if (pErr)
+      *pErr = MZ_ZIP_INVALID_PARAMETER;
+    return MZ_FALSE;
+  }
+
+  mz_zip_zero_struct(&zip);
+
+  if (!mz_zip_reader_init_file_v2(&zip, pFilename, flags, 0, 0)) {
+    if (pErr)
+      *pErr = zip.m_last_error;
+    return MZ_FALSE;
+  }
+
+  if (!mz_zip_validate_archive(&zip, flags)) {
+    actual_err = zip.m_last_error;
+    success = MZ_FALSE;
+  }
+
+  if (!mz_zip_reader_end_internal(&zip, success)) {
+    if (!actual_err)
+      actual_err = zip.m_last_error;
+    success = MZ_FALSE;
+  }
+
+  if (pErr)
+    *pErr = actual_err;
+
+  return success;
+}
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+/* ------------------- .ZIP archive writing */
 
 #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
 
-static void mz_write_le16(mz_uint8 *p, mz_uint16 v) {
+static MZ_FORCEINLINE void mz_write_le16(mz_uint8 *p, mz_uint16 v) {
   p[0] = (mz_uint8)v;
   p[1] = (mz_uint8)(v >> 8);
 }
-static void mz_write_le32(mz_uint8 *p, mz_uint32 v) {
+static MZ_FORCEINLINE void mz_write_le32(mz_uint8 *p, mz_uint32 v) {
   p[0] = (mz_uint8)v;
   p[1] = (mz_uint8)(v >> 8);
   p[2] = (mz_uint8)(v >> 16);
   p[3] = (mz_uint8)(v >> 24);
 }
+static MZ_FORCEINLINE void mz_write_le64(mz_uint8 *p, mz_uint64 v) {
+  mz_write_le32(p, (mz_uint32)v);
+  mz_write_le32(p + sizeof(mz_uint32), (mz_uint32)(v >> 32));
+}
+
 #define MZ_WRITE_LE16(p, v) mz_write_le16((mz_uint8 *)(p), (mz_uint16)(v))
 #define MZ_WRITE_LE32(p, v) mz_write_le32((mz_uint8 *)(p), (mz_uint32)(v))
-
-mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size) {
-  if ((!pZip) || (pZip->m_pState) || (!pZip->m_pWrite) ||
-      (pZip->m_zip_mode != MZ_ZIP_MODE_INVALID))
-    return MZ_FALSE;
-
-  if (pZip->m_file_offset_alignment) {
-    // Ensure user specified file offset alignment is a power of 2.
-    if (pZip->m_file_offset_alignment & (pZip->m_file_offset_alignment - 1))
-      return MZ_FALSE;
-  }
-
-  if (!pZip->m_pAlloc)
-    pZip->m_pAlloc = def_alloc_func;
-  if (!pZip->m_pFree)
-    pZip->m_pFree = def_free_func;
-  if (!pZip->m_pRealloc)
-    pZip->m_pRealloc = def_realloc_func;
-
-  pZip->m_zip_mode = MZ_ZIP_MODE_WRITING;
-  pZip->m_archive_size = existing_size;
-  pZip->m_central_directory_file_ofs = 0;
-  pZip->m_total_files = 0;
-
-  if (NULL == (pZip->m_pState = (mz_zip_internal_state *)pZip->m_pAlloc(
-                   pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_internal_state))))
-    return MZ_FALSE;
-  memset(pZip->m_pState, 0, sizeof(mz_zip_internal_state));
-  MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir,
-                                sizeof(mz_uint8));
-  MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets,
-                                sizeof(mz_uint32));
-  MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets,
-                                sizeof(mz_uint32));
-  return MZ_TRUE;
-}
+#define MZ_WRITE_LE64(p, v) mz_write_le64((mz_uint8 *)(p), (mz_uint64)(v))
 
 static size_t mz_zip_heap_write_func(void *pOpaque, mz_uint64 file_ofs,
                                      const void *pBuf, size_t n) {
@@ -5817,18 +7837,29 @@ static size_t mz_zip_heap_write_func(void *pOpaque, mz_uint64 file_ofs,
   mz_zip_internal_state *pState = pZip->m_pState;
   mz_uint64 new_size = MZ_MAX(file_ofs + n, pState->m_mem_size);
 
-  if ((!n) ||
-      ((sizeof(size_t) == sizeof(mz_uint32)) && (new_size > 0x7FFFFFFF)))
+  if (!n)
     return 0;
 
+  /* An allocation this big is likely to just fail on 32-bit systems, so don't
+   * even go there. */
+  if ((sizeof(size_t) == sizeof(mz_uint32)) && (new_size > 0x7FFFFFFF)) {
+    mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE);
+    return 0;
+  }
+
   if (new_size > pState->m_mem_capacity) {
     void *pNew_block;
     size_t new_capacity = MZ_MAX(64, pState->m_mem_capacity);
+
     while (new_capacity < new_size)
       new_capacity *= 2;
+
     if (NULL == (pNew_block = pZip->m_pRealloc(
-                     pZip->m_pAlloc_opaque, pState->m_pMem, 1, new_capacity)))
+                     pZip->m_pAlloc_opaque, pState->m_pMem, 1, new_capacity))) {
+      mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
       return 0;
+    }
+
     pState->m_pMem = pNew_block;
     pState->m_mem_capacity = new_capacity;
   }
@@ -5837,122 +7868,414 @@ static size_t mz_zip_heap_write_func(void *pOpaque, mz_uint64 file_ofs,
   return n;
 }
 
-mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip,
-                                size_t size_to_reserve_at_beginning,
-                                size_t initial_allocation_size) {
-  pZip->m_pWrite = mz_zip_heap_write_func;
-  pZip->m_pIO_opaque = pZip;
-  if (!mz_zip_writer_init(pZip, size_to_reserve_at_beginning))
+static mz_bool mz_zip_writer_end_internal(mz_zip_archive *pZip,
+                                          mz_bool set_last_error) {
+  mz_zip_internal_state *pState;
+  mz_bool status = MZ_TRUE;
+
+  if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) ||
+      ((pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) &&
+       (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED))) {
+    if (set_last_error)
+      mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
     return MZ_FALSE;
+  }
+
+  pState = pZip->m_pState;
+  pZip->m_pState = NULL;
+  mz_zip_array_clear(pZip, &pState->m_central_dir);
+  mz_zip_array_clear(pZip, &pState->m_central_dir_offsets);
+  mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets);
+
+#ifndef MINIZ_NO_STDIO
+  if (pState->m_pFile) {
+    if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE) {
+      if (MZ_FCLOSE(pState->m_pFile) == EOF) {
+        if (set_last_error)
+          mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED);
+        status = MZ_FALSE;
+      }
+    }
+
+    pState->m_pFile = NULL;
+  }
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+  if ((pZip->m_pWrite == mz_zip_heap_write_func) && (pState->m_pMem)) {
+    pZip->m_pFree(pZip->m_pAlloc_opaque, pState->m_pMem);
+    pState->m_pMem = NULL;
+  }
+
+  pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+  pZip->m_zip_mode = MZ_ZIP_MODE_INVALID;
+  return status;
+}
+
+mz_bool mz_zip_writer_init_v2(mz_zip_archive *pZip, mz_uint64 existing_size,
+                              mz_uint flags) {
+  mz_bool zip64 = (flags & MZ_ZIP_FLAG_WRITE_ZIP64) != 0;
+
+  if ((!pZip) || (pZip->m_pState) || (!pZip->m_pWrite) ||
+      (pZip->m_zip_mode != MZ_ZIP_MODE_INVALID))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING) {
+    if (!pZip->m_pRead)
+      return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+  }
+
+  if (pZip->m_file_offset_alignment) {
+    /* Ensure user specified file offset alignment is a power of 2. */
+    if (pZip->m_file_offset_alignment & (pZip->m_file_offset_alignment - 1))
+      return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+  }
+
+  if (!pZip->m_pAlloc)
+    pZip->m_pAlloc = miniz_def_alloc_func;
+  if (!pZip->m_pFree)
+    pZip->m_pFree = miniz_def_free_func;
+  if (!pZip->m_pRealloc)
+    pZip->m_pRealloc = miniz_def_realloc_func;
+
+  pZip->m_archive_size = existing_size;
+  pZip->m_central_directory_file_ofs = 0;
+  pZip->m_total_files = 0;
+
+  if (NULL == (pZip->m_pState = (mz_zip_internal_state *)pZip->m_pAlloc(
+                   pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_internal_state))))
+    return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
+  memset(pZip->m_pState, 0, sizeof(mz_zip_internal_state));
+
+  MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir,
+                                sizeof(mz_uint8));
+  MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets,
+                                sizeof(mz_uint32));
+  MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets,
+                                sizeof(mz_uint32));
+
+  pZip->m_pState->m_zip64 = zip64;
+  pZip->m_pState->m_zip64_has_extended_info_fields = zip64;
+
+  pZip->m_zip_type = MZ_ZIP_TYPE_USER;
+  pZip->m_zip_mode = MZ_ZIP_MODE_WRITING;
+
+  return MZ_TRUE;
+}
+
+mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size) {
+  return mz_zip_writer_init_v2(pZip, existing_size, 0);
+}
+
+mz_bool mz_zip_writer_init_heap_v2(mz_zip_archive *pZip,
+                                   size_t size_to_reserve_at_beginning,
+                                   size_t initial_allocation_size,
+                                   mz_uint flags) {
+  pZip->m_pWrite = mz_zip_heap_write_func;
+  pZip->m_pNeeds_keepalive = NULL;
+
+  if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING)
+    pZip->m_pRead = mz_zip_mem_read_func;
+
+  pZip->m_pIO_opaque = pZip;
+
+  if (!mz_zip_writer_init_v2(pZip, size_to_reserve_at_beginning, flags))
+    return MZ_FALSE;
+
+  pZip->m_zip_type = MZ_ZIP_TYPE_HEAP;
+
   if (0 != (initial_allocation_size = MZ_MAX(initial_allocation_size,
                                              size_to_reserve_at_beginning))) {
     if (NULL == (pZip->m_pState->m_pMem = pZip->m_pAlloc(
                      pZip->m_pAlloc_opaque, 1, initial_allocation_size))) {
-      mz_zip_writer_end(pZip);
-      return MZ_FALSE;
+      mz_zip_writer_end_internal(pZip, MZ_FALSE);
+      return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
     }
     pZip->m_pState->m_mem_capacity = initial_allocation_size;
   }
+
   return MZ_TRUE;
 }
 
+mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip,
+                                size_t size_to_reserve_at_beginning,
+                                size_t initial_allocation_size) {
+  return mz_zip_writer_init_heap_v2(pZip, size_to_reserve_at_beginning,
+                                    initial_allocation_size, 0);
+}
+
 #ifndef MINIZ_NO_STDIO
 static size_t mz_zip_file_write_func(void *pOpaque, mz_uint64 file_ofs,
                                      const void *pBuf, size_t n) {
   mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
   mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile);
+
+  file_ofs += pZip->m_pState->m_file_archive_start_ofs;
+
   if (((mz_int64)file_ofs < 0) ||
       (((cur_ofs != (mz_int64)file_ofs)) &&
-       (MZ_FSEEK64(pZip->m_pState->m_pFile, (mz_int64)file_ofs, SEEK_SET))))
+       (MZ_FSEEK64(pZip->m_pState->m_pFile, (mz_int64)file_ofs, SEEK_SET)))) {
+    mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED);
     return 0;
+  }
+
   return MZ_FWRITE(pBuf, 1, n, pZip->m_pState->m_pFile);
 }
 
 mz_bool mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename,
                                 mz_uint64 size_to_reserve_at_beginning) {
+  return mz_zip_writer_init_file_v2(pZip, pFilename,
+                                    size_to_reserve_at_beginning, 0);
+}
+
+mz_bool mz_zip_writer_init_file_v2(mz_zip_archive *pZip, const char *pFilename,
+                                   mz_uint64 size_to_reserve_at_beginning,
+                                   mz_uint flags) {
   MZ_FILE *pFile;
+
   pZip->m_pWrite = mz_zip_file_write_func;
+  pZip->m_pNeeds_keepalive = NULL;
+
+  if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING)
+    pZip->m_pRead = mz_zip_file_read_func;
+
   pZip->m_pIO_opaque = pZip;
-  if (!mz_zip_writer_init(pZip, size_to_reserve_at_beginning))
+
+  if (!mz_zip_writer_init_v2(pZip, size_to_reserve_at_beginning, flags))
     return MZ_FALSE;
-  if (NULL == (pFile = MZ_FOPEN(pFilename, "wb"))) {
+
+  if (NULL == (pFile = MZ_FOPEN(
+                   pFilename,
+                   (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING) ? "w+b" : "wb"))) {
     mz_zip_writer_end(pZip);
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
   }
+
   pZip->m_pState->m_pFile = pFile;
+  pZip->m_zip_type = MZ_ZIP_TYPE_FILE;
+
   if (size_to_reserve_at_beginning) {
     mz_uint64 cur_ofs = 0;
     char buf[4096];
-    MZ_CLEAR_OBJ(buf);
+
+    MZ_CLEAR_ARR(buf);
+
     do {
       size_t n = (size_t)MZ_MIN(sizeof(buf), size_to_reserve_at_beginning);
       if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_ofs, buf, n) != n) {
         mz_zip_writer_end(pZip);
-        return MZ_FALSE;
+        return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
       }
       cur_ofs += n;
       size_to_reserve_at_beginning -= n;
     } while (size_to_reserve_at_beginning);
   }
+
   return MZ_TRUE;
 }
-#endif // #ifndef MINIZ_NO_STDIO
 
-mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip,
-                                       const char *pFilename) {
+mz_bool mz_zip_writer_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile,
+                                 mz_uint flags) {
+  pZip->m_pWrite = mz_zip_file_write_func;
+  pZip->m_pNeeds_keepalive = NULL;
+
+  if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING)
+    pZip->m_pRead = mz_zip_file_read_func;
+
+  pZip->m_pIO_opaque = pZip;
+
+  if (!mz_zip_writer_init_v2(pZip, 0, flags))
+    return MZ_FALSE;
+
+  pZip->m_pState->m_pFile = pFile;
+  pZip->m_pState->m_file_archive_start_ofs =
+      MZ_FTELL64(pZip->m_pState->m_pFile);
+  pZip->m_zip_type = MZ_ZIP_TYPE_CFILE;
+
+  return MZ_TRUE;
+}
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+mz_bool mz_zip_writer_init_from_reader_v2(mz_zip_archive *pZip,
+                                          const char *pFilename,
+                                          mz_uint flags) {
   mz_zip_internal_state *pState;
+
   if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING))
-    return MZ_FALSE;
-  // No sense in trying to write to an archive that's already at the support max
-  // size
-  if ((pZip->m_total_files == 0xFFFF) ||
-      ((pZip->m_archive_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE +
-        MZ_ZIP_LOCAL_DIR_HEADER_SIZE) > 0xFFFFFFFF))
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  if (flags & MZ_ZIP_FLAG_WRITE_ZIP64) {
+    /* We don't support converting a non-zip64 file to zip64 - this seems like
+     * more trouble than it's worth. (What about the existing 32-bit data
+     * descriptors that could follow the compressed data?) */
+    if (!pZip->m_pState->m_zip64)
+      return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+  }
+
+  /* No sense in trying to write to an archive that's already at the support max
+   * size */
+  if (pZip->m_pState->m_zip64) {
+    if (pZip->m_total_files == MZ_UINT32_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+  } else {
+    if (pZip->m_total_files == MZ_UINT16_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+
+    if ((pZip->m_archive_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE +
+         MZ_ZIP_LOCAL_DIR_HEADER_SIZE) > MZ_UINT32_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE);
+  }
 
   pState = pZip->m_pState;
 
   if (pState->m_pFile) {
 #ifdef MINIZ_NO_STDIO
-    pFilename;
-    return MZ_FALSE;
+    (void)pFilename;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
 #else
-    // Archive is being read from stdio - try to reopen as writable.
     if (pZip->m_pIO_opaque != pZip)
-      return MZ_FALSE;
-    if (!pFilename)
-      return MZ_FALSE;
-    pZip->m_pWrite = mz_zip_file_write_func;
-    if (NULL ==
-        (pState->m_pFile = MZ_FREOPEN(pFilename, "r+b", pState->m_pFile))) {
-      // The mz_zip_archive is now in a bogus state because pState->m_pFile is
-      // NULL, so just close it.
-      mz_zip_reader_end(pZip);
-      return MZ_FALSE;
+      return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+    if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE) {
+      if (!pFilename)
+        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+      /* Archive is being read from stdio and was originally opened only for
+       * reading. Try to reopen as writable. */
+      if (NULL ==
+          (pState->m_pFile = MZ_FREOPEN(pFilename, "r+b", pState->m_pFile))) {
+        /* The mz_zip_archive is now in a bogus state because pState->m_pFile is
+         * NULL, so just close it. */
+        mz_zip_reader_end_internal(pZip, MZ_FALSE);
+        return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
+      }
     }
-#endif // #ifdef MINIZ_NO_STDIO
+
+    pZip->m_pWrite = mz_zip_file_write_func;
+    pZip->m_pNeeds_keepalive = NULL;
+#endif /* #ifdef MINIZ_NO_STDIO */
   } else if (pState->m_pMem) {
-    // Archive lives in a memory block. Assume it's from the heap that we can
-    // resize using the realloc callback.
+    /* Archive lives in a memory block. Assume it's from the heap that we can
+     * resize using the realloc callback. */
     if (pZip->m_pIO_opaque != pZip)
-      return MZ_FALSE;
+      return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
     pState->m_mem_capacity = pState->m_mem_size;
     pZip->m_pWrite = mz_zip_heap_write_func;
+    pZip->m_pNeeds_keepalive = NULL;
   }
-  // Archive is being read via a user provided read function - make sure the
-  // user has specified a write function too.
+  /* Archive is being read via a user provided read function - make sure the
+     user has specified a write function too. */
   else if (!pZip->m_pWrite)
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
 
-  // Start writing new files at the archive's current central directory
-  // location.
+  /* Start writing new files at the archive's current central directory
+   * location. */
+  /* TODO: We could add a flag that lets the user start writing immediately
+   * AFTER the existing central dir - this would be safer. */
   pZip->m_archive_size = pZip->m_central_directory_file_ofs;
-  pZip->m_zip_mode = MZ_ZIP_MODE_WRITING;
   pZip->m_central_directory_file_ofs = 0;
 
+  /* Clear the sorted central dir offsets, they aren't useful or maintained now.
+   */
+  /* Even though we're now in write mode, files can still be extracted and
+   * verified, but file locates will be slow. */
+  /* TODO: We could easily maintain the sorted central directory offsets. */
+  mz_zip_array_clear(pZip, &pZip->m_pState->m_sorted_central_dir_offsets);
+
+  pZip->m_zip_mode = MZ_ZIP_MODE_WRITING;
+
   return MZ_TRUE;
 }
 
+mz_bool mz_zip_writer_init_from_reader_v2_noreopen(mz_zip_archive *pZip,
+                                                   const char *pFilename,
+                                                   mz_uint flags) {
+  mz_zip_internal_state *pState;
+
+  if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  if (flags & MZ_ZIP_FLAG_WRITE_ZIP64) {
+    /* We don't support converting a non-zip64 file to zip64 - this seems like
+     * more trouble than it's worth. (What about the existing 32-bit data
+     * descriptors that could follow the compressed data?) */
+    if (!pZip->m_pState->m_zip64)
+      return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+  }
+
+  /* No sense in trying to write to an archive that's already at the support max
+   * size */
+  if (pZip->m_pState->m_zip64) {
+    if (pZip->m_total_files == MZ_UINT32_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+  } else {
+    if (pZip->m_total_files == MZ_UINT16_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+
+    if ((pZip->m_archive_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE +
+         MZ_ZIP_LOCAL_DIR_HEADER_SIZE) > MZ_UINT32_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE);
+  }
+
+  pState = pZip->m_pState;
+
+  if (pState->m_pFile) {
+#ifdef MINIZ_NO_STDIO
+    (void)pFilename;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+#else
+    if (pZip->m_pIO_opaque != pZip)
+      return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+    if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE) {
+      if (!pFilename)
+        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+    }
+
+    pZip->m_pWrite = mz_zip_file_write_func;
+    pZip->m_pNeeds_keepalive = NULL;
+#endif /* #ifdef MINIZ_NO_STDIO */
+  } else if (pState->m_pMem) {
+    /* Archive lives in a memory block. Assume it's from the heap that we can
+     * resize using the realloc callback. */
+    if (pZip->m_pIO_opaque != pZip)
+      return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+    pState->m_mem_capacity = pState->m_mem_size;
+    pZip->m_pWrite = mz_zip_heap_write_func;
+    pZip->m_pNeeds_keepalive = NULL;
+  }
+  /* Archive is being read via a user provided read function - make sure the
+     user has specified a write function too. */
+  else if (!pZip->m_pWrite)
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  /* Start writing new files at the archive's current central directory
+   * location. */
+  /* TODO: We could add a flag that lets the user start writing immediately
+   * AFTER the existing central dir - this would be safer. */
+  pZip->m_archive_size = pZip->m_central_directory_file_ofs;
+  pZip->m_central_directory_file_ofs = 0;
+
+  /* Clear the sorted central dir offsets, they aren't useful or maintained now.
+   */
+  /* Even though we're now in write mode, files can still be extracted and
+   * verified, but file locates will be slow. */
+  /* TODO: We could easily maintain the sorted central directory offsets. */
+  mz_zip_array_clear(pZip, &pZip->m_pState->m_sorted_central_dir_offsets);
+
+  pZip->m_zip_mode = MZ_ZIP_MODE_WRITING;
+
+  return MZ_TRUE;
+}
+
+mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip,
+                                       const char *pFilename) {
+  return mz_zip_writer_init_from_reader_v2(pZip, pFilename, 0);
+}
+
+/* TODO: pArchive_name is a terrible name here! */
 mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip, const char *pArchive_name,
                               const void *pBuf, size_t buf_size,
                               mz_uint level_and_flags) {
@@ -5973,11 +8296,50 @@ static mz_bool mz_zip_writer_add_put_buf_callback(const void *pBuf, int len,
                                     pState->m_cur_archive_file_ofs, pBuf,
                                     len) != len)
     return MZ_FALSE;
+
   pState->m_cur_archive_file_ofs += len;
   pState->m_comp_size += len;
   return MZ_TRUE;
 }
 
+#define MZ_ZIP64_MAX_LOCAL_EXTRA_FIELD_SIZE                                    \
+  (sizeof(mz_uint16) * 2 + sizeof(mz_uint64) * 2)
+#define MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE                                  \
+  (sizeof(mz_uint16) * 2 + sizeof(mz_uint64) * 3)
+static mz_uint32
+mz_zip_writer_create_zip64_extra_data(mz_uint8 *pBuf, mz_uint64 *pUncomp_size,
+                                      mz_uint64 *pComp_size,
+                                      mz_uint64 *pLocal_header_ofs) {
+  mz_uint8 *pDst = pBuf;
+  mz_uint32 field_size = 0;
+
+  MZ_WRITE_LE16(pDst + 0, MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID);
+  MZ_WRITE_LE16(pDst + 2, 0);
+  pDst += sizeof(mz_uint16) * 2;
+
+  if (pUncomp_size) {
+    MZ_WRITE_LE64(pDst, *pUncomp_size);
+    pDst += sizeof(mz_uint64);
+    field_size += sizeof(mz_uint64);
+  }
+
+  if (pComp_size) {
+    MZ_WRITE_LE64(pDst, *pComp_size);
+    pDst += sizeof(mz_uint64);
+    field_size += sizeof(mz_uint64);
+  }
+
+  if (pLocal_header_ofs) {
+    MZ_WRITE_LE64(pDst, *pLocal_header_ofs);
+    pDst += sizeof(mz_uint64);
+    field_size += sizeof(mz_uint64);
+  }
+
+  MZ_WRITE_LE16(pBuf + 2, field_size);
+
+  return (mz_uint32)(pDst - pBuf);
+}
+
 static mz_bool mz_zip_writer_create_local_dir_header(
     mz_zip_archive *pZip, mz_uint8 *pDst, mz_uint16 filename_size,
     mz_uint16 extra_size, mz_uint64 uncomp_size, mz_uint64 comp_size,
@@ -5992,8 +8354,10 @@ static mz_bool mz_zip_writer_create_local_dir_header(
   MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILE_TIME_OFS, dos_time);
   MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILE_DATE_OFS, dos_date);
   MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_CRC32_OFS, uncomp_crc32);
-  MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS, comp_size);
-  MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS, uncomp_size);
+  MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS,
+                MZ_MIN(comp_size, MZ_UINT32_MAX));
+  MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS,
+                MZ_MIN(uncomp_size, MZ_UINT32_MAX));
   MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILENAME_LEN_OFS, filename_size);
   MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_EXTRA_LEN_OFS, extra_size);
   return MZ_TRUE;
@@ -6006,25 +8370,24 @@ static mz_bool mz_zip_writer_create_central_dir_header(
     mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date,
     mz_uint64 local_header_ofs, mz_uint32 ext_attributes) {
   (void)pZip;
-  mz_uint16 version_made_by = 10 * MZ_VER_MAJOR + MZ_VER_MINOR;
-  version_made_by |= (MZ_PLATFORM << 8);
-
   memset(pDst, 0, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE);
   MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_SIG_OFS, MZ_ZIP_CENTRAL_DIR_HEADER_SIG);
-  MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_VERSION_MADE_BY_OFS, version_made_by);
   MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_VERSION_NEEDED_OFS, method ? 20 : 0);
   MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_BIT_FLAG_OFS, bit_flags);
   MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_METHOD_OFS, method);
   MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILE_TIME_OFS, dos_time);
   MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILE_DATE_OFS, dos_date);
   MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_CRC32_OFS, uncomp_crc32);
-  MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS, comp_size);
-  MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS, uncomp_size);
+  MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS,
+                MZ_MIN(comp_size, MZ_UINT32_MAX));
+  MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS,
+                MZ_MIN(uncomp_size, MZ_UINT32_MAX));
   MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILENAME_LEN_OFS, filename_size);
   MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_EXTRA_LEN_OFS, extra_size);
   MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_COMMENT_LEN_OFS, comment_size);
   MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS, ext_attributes);
-  MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_LOCAL_HEADER_OFS, local_header_ofs);
+  MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_LOCAL_HEADER_OFS,
+                MZ_MIN(local_header_ofs, MZ_UINT32_MAX));
   return MZ_TRUE;
 }
 
@@ -6034,24 +8397,30 @@ static mz_bool mz_zip_writer_add_to_central_dir(
     mz_uint16 comment_size, mz_uint64 uncomp_size, mz_uint64 comp_size,
     mz_uint32 uncomp_crc32, mz_uint16 method, mz_uint16 bit_flags,
     mz_uint16 dos_time, mz_uint16 dos_date, mz_uint64 local_header_ofs,
-    mz_uint32 ext_attributes) {
+    mz_uint32 ext_attributes, const char *user_extra_data,
+    mz_uint user_extra_data_len) {
   mz_zip_internal_state *pState = pZip->m_pState;
   mz_uint32 central_dir_ofs = (mz_uint32)pState->m_central_dir.m_size;
   size_t orig_central_dir_size = pState->m_central_dir.m_size;
   mz_uint8 central_dir_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE];
 
-  // No zip64 support yet
-  if ((local_header_ofs > 0xFFFFFFFF) ||
-      (((mz_uint64)pState->m_central_dir.m_size +
-        MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + extra_size +
-        comment_size) > 0xFFFFFFFF))
-    return MZ_FALSE;
+  if (!pZip->m_pState->m_zip64) {
+    if (local_header_ofs > 0xFFFFFFFF)
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE);
+  }
+
+  /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */
+  if (((mz_uint64)pState->m_central_dir.m_size +
+       MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + extra_size +
+       user_extra_data_len + comment_size) >= MZ_UINT32_MAX)
+    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
 
   if (!mz_zip_writer_create_central_dir_header(
-          pZip, central_dir_header, filename_size, extra_size, comment_size,
+          pZip, central_dir_header, filename_size,
+          (mz_uint16)(extra_size + user_extra_data_len), comment_size,
           uncomp_size, comp_size, uncomp_crc32, method, bit_flags, dos_time,
           dos_date, local_header_ofs, ext_attributes))
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
 
   if ((!mz_zip_array_push_back(pZip, &pState->m_central_dir, central_dir_header,
                                MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)) ||
@@ -6059,30 +8428,32 @@ static mz_bool mz_zip_writer_add_to_central_dir(
                                filename_size)) ||
       (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pExtra,
                                extra_size)) ||
+      (!mz_zip_array_push_back(pZip, &pState->m_central_dir, user_extra_data,
+                               user_extra_data_len)) ||
       (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pComment,
                                comment_size)) ||
       (!mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets,
                                &central_dir_ofs, 1))) {
-    // Try to push the central directory array back into its original state.
+    /* Try to resize the central directory array back into its original state.
+     */
     mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size,
                         MZ_FALSE);
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
   }
 
   return MZ_TRUE;
 }
 
 static mz_bool mz_zip_writer_validate_archive_name(const char *pArchive_name) {
-  // Basic ZIP archive filename validity checks: Valid filenames cannot start
-  // with a forward slash, cannot contain a drive letter, and cannot use
-  // DOS-style backward slashes.
+  /* Basic ZIP archive filename validity checks: Valid filenames cannot start
+   * with a forward slash, cannot contain a drive letter, and cannot use
+   * DOS-style backward slashes. */
   if (*pArchive_name == '/')
     return MZ_FALSE;
-  while (*pArchive_name) {
-    if ((*pArchive_name == '\\') || (*pArchive_name == ':'))
-      return MZ_FALSE;
-    pArchive_name++;
-  }
+
+  /* Making sure the name does not contain drive letters or DOS style backward
+   * slashes is the responsibility of the program using miniz*/
+
   return MZ_TRUE;
 }
 
@@ -6103,7 +8474,8 @@ static mz_bool mz_zip_writer_write_zeros(mz_zip_archive *pZip,
   while (n) {
     mz_uint32 s = MZ_MIN(sizeof(buf), n);
     if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_file_ofs, buf, s) != s)
-      return MZ_FALSE;
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
     cur_file_ofs += s;
     n -= s;
   }
@@ -6116,18 +8488,42 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip,
                                  mz_uint16 comment_size,
                                  mz_uint level_and_flags, mz_uint64 uncomp_size,
                                  mz_uint32 uncomp_crc32) {
-  mz_uint32 ext_attributes = 0;
+  return mz_zip_writer_add_mem_ex_v2(
+      pZip, pArchive_name, pBuf, buf_size, pComment, comment_size,
+      level_and_flags, uncomp_size, uncomp_crc32, NULL, NULL, 0, NULL, 0);
+}
+
+mz_bool mz_zip_writer_add_mem_ex_v2(
+    mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf,
+    size_t buf_size, const void *pComment, mz_uint16 comment_size,
+    mz_uint level_and_flags, mz_uint64 uncomp_size, mz_uint32 uncomp_crc32,
+    MZ_TIME_T *last_modified, const char *user_extra_data,
+    mz_uint user_extra_data_len, const char *user_extra_data_central,
+    mz_uint user_extra_data_central_len) {
   mz_uint16 method = 0, dos_time = 0, dos_date = 0;
-  mz_uint level, num_alignment_padding_bytes;
-  mz_uint64 local_dir_header_ofs, cur_archive_file_ofs, comp_size = 0;
+  mz_uint level, ext_attributes = 0, num_alignment_padding_bytes;
+  mz_uint64 local_dir_header_ofs = pZip->m_archive_size,
+            cur_archive_file_ofs = pZip->m_archive_size, comp_size = 0;
   size_t archive_name_size;
   mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE];
   tdefl_compressor *pComp = NULL;
   mz_bool store_data_uncompressed;
   mz_zip_internal_state *pState;
+  mz_uint8 *pExtra_data = NULL;
+  mz_uint32 extra_size = 0;
+  mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE];
+  mz_uint16 bit_flags = 0;
 
   if ((int)level_and_flags < 0)
     level_and_flags = MZ_DEFAULT_LEVEL;
+
+  if (uncomp_size ||
+      (buf_size && !(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)))
+    bit_flags |= MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR;
+
+  if (!(level_and_flags & MZ_ZIP_FLAG_ASCII_FILENAME))
+    bit_flags |= MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8;
+
   level = level_and_flags & 0xF;
   store_data_uncompressed =
       ((!level) || (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA));
@@ -6135,86 +8531,40 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip,
   if ((!pZip) || (!pZip->m_pState) ||
       (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || ((buf_size) && (!pBuf)) ||
       (!pArchive_name) || ((comment_size) && (!pComment)) ||
-      (pZip->m_total_files == 0xFFFF) || (level > MZ_UBER_COMPRESSION))
-    return MZ_FALSE;
+      (level > MZ_UBER_COMPRESSION))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
 
-  local_dir_header_ofs = cur_archive_file_ofs = pZip->m_archive_size;
   pState = pZip->m_pState;
 
+  if (pState->m_zip64) {
+    if (pZip->m_total_files == MZ_UINT32_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+  } else {
+    if (pZip->m_total_files == MZ_UINT16_MAX) {
+      pState->m_zip64 = MZ_TRUE;
+      /*return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); */
+    }
+    if (((mz_uint64)buf_size > 0xFFFFFFFF) || (uncomp_size > 0xFFFFFFFF)) {
+      pState->m_zip64 = MZ_TRUE;
+      /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
+    }
+  }
+
   if ((!(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (uncomp_size))
-    return MZ_FALSE;
-  // No zip64 support yet
-  if ((buf_size > 0xFFFFFFFF) || (uncomp_size > 0xFFFFFFFF))
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
   if (!mz_zip_writer_validate_archive_name(pArchive_name))
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
 
 #ifndef MINIZ_NO_TIME
-  {
-    time_t cur_time;
+  if (last_modified != NULL) {
+    mz_zip_time_t_to_dos_time(*last_modified, &dos_time, &dos_date);
+  } else {
+    MZ_TIME_T cur_time;
     time(&cur_time);
     mz_zip_time_t_to_dos_time(cur_time, &dos_time, &dos_date);
   }
-#endif // #ifndef MINIZ_NO_TIME
-
-  archive_name_size = strlen(pArchive_name);
-  if (archive_name_size > 0xFFFF)
-    return MZ_FALSE;
-
-  num_alignment_padding_bytes =
-      mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
-
-  // no zip64 support yet
-  if ((pZip->m_total_files == 0xFFFF) ||
-      ((pZip->m_archive_size + num_alignment_padding_bytes +
-        MZ_ZIP_LOCAL_DIR_HEADER_SIZE + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE +
-        comment_size + archive_name_size) > 0xFFFFFFFF))
-    return MZ_FALSE;
-
-  if ((archive_name_size) && (pArchive_name[archive_name_size - 1] == '/')) {
-    // Set DOS Subdirectory attribute bit.
-    ext_attributes |= 0x10;
-    // Subdirectories cannot contain data.
-    if ((buf_size) || (uncomp_size))
-      return MZ_FALSE;
-  }
-
-  // Try to do any allocations before writing to the archive, so if an
-  // allocation fails the file remains unmodified. (A good idea if we're doing
-  // an in-place modification.)
-  if ((!mz_zip_array_ensure_room(pZip, &pState->m_central_dir,
-                                 MZ_ZIP_CENTRAL_DIR_HEADER_SIZE +
-                                     archive_name_size + comment_size)) ||
-      (!mz_zip_array_ensure_room(pZip, &pState->m_central_dir_offsets, 1)))
-    return MZ_FALSE;
-
-  if ((!store_data_uncompressed) && (buf_size)) {
-    if (NULL == (pComp = (tdefl_compressor *)pZip->m_pAlloc(
-                     pZip->m_pAlloc_opaque, 1, sizeof(tdefl_compressor))))
-      return MZ_FALSE;
-  }
-
-  if (!mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs,
-                                 num_alignment_padding_bytes +
-                                     sizeof(local_dir_header))) {
-    pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
-    return MZ_FALSE;
-  }
-  local_dir_header_ofs += num_alignment_padding_bytes;
-  if (pZip->m_file_offset_alignment) {
-    MZ_ASSERT((local_dir_header_ofs & (pZip->m_file_offset_alignment - 1)) ==
-              0);
-  }
-  cur_archive_file_ofs +=
-      num_alignment_padding_bytes + sizeof(local_dir_header);
-
-  MZ_CLEAR_OBJ(local_dir_header);
-  if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name,
-                     archive_name_size) != archive_name_size) {
-    pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
-    return MZ_FALSE;
-  }
-  cur_archive_file_ofs += archive_name_size;
+#endif /* #ifndef MINIZ_NO_TIME */
 
   if (!(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) {
     uncomp_crc32 =
@@ -6226,18 +8576,156 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip,
     }
   }
 
+  archive_name_size = strlen(pArchive_name);
+  if (archive_name_size > MZ_UINT16_MAX)
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
+
+  num_alignment_padding_bytes =
+      mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
+
+  /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */
+  if (((mz_uint64)pState->m_central_dir.m_size +
+       MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size +
+       MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE + comment_size) >= MZ_UINT32_MAX)
+    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
+
+  if (!pState->m_zip64) {
+    /* Bail early if the archive would obviously become too large */
+    if ((pZip->m_archive_size + num_alignment_padding_bytes +
+         MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size +
+         MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size +
+         user_extra_data_len + pState->m_central_dir.m_size +
+         MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + user_extra_data_central_len +
+         MZ_ZIP_DATA_DESCRIPTER_SIZE32) > 0xFFFFFFFF) {
+      pState->m_zip64 = MZ_TRUE;
+      /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
+    }
+  }
+
+  if ((archive_name_size) && (pArchive_name[archive_name_size - 1] == '/')) {
+    /* Set DOS Subdirectory attribute bit. */
+    ext_attributes |= MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG;
+
+    /* Subdirectories cannot contain data. */
+    if ((buf_size) || (uncomp_size))
+      return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+  }
+
+  /* Try to do any allocations before writing to the archive, so if an
+   * allocation fails the file remains unmodified. (A good idea if we're doing
+   * an in-place modification.) */
+  if ((!mz_zip_array_ensure_room(
+          pZip, &pState->m_central_dir,
+          MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size +
+              (pState->m_zip64 ? MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE : 0))) ||
+      (!mz_zip_array_ensure_room(pZip, &pState->m_central_dir_offsets, 1)))
+    return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
+  if ((!store_data_uncompressed) && (buf_size)) {
+    if (NULL == (pComp = (tdefl_compressor *)pZip->m_pAlloc(
+                     pZip->m_pAlloc_opaque, 1, sizeof(tdefl_compressor))))
+      return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+  }
+
+  if (!mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs,
+                                 num_alignment_padding_bytes)) {
+    pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
+    return MZ_FALSE;
+  }
+
+  local_dir_header_ofs += num_alignment_padding_bytes;
+  if (pZip->m_file_offset_alignment) {
+    MZ_ASSERT((local_dir_header_ofs & (pZip->m_file_offset_alignment - 1)) ==
+              0);
+  }
+  cur_archive_file_ofs += num_alignment_padding_bytes;
+
+  MZ_CLEAR_ARR(local_dir_header);
+
+  if (!store_data_uncompressed ||
+      (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) {
+    method = MZ_DEFLATED;
+  }
+
+  if (pState->m_zip64) {
+    if (uncomp_size >= MZ_UINT32_MAX || local_dir_header_ofs >= MZ_UINT32_MAX) {
+      pExtra_data = extra_data;
+      extra_size = mz_zip_writer_create_zip64_extra_data(
+          extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
+          (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL,
+          (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs
+                                                  : NULL);
+    }
+
+    if (!mz_zip_writer_create_local_dir_header(
+            pZip, local_dir_header, (mz_uint16)archive_name_size,
+            (mz_uint16)(extra_size + user_extra_data_len), 0, 0, 0, method,
+            bit_flags, dos_time, dos_date))
+      return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
+
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs,
+                       local_dir_header,
+                       sizeof(local_dir_header)) != sizeof(local_dir_header))
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+    cur_archive_file_ofs += sizeof(local_dir_header);
+
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name,
+                       archive_name_size) != archive_name_size) {
+      pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+    }
+    cur_archive_file_ofs += archive_name_size;
+
+    if (pExtra_data != NULL) {
+      if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, extra_data,
+                         extra_size) != extra_size)
+        return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+      cur_archive_file_ofs += extra_size;
+    }
+  } else {
+    if ((comp_size > MZ_UINT32_MAX) || (cur_archive_file_ofs > MZ_UINT32_MAX))
+      return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+    if (!mz_zip_writer_create_local_dir_header(
+            pZip, local_dir_header, (mz_uint16)archive_name_size,
+            (mz_uint16)user_extra_data_len, 0, 0, 0, method, bit_flags,
+            dos_time, dos_date))
+      return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
+
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs,
+                       local_dir_header,
+                       sizeof(local_dir_header)) != sizeof(local_dir_header))
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+    cur_archive_file_ofs += sizeof(local_dir_header);
+
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name,
+                       archive_name_size) != archive_name_size) {
+      pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+    }
+    cur_archive_file_ofs += archive_name_size;
+  }
+
+  if (user_extra_data_len > 0) {
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs,
+                       user_extra_data,
+                       user_extra_data_len) != user_extra_data_len)
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+    cur_archive_file_ofs += user_extra_data_len;
+  }
+
   if (store_data_uncompressed) {
     if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pBuf,
                        buf_size) != buf_size) {
       pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
-      return MZ_FALSE;
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
     }
 
     cur_archive_file_ofs += buf_size;
     comp_size = buf_size;
-
-    if (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)
-      method = MZ_DEFLATED;
   } else if (buf_size) {
     mz_zip_writer_add_state state;
 
@@ -6252,35 +8740,57 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip,
         (tdefl_compress_buffer(pComp, pBuf, buf_size, TDEFL_FINISH) !=
          TDEFL_STATUS_DONE)) {
       pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
-      return MZ_FALSE;
+      return mz_zip_set_error(pZip, MZ_ZIP_COMPRESSION_FAILED);
     }
 
     comp_size = state.m_comp_size;
     cur_archive_file_ofs = state.m_cur_archive_file_ofs;
-
-    method = MZ_DEFLATED;
   }
 
   pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
   pComp = NULL;
 
-  // no zip64 support yet
-  if ((comp_size > 0xFFFFFFFF) || (cur_archive_file_ofs > 0xFFFFFFFF))
-    return MZ_FALSE;
+  if (uncomp_size) {
+    mz_uint8 local_dir_footer[MZ_ZIP_DATA_DESCRIPTER_SIZE64];
+    mz_uint32 local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE32;
 
-  if (!mz_zip_writer_create_local_dir_header(
-          pZip, local_dir_header, (mz_uint16)archive_name_size, 0, uncomp_size,
-          comp_size, uncomp_crc32, method, 0, dos_time, dos_date))
-    return MZ_FALSE;
+    MZ_ASSERT(bit_flags & MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR);
 
-  if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs, local_dir_header,
-                     sizeof(local_dir_header)) != sizeof(local_dir_header))
-    return MZ_FALSE;
+    MZ_WRITE_LE32(local_dir_footer + 0, MZ_ZIP_DATA_DESCRIPTOR_ID);
+    MZ_WRITE_LE32(local_dir_footer + 4, uncomp_crc32);
+    if (pExtra_data == NULL) {
+      if (comp_size > MZ_UINT32_MAX)
+        return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+
+      MZ_WRITE_LE32(local_dir_footer + 8, comp_size);
+      MZ_WRITE_LE32(local_dir_footer + 12, uncomp_size);
+    } else {
+      MZ_WRITE_LE64(local_dir_footer + 8, comp_size);
+      MZ_WRITE_LE64(local_dir_footer + 16, uncomp_size);
+      local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE64;
+    }
+
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs,
+                       local_dir_footer,
+                       local_dir_footer_size) != local_dir_footer_size)
+      return MZ_FALSE;
+
+    cur_archive_file_ofs += local_dir_footer_size;
+  }
+
+  if (pExtra_data != NULL) {
+    extra_size = mz_zip_writer_create_zip64_extra_data(
+        extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
+        (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL,
+        (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
+  }
 
   if (!mz_zip_writer_add_to_central_dir(
-          pZip, pArchive_name, (mz_uint16)archive_name_size, NULL, 0, pComment,
-          comment_size, uncomp_size, comp_size, uncomp_crc32, method, 0,
-          dos_time, dos_date, local_dir_header_ofs, ext_attributes))
+          pZip, pArchive_name, (mz_uint16)archive_name_size, pExtra_data,
+          (mz_uint16)extra_size, pComment, comment_size, uncomp_size, comp_size,
+          uncomp_crc32, method, bit_flags, dos_time, dos_date,
+          local_dir_header_ofs, ext_attributes, user_extra_data_central,
+          user_extra_data_central_len))
     return MZ_FALSE;
 
   pZip->m_total_files++;
@@ -6289,121 +8799,225 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip,
   return MZ_TRUE;
 }
 
-#ifndef MINIZ_NO_STDIO
-mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
-                               const char *pSrc_filename, const void *pComment,
-                               mz_uint16 comment_size, mz_uint level_and_flags,
-                               mz_uint32 ext_attributes) {
+mz_bool mz_zip_writer_add_read_buf_callback(
+    mz_zip_archive *pZip, const char *pArchive_name,
+    mz_file_read_func read_callback, void *callback_opaque, mz_uint64 max_size,
+    const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size,
+    mz_uint level_and_flags, mz_uint32 ext_attributes,
+    const char *user_extra_data, mz_uint user_extra_data_len,
+    const char *user_extra_data_central, mz_uint user_extra_data_central_len) {
+  mz_uint16 gen_flags;
   mz_uint uncomp_crc32 = MZ_CRC32_INIT, level, num_alignment_padding_bytes;
   mz_uint16 method = 0, dos_time = 0, dos_date = 0;
-#ifndef MINIZ_NO_TIME
-  time_t file_modified_time;
-#endif
-
-  mz_uint64 local_dir_header_ofs, cur_archive_file_ofs, uncomp_size = 0,
-                                                        comp_size = 0;
+  mz_uint64 local_dir_header_ofs, cur_archive_file_ofs = pZip->m_archive_size,
+                                  uncomp_size = 0, comp_size = 0;
   size_t archive_name_size;
   mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE];
-  MZ_FILE *pSrc_file = NULL;
+  mz_uint8 *pExtra_data = NULL;
+  mz_uint32 extra_size = 0;
+  mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE];
+  mz_zip_internal_state *pState;
+  mz_uint64 file_ofs = 0, cur_archive_header_file_ofs;
 
   if ((int)level_and_flags < 0)
     level_and_flags = MZ_DEFAULT_LEVEL;
   level = level_and_flags & 0xF;
 
+  gen_flags = (level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE)
+                  ? 0
+                  : MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR;
+
+  if (!(level_and_flags & MZ_ZIP_FLAG_ASCII_FILENAME))
+    gen_flags |= MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8;
+
+  /* Sanity checks */
   if ((!pZip) || (!pZip->m_pState) ||
       (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || (!pArchive_name) ||
       ((comment_size) && (!pComment)) || (level > MZ_UBER_COMPRESSION))
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
 
-  local_dir_header_ofs = cur_archive_file_ofs = pZip->m_archive_size;
+  pState = pZip->m_pState;
 
+  if ((!pState->m_zip64) && (max_size > MZ_UINT32_MAX)) {
+    /* Source file is too large for non-zip64 */
+    /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
+    pState->m_zip64 = MZ_TRUE;
+  }
+
+  /* We could support this, but why? */
   if (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
   if (!mz_zip_writer_validate_archive_name(pArchive_name))
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
+
+  if (pState->m_zip64) {
+    if (pZip->m_total_files == MZ_UINT32_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+  } else {
+    if (pZip->m_total_files == MZ_UINT16_MAX) {
+      pState->m_zip64 = MZ_TRUE;
+      /*return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); */
+    }
+  }
 
   archive_name_size = strlen(pArchive_name);
-  if (archive_name_size > 0xFFFF)
-    return MZ_FALSE;
+  if (archive_name_size > MZ_UINT16_MAX)
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
 
   num_alignment_padding_bytes =
       mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
 
-  // no zip64 support yet
-  if ((pZip->m_total_files == 0xFFFF) ||
-      ((pZip->m_archive_size + num_alignment_padding_bytes +
-        MZ_ZIP_LOCAL_DIR_HEADER_SIZE + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE +
-        comment_size + archive_name_size) > 0xFFFFFFFF))
-    return MZ_FALSE;
+  /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */
+  if (((mz_uint64)pState->m_central_dir.m_size +
+       MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size +
+       MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE + comment_size) >= MZ_UINT32_MAX)
+    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
+
+  if (!pState->m_zip64) {
+    /* Bail early if the archive would obviously become too large */
+    if ((pZip->m_archive_size + num_alignment_padding_bytes +
+         MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size +
+         MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size +
+         user_extra_data_len + pState->m_central_dir.m_size +
+         MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + 1024 +
+         MZ_ZIP_DATA_DESCRIPTER_SIZE32 + user_extra_data_central_len) >
+        0xFFFFFFFF) {
+      pState->m_zip64 = MZ_TRUE;
+      /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
+    }
+  }
 
 #ifndef MINIZ_NO_TIME
-  memset(&file_modified_time, 0, sizeof(file_modified_time));
-  if (!mz_zip_get_file_modified_time(pSrc_filename, &file_modified_time))
-    return MZ_FALSE;
-  mz_zip_time_t_to_dos_time(file_modified_time, &dos_time, &dos_date);
+  if (pFile_time) {
+    mz_zip_time_t_to_dos_time(*pFile_time, &dos_time, &dos_date);
+  }
 #endif
 
-  pSrc_file = MZ_FOPEN(pSrc_filename, "rb");
-  if (!pSrc_file)
-    return MZ_FALSE;
-  MZ_FSEEK64(pSrc_file, 0, SEEK_END);
-  uncomp_size = MZ_FTELL64(pSrc_file);
-  MZ_FSEEK64(pSrc_file, 0, SEEK_SET);
-
-  if (uncomp_size > 0xFFFFFFFF) {
-    // No zip64 support yet
-    MZ_FCLOSE(pSrc_file);
-    return MZ_FALSE;
-  }
-  if (uncomp_size <= 3)
+  if (max_size <= 3)
     level = 0;
 
   if (!mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs,
-                                 num_alignment_padding_bytes +
-                                     sizeof(local_dir_header))) {
-    MZ_FCLOSE(pSrc_file);
-    return MZ_FALSE;
+                                 num_alignment_padding_bytes)) {
+    return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
   }
-  local_dir_header_ofs += num_alignment_padding_bytes;
+
+  cur_archive_file_ofs += num_alignment_padding_bytes;
+  local_dir_header_ofs = cur_archive_file_ofs;
+
   if (pZip->m_file_offset_alignment) {
-    MZ_ASSERT((local_dir_header_ofs & (pZip->m_file_offset_alignment - 1)) ==
+    MZ_ASSERT((cur_archive_file_ofs & (pZip->m_file_offset_alignment - 1)) ==
               0);
   }
-  cur_archive_file_ofs +=
-      num_alignment_padding_bytes + sizeof(local_dir_header);
 
-  MZ_CLEAR_OBJ(local_dir_header);
-  if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name,
-                     archive_name_size) != archive_name_size) {
-    MZ_FCLOSE(pSrc_file);
-    return MZ_FALSE;
+  if (max_size && level) {
+    method = MZ_DEFLATED;
   }
-  cur_archive_file_ofs += archive_name_size;
 
-  if (uncomp_size) {
-    mz_uint64 uncomp_remaining = uncomp_size;
+  MZ_CLEAR_ARR(local_dir_header);
+  if (pState->m_zip64) {
+    if (max_size >= MZ_UINT32_MAX || local_dir_header_ofs >= MZ_UINT32_MAX) {
+      pExtra_data = extra_data;
+      if (level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE)
+        extra_size = mz_zip_writer_create_zip64_extra_data(
+            extra_data, (max_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
+            (max_size >= MZ_UINT32_MAX) ? &comp_size : NULL,
+            (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs
+                                                    : NULL);
+      else
+        extra_size = mz_zip_writer_create_zip64_extra_data(
+            extra_data, NULL, NULL,
+            (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs
+                                                    : NULL);
+    }
+
+    if (!mz_zip_writer_create_local_dir_header(
+            pZip, local_dir_header, (mz_uint16)archive_name_size,
+            (mz_uint16)(extra_size + user_extra_data_len), 0, 0, 0, method,
+            gen_flags, dos_time, dos_date))
+      return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
+
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs,
+                       local_dir_header,
+                       sizeof(local_dir_header)) != sizeof(local_dir_header))
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+    cur_archive_file_ofs += sizeof(local_dir_header);
+
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name,
+                       archive_name_size) != archive_name_size) {
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+    }
+
+    cur_archive_file_ofs += archive_name_size;
+
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, extra_data,
+                       extra_size) != extra_size)
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+    cur_archive_file_ofs += extra_size;
+  } else {
+    if ((comp_size > MZ_UINT32_MAX) || (cur_archive_file_ofs > MZ_UINT32_MAX))
+      return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+    if (!mz_zip_writer_create_local_dir_header(
+            pZip, local_dir_header, (mz_uint16)archive_name_size,
+            (mz_uint16)user_extra_data_len, 0, 0, 0, method, gen_flags,
+            dos_time, dos_date))
+      return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
+
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs,
+                       local_dir_header,
+                       sizeof(local_dir_header)) != sizeof(local_dir_header))
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+    cur_archive_file_ofs += sizeof(local_dir_header);
+
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name,
+                       archive_name_size) != archive_name_size) {
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+    }
+
+    cur_archive_file_ofs += archive_name_size;
+  }
+
+  if (user_extra_data_len > 0) {
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs,
+                       user_extra_data,
+                       user_extra_data_len) != user_extra_data_len)
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+    cur_archive_file_ofs += user_extra_data_len;
+  }
+
+  if (max_size) {
     void *pRead_buf =
         pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, MZ_ZIP_MAX_IO_BUF_SIZE);
     if (!pRead_buf) {
-      MZ_FCLOSE(pSrc_file);
-      return MZ_FALSE;
+      return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
     }
 
     if (!level) {
-      while (uncomp_remaining) {
-        mz_uint n = (mz_uint)MZ_MIN(MZ_ZIP_MAX_IO_BUF_SIZE, uncomp_remaining);
-        if ((MZ_FREAD(pRead_buf, 1, n, pSrc_file) != n) ||
-            (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pRead_buf,
-                            n) != n)) {
+      while (1) {
+        size_t n = read_callback(callback_opaque, file_ofs, pRead_buf,
+                                 MZ_ZIP_MAX_IO_BUF_SIZE);
+        if (n == 0)
+          break;
+
+        if ((n > MZ_ZIP_MAX_IO_BUF_SIZE) || (file_ofs + n > max_size)) {
           pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
-          MZ_FCLOSE(pSrc_file);
-          return MZ_FALSE;
+          return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
         }
+        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pRead_buf,
+                           n) != n) {
+          pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
+          return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+        }
+        file_ofs += n;
         uncomp_crc32 =
             (mz_uint32)mz_crc32(uncomp_crc32, (const mz_uint8 *)pRead_buf, n);
-        uncomp_remaining -= n;
         cur_archive_file_ofs += n;
       }
+      uncomp_size = file_ofs;
       comp_size = uncomp_size;
     } else {
       mz_bool result = MZ_FALSE;
@@ -6412,8 +9026,7 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
           pZip->m_pAlloc_opaque, 1, sizeof(tdefl_compressor));
       if (!pComp) {
         pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
-        MZ_FCLOSE(pSrc_file);
-        return MZ_FALSE;
+        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
       }
 
       state.m_pZip = pZip;
@@ -6426,69 +9039,138 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
           TDEFL_STATUS_OKAY) {
         pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
         pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
-        MZ_FCLOSE(pSrc_file);
-        return MZ_FALSE;
+        return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
       }
 
       for (;;) {
-        size_t in_buf_size =
-            (mz_uint32)MZ_MIN(uncomp_remaining, MZ_ZIP_MAX_IO_BUF_SIZE);
         tdefl_status status;
+        tdefl_flush flush = TDEFL_NO_FLUSH;
 
-        if (MZ_FREAD(pRead_buf, 1, in_buf_size, pSrc_file) != in_buf_size)
+        size_t n = read_callback(callback_opaque, file_ofs, pRead_buf,
+                                 MZ_ZIP_MAX_IO_BUF_SIZE);
+        if ((n > MZ_ZIP_MAX_IO_BUF_SIZE) || (file_ofs + n > max_size)) {
+          mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
           break;
+        }
 
-        uncomp_crc32 = (mz_uint32)mz_crc32(
-            uncomp_crc32, (const mz_uint8 *)pRead_buf, in_buf_size);
-        uncomp_remaining -= in_buf_size;
+        file_ofs += n;
+        uncomp_crc32 =
+            (mz_uint32)mz_crc32(uncomp_crc32, (const mz_uint8 *)pRead_buf, n);
 
-        status = tdefl_compress_buffer(pComp, pRead_buf, in_buf_size,
-                                       uncomp_remaining ? TDEFL_NO_FLUSH
-                                                        : TDEFL_FINISH);
+        if (pZip->m_pNeeds_keepalive != NULL &&
+            pZip->m_pNeeds_keepalive(pZip->m_pIO_opaque))
+          flush = TDEFL_FULL_FLUSH;
+
+        if (n == 0)
+          flush = TDEFL_FINISH;
+
+        status = tdefl_compress_buffer(pComp, pRead_buf, n, flush);
         if (status == TDEFL_STATUS_DONE) {
           result = MZ_TRUE;
           break;
-        } else if (status != TDEFL_STATUS_OKAY)
+        } else if (status != TDEFL_STATUS_OKAY) {
+          mz_zip_set_error(pZip, MZ_ZIP_COMPRESSION_FAILED);
           break;
+        }
       }
 
       pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
 
       if (!result) {
         pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
-        MZ_FCLOSE(pSrc_file);
         return MZ_FALSE;
       }
 
+      uncomp_size = file_ofs;
       comp_size = state.m_comp_size;
       cur_archive_file_ofs = state.m_cur_archive_file_ofs;
-
-      method = MZ_DEFLATED;
     }
 
     pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
   }
 
-  MZ_FCLOSE(pSrc_file);
-  pSrc_file = NULL;
+  if (!(level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE)) {
+    mz_uint8 local_dir_footer[MZ_ZIP_DATA_DESCRIPTER_SIZE64];
+    mz_uint32 local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE32;
 
-  // no zip64 support yet
-  if ((comp_size > 0xFFFFFFFF) || (cur_archive_file_ofs > 0xFFFFFFFF))
-    return MZ_FALSE;
+    MZ_WRITE_LE32(local_dir_footer + 0, MZ_ZIP_DATA_DESCRIPTOR_ID);
+    MZ_WRITE_LE32(local_dir_footer + 4, uncomp_crc32);
+    if (pExtra_data == NULL) {
+      if (comp_size > MZ_UINT32_MAX)
+        return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
 
-  if (!mz_zip_writer_create_local_dir_header(
-          pZip, local_dir_header, (mz_uint16)archive_name_size, 0, uncomp_size,
-          comp_size, uncomp_crc32, method, 0, dos_time, dos_date))
-    return MZ_FALSE;
+      MZ_WRITE_LE32(local_dir_footer + 8, comp_size);
+      MZ_WRITE_LE32(local_dir_footer + 12, uncomp_size);
+    } else {
+      MZ_WRITE_LE64(local_dir_footer + 8, comp_size);
+      MZ_WRITE_LE64(local_dir_footer + 16, uncomp_size);
+      local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE64;
+    }
 
-  if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs, local_dir_header,
-                     sizeof(local_dir_header)) != sizeof(local_dir_header))
-    return MZ_FALSE;
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs,
+                       local_dir_footer,
+                       local_dir_footer_size) != local_dir_footer_size)
+      return MZ_FALSE;
+
+    cur_archive_file_ofs += local_dir_footer_size;
+  }
+
+  if (level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE) {
+    if (pExtra_data != NULL) {
+      extra_size = mz_zip_writer_create_zip64_extra_data(
+          extra_data, (max_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
+          (max_size >= MZ_UINT32_MAX) ? &comp_size : NULL,
+          (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs
+                                                  : NULL);
+    }
+
+    if (!mz_zip_writer_create_local_dir_header(
+            pZip, local_dir_header, (mz_uint16)archive_name_size,
+            (mz_uint16)(extra_size + user_extra_data_len),
+            (max_size >= MZ_UINT32_MAX) ? MZ_UINT32_MAX : uncomp_size,
+            (max_size >= MZ_UINT32_MAX) ? MZ_UINT32_MAX : comp_size,
+            uncomp_crc32, method, gen_flags, dos_time, dos_date))
+      return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
+
+    cur_archive_header_file_ofs = local_dir_header_ofs;
+
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_header_file_ofs,
+                       local_dir_header,
+                       sizeof(local_dir_header)) != sizeof(local_dir_header))
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+    if (pExtra_data != NULL) {
+      cur_archive_header_file_ofs += sizeof(local_dir_header);
+
+      if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_header_file_ofs,
+                         pArchive_name,
+                         archive_name_size) != archive_name_size) {
+        return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+      }
+
+      cur_archive_header_file_ofs += archive_name_size;
+
+      if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_header_file_ofs,
+                         extra_data, extra_size) != extra_size)
+        return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+      cur_archive_header_file_ofs += extra_size;
+    }
+  }
+
+  if (pExtra_data != NULL) {
+    extra_size = mz_zip_writer_create_zip64_extra_data(
+        extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
+        (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL,
+        (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
+  }
 
   if (!mz_zip_writer_add_to_central_dir(
-          pZip, pArchive_name, (mz_uint16)archive_name_size, NULL, 0, pComment,
-          comment_size, uncomp_size, comp_size, uncomp_crc32, method, 0,
-          dos_time, dos_date, local_dir_header_ofs, ext_attributes))
+          pZip, pArchive_name, (mz_uint16)archive_name_size, pExtra_data,
+          (mz_uint16)extra_size, pComment, comment_size, uncomp_size, comp_size,
+          uncomp_crc32, method, gen_flags, dos_time, dos_date,
+          local_dir_header_ofs, ext_attributes, user_extra_data_central,
+          user_extra_data_central_len))
     return MZ_FALSE;
 
   pZip->m_total_files++;
@@ -6496,150 +9178,561 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
 
   return MZ_TRUE;
 }
-#endif // #ifndef MINIZ_NO_STDIO
 
+#ifndef MINIZ_NO_STDIO
+
+static size_t mz_file_read_func_stdio(void *pOpaque, mz_uint64 file_ofs,
+                                      void *pBuf, size_t n) {
+  MZ_FILE *pSrc_file = (MZ_FILE *)pOpaque;
+  mz_int64 cur_ofs = MZ_FTELL64(pSrc_file);
+
+  if (((mz_int64)file_ofs < 0) ||
+      (((cur_ofs != (mz_int64)file_ofs)) &&
+       (MZ_FSEEK64(pSrc_file, (mz_int64)file_ofs, SEEK_SET))))
+    return 0;
+
+  return MZ_FREAD(pBuf, 1, n, pSrc_file);
+}
+
+mz_bool mz_zip_writer_add_cfile(
+    mz_zip_archive *pZip, const char *pArchive_name, MZ_FILE *pSrc_file,
+    mz_uint64 max_size, const MZ_TIME_T *pFile_time, const void *pComment,
+    mz_uint16 comment_size, mz_uint level_and_flags, mz_uint32 ext_attributes,
+    const char *user_extra_data, mz_uint user_extra_data_len,
+    const char *user_extra_data_central, mz_uint user_extra_data_central_len) {
+  return mz_zip_writer_add_read_buf_callback(
+      pZip, pArchive_name, mz_file_read_func_stdio, pSrc_file, max_size,
+      pFile_time, pComment, comment_size, level_and_flags, ext_attributes,
+      user_extra_data, user_extra_data_len, user_extra_data_central,
+      user_extra_data_central_len);
+}
+
+mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
+                               const char *pSrc_filename, const void *pComment,
+                               mz_uint16 comment_size, mz_uint level_and_flags,
+                               mz_uint32 ext_attributes) {
+  MZ_FILE *pSrc_file = NULL;
+  mz_uint64 uncomp_size = 0;
+  MZ_TIME_T file_modified_time;
+  MZ_TIME_T *pFile_time = NULL;
+  mz_bool status;
+
+  memset(&file_modified_time, 0, sizeof(file_modified_time));
+
+#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_STDIO)
+  pFile_time = &file_modified_time;
+  if (!mz_zip_get_file_modified_time(pSrc_filename, &file_modified_time))
+    return mz_zip_set_error(pZip, MZ_ZIP_FILE_STAT_FAILED);
+#endif
+
+  pSrc_file = MZ_FOPEN(pSrc_filename, "rb");
+  if (!pSrc_file)
+    return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
+
+  MZ_FSEEK64(pSrc_file, 0, SEEK_END);
+  uncomp_size = MZ_FTELL64(pSrc_file);
+  MZ_FSEEK64(pSrc_file, 0, SEEK_SET);
+
+  status = mz_zip_writer_add_cfile(
+      pZip, pArchive_name, pSrc_file, uncomp_size, pFile_time, pComment,
+      comment_size, level_and_flags, ext_attributes, NULL, 0, NULL, 0);
+
+  MZ_FCLOSE(pSrc_file);
+
+  return status;
+}
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+static mz_bool mz_zip_writer_update_zip64_extension_block(
+    mz_zip_array *pNew_ext, mz_zip_archive *pZip, const mz_uint8 *pExt,
+    mz_uint32 ext_len, mz_uint64 *pComp_size, mz_uint64 *pUncomp_size,
+    mz_uint64 *pLocal_header_ofs, mz_uint32 *pDisk_start) {
+  /* + 64 should be enough for any new zip64 data */
+  if (!mz_zip_array_reserve(pZip, pNew_ext, ext_len + 64, MZ_FALSE))
+    return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
+  mz_zip_array_resize(pZip, pNew_ext, 0, MZ_FALSE);
+
+  if ((pUncomp_size) || (pComp_size) || (pLocal_header_ofs) || (pDisk_start)) {
+    mz_uint8 new_ext_block[64];
+    mz_uint8 *pDst = new_ext_block;
+    mz_write_le16(pDst, MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID);
+    mz_write_le16(pDst + sizeof(mz_uint16), 0);
+    pDst += sizeof(mz_uint16) * 2;
+
+    if (pUncomp_size) {
+      mz_write_le64(pDst, *pUncomp_size);
+      pDst += sizeof(mz_uint64);
+    }
+
+    if (pComp_size) {
+      mz_write_le64(pDst, *pComp_size);
+      pDst += sizeof(mz_uint64);
+    }
+
+    if (pLocal_header_ofs) {
+      mz_write_le64(pDst, *pLocal_header_ofs);
+      pDst += sizeof(mz_uint64);
+    }
+
+    if (pDisk_start) {
+      mz_write_le32(pDst, *pDisk_start);
+      pDst += sizeof(mz_uint32);
+    }
+
+    mz_write_le16(new_ext_block + sizeof(mz_uint16),
+                  (mz_uint16)((pDst - new_ext_block) - sizeof(mz_uint16) * 2));
+
+    if (!mz_zip_array_push_back(pZip, pNew_ext, new_ext_block,
+                                pDst - new_ext_block))
+      return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+  }
+
+  if ((pExt) && (ext_len)) {
+    mz_uint32 extra_size_remaining = ext_len;
+    const mz_uint8 *pExtra_data = pExt;
+
+    do {
+      mz_uint32 field_id, field_data_size, field_total_size;
+
+      if (extra_size_remaining < (sizeof(mz_uint16) * 2))
+        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+      field_id = MZ_READ_LE16(pExtra_data);
+      field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
+      field_total_size = field_data_size + sizeof(mz_uint16) * 2;
+
+      if (field_total_size > extra_size_remaining)
+        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+      if (field_id != MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) {
+        if (!mz_zip_array_push_back(pZip, pNew_ext, pExtra_data,
+                                    field_total_size))
+          return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+      }
+
+      pExtra_data += field_total_size;
+      extra_size_remaining -= field_total_size;
+    } while (extra_size_remaining);
+  }
+
+  return MZ_TRUE;
+}
+
+/* TODO: This func is now pretty freakin complex due to zip64, split it up? */
 mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip,
                                           mz_zip_archive *pSource_zip,
-                                          mz_uint file_index) {
-  mz_uint n, bit_flags, num_alignment_padding_bytes;
-  mz_uint64 comp_bytes_remaining, local_dir_header_ofs;
+                                          mz_uint src_file_index) {
+  mz_uint n, bit_flags, num_alignment_padding_bytes,
+      src_central_dir_following_data_size;
+  mz_uint64 src_archive_bytes_remaining, local_dir_header_ofs;
   mz_uint64 cur_src_file_ofs, cur_dst_file_ofs;
   mz_uint32
       local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) /
                        sizeof(mz_uint32)];
   mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
-  mz_uint8 central_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE];
+  mz_uint8 new_central_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE];
   size_t orig_central_dir_size;
   mz_zip_internal_state *pState;
   void *pBuf;
   const mz_uint8 *pSrc_central_header;
+  mz_zip_archive_file_stat src_file_stat;
+  mz_uint32 src_filename_len, src_comment_len, src_ext_len;
+  mz_uint32 local_header_filename_size, local_header_extra_len;
+  mz_uint64 local_header_comp_size, local_header_uncomp_size;
+  mz_bool found_zip64_ext_data_in_ldir = MZ_FALSE;
+
+  /* Sanity checks */
+  if ((!pZip) || (!pZip->m_pState) ||
+      (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || (!pSource_zip->m_pRead))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
 
-  if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING))
-    return MZ_FALSE;
-  if (NULL ==
-      (pSrc_central_header = mz_zip_reader_get_cdh(pSource_zip, file_index)))
-    return MZ_FALSE;
   pState = pZip->m_pState;
 
+  /* Don't support copying files from zip64 archives to non-zip64, even though
+   * in some cases this is possible */
+  if ((pSource_zip->m_pState->m_zip64) && (!pZip->m_pState->m_zip64))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  /* Get pointer to the source central dir header and crack it */
+  if (NULL ==
+      (pSrc_central_header = mz_zip_get_cdh(pSource_zip, src_file_index)))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  if (MZ_READ_LE32(pSrc_central_header + MZ_ZIP_CDH_SIG_OFS) !=
+      MZ_ZIP_CENTRAL_DIR_HEADER_SIG)
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+  src_filename_len =
+      MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_FILENAME_LEN_OFS);
+  src_comment_len =
+      MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_COMMENT_LEN_OFS);
+  src_ext_len = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_EXTRA_LEN_OFS);
+  src_central_dir_following_data_size =
+      src_filename_len + src_ext_len + src_comment_len;
+
+  /* TODO: We don't support central dir's >= MZ_UINT32_MAX bytes right now (+32
+   * fudge factor in case we need to add more extra data) */
+  if ((pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE +
+       src_central_dir_following_data_size + 32) >= MZ_UINT32_MAX)
+    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
+
   num_alignment_padding_bytes =
       mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
 
-  // no zip64 support yet
-  if ((pZip->m_total_files == 0xFFFF) ||
-      ((pZip->m_archive_size + num_alignment_padding_bytes +
-        MZ_ZIP_LOCAL_DIR_HEADER_SIZE + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) >
-       0xFFFFFFFF))
+  if (!pState->m_zip64) {
+    if (pZip->m_total_files == MZ_UINT16_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+  } else {
+    /* TODO: Our zip64 support still has some 32-bit limits that may not be
+     * worth fixing. */
+    if (pZip->m_total_files == MZ_UINT32_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+  }
+
+  if (!mz_zip_file_stat_internal(pSource_zip, src_file_index,
+                                 pSrc_central_header, &src_file_stat, NULL))
     return MZ_FALSE;
 
-  cur_src_file_ofs =
-      MZ_READ_LE32(pSrc_central_header + MZ_ZIP_CDH_LOCAL_HEADER_OFS);
+  cur_src_file_ofs = src_file_stat.m_local_header_ofs;
   cur_dst_file_ofs = pZip->m_archive_size;
 
+  /* Read the source archive's local dir header */
   if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs,
                            pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) !=
       MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+
   if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
   cur_src_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE;
 
+  /* Compute the total size we need to copy (filename+extra data+compressed
+   * data) */
+  local_header_filename_size =
+      MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS);
+  local_header_extra_len =
+      MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
+  local_header_comp_size =
+      MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS);
+  local_header_uncomp_size =
+      MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS);
+  src_archive_bytes_remaining = local_header_filename_size +
+                                local_header_extra_len +
+                                src_file_stat.m_comp_size;
+
+  /* Try to find a zip64 extended information field */
+  if ((local_header_extra_len) &&
+      ((local_header_comp_size == MZ_UINT32_MAX) ||
+       (local_header_uncomp_size == MZ_UINT32_MAX))) {
+    mz_zip_array file_data_array;
+    const mz_uint8 *pExtra_data;
+    mz_uint32 extra_size_remaining = local_header_extra_len;
+
+    mz_zip_array_init(&file_data_array, 1);
+    if (!mz_zip_array_resize(pZip, &file_data_array, local_header_extra_len,
+                             MZ_FALSE)) {
+      return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+    }
+
+    if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque,
+                             src_file_stat.m_local_header_ofs +
+                                 MZ_ZIP_LOCAL_DIR_HEADER_SIZE +
+                                 local_header_filename_size,
+                             file_data_array.m_p, local_header_extra_len) !=
+        local_header_extra_len) {
+      mz_zip_array_clear(pZip, &file_data_array);
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+    }
+
+    pExtra_data = (const mz_uint8 *)file_data_array.m_p;
+
+    do {
+      mz_uint32 field_id, field_data_size, field_total_size;
+
+      if (extra_size_remaining < (sizeof(mz_uint16) * 2)) {
+        mz_zip_array_clear(pZip, &file_data_array);
+        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+      }
+
+      field_id = MZ_READ_LE16(pExtra_data);
+      field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
+      field_total_size = field_data_size + sizeof(mz_uint16) * 2;
+
+      if (field_total_size > extra_size_remaining) {
+        mz_zip_array_clear(pZip, &file_data_array);
+        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+      }
+
+      if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) {
+        const mz_uint8 *pSrc_field_data = pExtra_data + sizeof(mz_uint32);
+
+        if (field_data_size < sizeof(mz_uint64) * 2) {
+          mz_zip_array_clear(pZip, &file_data_array);
+          return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+        }
+
+        local_header_uncomp_size = MZ_READ_LE64(pSrc_field_data);
+        local_header_comp_size = MZ_READ_LE64(
+            pSrc_field_data +
+            sizeof(mz_uint64)); /* may be 0 if there's a descriptor */
+
+        found_zip64_ext_data_in_ldir = MZ_TRUE;
+        break;
+      }
+
+      pExtra_data += field_total_size;
+      extra_size_remaining -= field_total_size;
+    } while (extra_size_remaining);
+
+    mz_zip_array_clear(pZip, &file_data_array);
+  }
+
+  if (!pState->m_zip64) {
+    /* Try to detect if the new archive will most likely wind up too big and
+     * bail early (+(sizeof(mz_uint32) * 4) is for the optional descriptor which
+     * could be present, +64 is a fudge factor). */
+    /* We also check when the archive is finalized so this doesn't need to be
+     * perfect. */
+    mz_uint64 approx_new_archive_size =
+        cur_dst_file_ofs + num_alignment_padding_bytes +
+        MZ_ZIP_LOCAL_DIR_HEADER_SIZE + src_archive_bytes_remaining +
+        (sizeof(mz_uint32) * 4) + pState->m_central_dir.m_size +
+        MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_central_dir_following_data_size +
+        MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + 64;
+
+    if (approx_new_archive_size >= MZ_UINT32_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+  }
+
+  /* Write dest archive padding */
   if (!mz_zip_writer_write_zeros(pZip, cur_dst_file_ofs,
                                  num_alignment_padding_bytes))
     return MZ_FALSE;
+
   cur_dst_file_ofs += num_alignment_padding_bytes;
+
   local_dir_header_ofs = cur_dst_file_ofs;
   if (pZip->m_file_offset_alignment) {
     MZ_ASSERT((local_dir_header_ofs & (pZip->m_file_offset_alignment - 1)) ==
               0);
   }
 
+  /* The original zip's local header+ext block doesn't change, even with zip64,
+   * so we can just copy it over to the dest zip */
   if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pLocal_header,
                      MZ_ZIP_LOCAL_DIR_HEADER_SIZE) !=
       MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
   cur_dst_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE;
 
-  n = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) +
-      MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
-  comp_bytes_remaining =
-      n + MZ_READ_LE32(pSrc_central_header + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS);
+  /* Copy over the source archive bytes to the dest archive, also ensure we have
+   * enough buf space to handle optional data descriptor */
+  if (NULL == (pBuf = pZip->m_pAlloc(
+                   pZip->m_pAlloc_opaque, 1,
+                   (size_t)MZ_MAX(32U, MZ_MIN((mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE,
+                                              src_archive_bytes_remaining)))))
+    return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
 
-  if (NULL ==
-      (pBuf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1,
-                             (size_t)MZ_MAX(sizeof(mz_uint32) * 4,
-                                            MZ_MIN(MZ_ZIP_MAX_IO_BUF_SIZE,
-                                                   comp_bytes_remaining)))))
-    return MZ_FALSE;
-
-  while (comp_bytes_remaining) {
-    n = (mz_uint)MZ_MIN(MZ_ZIP_MAX_IO_BUF_SIZE, comp_bytes_remaining);
+  while (src_archive_bytes_remaining) {
+    n = (mz_uint)MZ_MIN((mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE,
+                        src_archive_bytes_remaining);
     if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf,
                              n) != n) {
       pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
-      return MZ_FALSE;
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
     }
     cur_src_file_ofs += n;
 
     if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pBuf, n) != n) {
       pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
-      return MZ_FALSE;
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
     }
     cur_dst_file_ofs += n;
 
-    comp_bytes_remaining -= n;
+    src_archive_bytes_remaining -= n;
   }
 
+  /* Now deal with the optional data descriptor */
   bit_flags = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_BIT_FLAG_OFS);
   if (bit_flags & 8) {
-    // Copy data descriptor
-    if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf,
-                             sizeof(mz_uint32) * 4) != sizeof(mz_uint32) * 4) {
-      pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
-      return MZ_FALSE;
+    /* Copy data descriptor */
+    if ((pSource_zip->m_pState->m_zip64) || (found_zip64_ext_data_in_ldir)) {
+      /* src is zip64, dest must be zip64 */
+
+      /* name			uint32_t's */
+      /* id				1 (optional in zip64?) */
+      /* crc			1 */
+      /* comp_size	2 */
+      /* uncomp_size 2 */
+      if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs,
+                               pBuf, (sizeof(mz_uint32) * 6)) !=
+          (sizeof(mz_uint32) * 6)) {
+        pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
+        return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+      }
+
+      n = sizeof(mz_uint32) *
+          ((MZ_READ_LE32(pBuf) == MZ_ZIP_DATA_DESCRIPTOR_ID) ? 6 : 5);
+    } else {
+      /* src is NOT zip64 */
+      mz_bool has_id;
+
+      if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs,
+                               pBuf, sizeof(mz_uint32) * 4) !=
+          sizeof(mz_uint32) * 4) {
+        pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
+        return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+      }
+
+      has_id = (MZ_READ_LE32(pBuf) == MZ_ZIP_DATA_DESCRIPTOR_ID);
+
+      if (pZip->m_pState->m_zip64) {
+        /* dest is zip64, so upgrade the data descriptor */
+        const mz_uint8 *pSrc_descriptor =
+            (const mz_uint8 *)pBuf + (has_id ? sizeof(mz_uint32) : 0);
+        const mz_uint32 src_crc32 = MZ_READ_LE32(pSrc_descriptor);
+        const mz_uint64 src_comp_size =
+            MZ_READ_LE32(pSrc_descriptor + sizeof(mz_uint32));
+        const mz_uint64 src_uncomp_size =
+            MZ_READ_LE32(pSrc_descriptor + 2 * sizeof(mz_uint32));
+
+        mz_write_le32((mz_uint8 *)pBuf, MZ_ZIP_DATA_DESCRIPTOR_ID);
+        mz_write_le32((mz_uint8 *)pBuf + sizeof(mz_uint32) * 1, src_crc32);
+        mz_write_le64((mz_uint8 *)pBuf + sizeof(mz_uint32) * 2, src_comp_size);
+        mz_write_le64((mz_uint8 *)pBuf + sizeof(mz_uint32) * 4,
+                      src_uncomp_size);
+
+        n = sizeof(mz_uint32) * 6;
+      } else {
+        /* dest is NOT zip64, just copy it as-is */
+        n = sizeof(mz_uint32) * (has_id ? 4 : 3);
+      }
     }
 
-    n = sizeof(mz_uint32) * ((MZ_READ_LE32(pBuf) == 0x08074b50) ? 4 : 3);
     if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pBuf, n) != n) {
       pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
-      return MZ_FALSE;
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
     }
 
-    // cur_src_file_ofs += n;
+    cur_src_file_ofs += n;
     cur_dst_file_ofs += n;
   }
   pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
 
-  // no zip64 support yet
-  if (cur_dst_file_ofs > 0xFFFFFFFF)
-    return MZ_FALSE;
-
+  /* Finally, add the new central dir header */
   orig_central_dir_size = pState->m_central_dir.m_size;
 
-  memcpy(central_header, pSrc_central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE);
-  MZ_WRITE_LE32(central_header + MZ_ZIP_CDH_LOCAL_HEADER_OFS,
-                local_dir_header_ofs);
-  if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, central_header,
-                              MZ_ZIP_CENTRAL_DIR_HEADER_SIZE))
-    return MZ_FALSE;
+  memcpy(new_central_header, pSrc_central_header,
+         MZ_ZIP_CENTRAL_DIR_HEADER_SIZE);
 
-  n = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_FILENAME_LEN_OFS) +
-      MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_EXTRA_LEN_OFS) +
-      MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_COMMENT_LEN_OFS);
-  if (!mz_zip_array_push_back(
-          pZip, &pState->m_central_dir,
-          pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n)) {
-    mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size,
-                        MZ_FALSE);
-    return MZ_FALSE;
+  if (pState->m_zip64) {
+    /* This is the painful part: We need to write a new central dir header + ext
+     * block with updated zip64 fields, and ensure the old fields (if any) are
+     * not included. */
+    const mz_uint8 *pSrc_ext =
+        pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_filename_len;
+    mz_zip_array new_ext_block;
+
+    mz_zip_array_init(&new_ext_block, sizeof(mz_uint8));
+
+    MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS,
+                  MZ_UINT32_MAX);
+    MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS,
+                  MZ_UINT32_MAX);
+    MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_LOCAL_HEADER_OFS,
+                  MZ_UINT32_MAX);
+
+    if (!mz_zip_writer_update_zip64_extension_block(
+            &new_ext_block, pZip, pSrc_ext, src_ext_len,
+            &src_file_stat.m_comp_size, &src_file_stat.m_uncomp_size,
+            &local_dir_header_ofs, NULL)) {
+      mz_zip_array_clear(pZip, &new_ext_block);
+      return MZ_FALSE;
+    }
+
+    MZ_WRITE_LE16(new_central_header + MZ_ZIP_CDH_EXTRA_LEN_OFS,
+                  new_ext_block.m_size);
+
+    if (!mz_zip_array_push_back(pZip, &pState->m_central_dir,
+                                new_central_header,
+                                MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)) {
+      mz_zip_array_clear(pZip, &new_ext_block);
+      return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+    }
+
+    if (!mz_zip_array_push_back(pZip, &pState->m_central_dir,
+                                pSrc_central_header +
+                                    MZ_ZIP_CENTRAL_DIR_HEADER_SIZE,
+                                src_filename_len)) {
+      mz_zip_array_clear(pZip, &new_ext_block);
+      mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size,
+                          MZ_FALSE);
+      return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+    }
+
+    if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, new_ext_block.m_p,
+                                new_ext_block.m_size)) {
+      mz_zip_array_clear(pZip, &new_ext_block);
+      mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size,
+                          MZ_FALSE);
+      return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+    }
+
+    if (!mz_zip_array_push_back(pZip, &pState->m_central_dir,
+                                pSrc_central_header +
+                                    MZ_ZIP_CENTRAL_DIR_HEADER_SIZE +
+                                    src_filename_len + src_ext_len,
+                                src_comment_len)) {
+      mz_zip_array_clear(pZip, &new_ext_block);
+      mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size,
+                          MZ_FALSE);
+      return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+    }
+
+    mz_zip_array_clear(pZip, &new_ext_block);
+  } else {
+    /* sanity checks */
+    if (cur_dst_file_ofs > MZ_UINT32_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+
+    if (local_dir_header_ofs >= MZ_UINT32_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+
+    MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_LOCAL_HEADER_OFS,
+                  local_dir_header_ofs);
+
+    if (!mz_zip_array_push_back(pZip, &pState->m_central_dir,
+                                new_central_header,
+                                MZ_ZIP_CENTRAL_DIR_HEADER_SIZE))
+      return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
+    if (!mz_zip_array_push_back(pZip, &pState->m_central_dir,
+                                pSrc_central_header +
+                                    MZ_ZIP_CENTRAL_DIR_HEADER_SIZE,
+                                src_central_dir_following_data_size)) {
+      mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size,
+                          MZ_FALSE);
+      return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+    }
+  }
+
+  /* This shouldn't trigger unless we screwed up during the initial sanity
+   * checks */
+  if (pState->m_central_dir.m_size >= MZ_UINT32_MAX) {
+    /* TODO: Support central dirs >= 32-bits in size */
+    mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size,
+                        MZ_FALSE);
+    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
   }
 
-  if (pState->m_central_dir.m_size > 0xFFFFFFFF)
-    return MZ_FALSE;
   n = (mz_uint32)orig_central_dir_size;
   if (!mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, &n, 1)) {
     mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size,
                         MZ_FALSE);
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
   }
 
   pZip->m_total_files++;
@@ -6651,102 +9744,135 @@ mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip,
 mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip) {
   mz_zip_internal_state *pState;
   mz_uint64 central_dir_ofs, central_dir_size;
-  mz_uint8 hdr[MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE];
+  mz_uint8 hdr[256];
 
   if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING))
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
 
   pState = pZip->m_pState;
 
-  // no zip64 support yet
-  if ((pZip->m_total_files > 0xFFFF) ||
-      ((pZip->m_archive_size + pState->m_central_dir.m_size +
-        MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) > 0xFFFFFFFF))
-    return MZ_FALSE;
+  if (pState->m_zip64) {
+    if ((mz_uint64)pState->m_central_dir.m_size >= MZ_UINT32_MAX)
+      return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+  } else {
+    if ((pZip->m_total_files > MZ_UINT16_MAX) ||
+        ((pZip->m_archive_size + pState->m_central_dir.m_size +
+          MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) > MZ_UINT32_MAX))
+      return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+  }
 
   central_dir_ofs = 0;
   central_dir_size = 0;
   if (pZip->m_total_files) {
-    // Write central directory
+    /* Write central directory */
     central_dir_ofs = pZip->m_archive_size;
     central_dir_size = pState->m_central_dir.m_size;
     pZip->m_central_directory_file_ofs = central_dir_ofs;
     if (pZip->m_pWrite(pZip->m_pIO_opaque, central_dir_ofs,
                        pState->m_central_dir.m_p,
                        (size_t)central_dir_size) != central_dir_size)
-      return MZ_FALSE;
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
     pZip->m_archive_size += central_dir_size;
   }
 
-  // Write end of central directory record
-  MZ_CLEAR_OBJ(hdr);
+  if (pState->m_zip64) {
+    /* Write zip64 end of central directory header */
+    mz_uint64 rel_ofs_to_zip64_ecdr = pZip->m_archive_size;
+
+    MZ_CLEAR_ARR(hdr);
+    MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDH_SIG_OFS,
+                  MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG);
+    MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS,
+                  MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE - sizeof(mz_uint32) -
+                      sizeof(mz_uint64));
+    MZ_WRITE_LE16(hdr + MZ_ZIP64_ECDH_VERSION_MADE_BY_OFS,
+                  0x031E); /* TODO: always Unix */
+    MZ_WRITE_LE16(hdr + MZ_ZIP64_ECDH_VERSION_NEEDED_OFS, 0x002D);
+    MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS,
+                  pZip->m_total_files);
+    MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS,
+                  pZip->m_total_files);
+    MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_SIZE_OFS, central_dir_size);
+    MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_OFS_OFS, central_dir_ofs);
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr,
+                       MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) !=
+        MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+    pZip->m_archive_size += MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE;
+
+    /* Write zip64 end of central directory locator */
+    MZ_CLEAR_ARR(hdr);
+    MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDL_SIG_OFS,
+                  MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG);
+    MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS,
+                  rel_ofs_to_zip64_ecdr);
+    MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS, 1);
+    if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr,
+                       MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) !=
+        MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE)
+      return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+    pZip->m_archive_size += MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE;
+  }
+
+  /* Write end of central directory record */
+  MZ_CLEAR_ARR(hdr);
   MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_SIG_OFS,
                 MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG);
   MZ_WRITE_LE16(hdr + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS,
-                pZip->m_total_files);
-  MZ_WRITE_LE16(hdr + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS, pZip->m_total_files);
-  MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_CDIR_SIZE_OFS, central_dir_size);
-  MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_CDIR_OFS_OFS, central_dir_ofs);
+                MZ_MIN(MZ_UINT16_MAX, pZip->m_total_files));
+  MZ_WRITE_LE16(hdr + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS,
+                MZ_MIN(MZ_UINT16_MAX, pZip->m_total_files));
+  MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_CDIR_SIZE_OFS,
+                MZ_MIN(MZ_UINT32_MAX, central_dir_size));
+  MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_CDIR_OFS_OFS,
+                MZ_MIN(MZ_UINT32_MAX, central_dir_ofs));
 
   if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr,
-                     sizeof(hdr)) != sizeof(hdr))
-    return MZ_FALSE;
+                     MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) !=
+      MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
+    return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
 #ifndef MINIZ_NO_STDIO
   if ((pState->m_pFile) && (MZ_FFLUSH(pState->m_pFile) == EOF))
-    return MZ_FALSE;
-#endif // #ifndef MINIZ_NO_STDIO
+    return mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED);
+#endif /* #ifndef MINIZ_NO_STDIO */
 
-  pZip->m_archive_size += sizeof(hdr);
+  pZip->m_archive_size += MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE;
 
   pZip->m_zip_mode = MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED;
   return MZ_TRUE;
 }
 
-mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **pBuf,
+mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **ppBuf,
                                             size_t *pSize) {
-  if ((!pZip) || (!pZip->m_pState) || (!pBuf) || (!pSize))
-    return MZ_FALSE;
+  if ((!ppBuf) || (!pSize))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  *ppBuf = NULL;
+  *pSize = 0;
+
+  if ((!pZip) || (!pZip->m_pState))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
   if (pZip->m_pWrite != mz_zip_heap_write_func)
-    return MZ_FALSE;
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
   if (!mz_zip_writer_finalize_archive(pZip))
     return MZ_FALSE;
 
-  *pBuf = pZip->m_pState->m_pMem;
+  *ppBuf = pZip->m_pState->m_pMem;
   *pSize = pZip->m_pState->m_mem_size;
   pZip->m_pState->m_pMem = NULL;
   pZip->m_pState->m_mem_size = pZip->m_pState->m_mem_capacity = 0;
+
   return MZ_TRUE;
 }
 
 mz_bool mz_zip_writer_end(mz_zip_archive *pZip) {
-  mz_zip_internal_state *pState;
-  mz_bool status = MZ_TRUE;
-  if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) ||
-      ((pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) &&
-       (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED)))
-    return MZ_FALSE;
-
-  pState = pZip->m_pState;
-  pZip->m_pState = NULL;
-  mz_zip_array_clear(pZip, &pState->m_central_dir);
-  mz_zip_array_clear(pZip, &pState->m_central_dir_offsets);
-  mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets);
-
-#ifndef MINIZ_NO_STDIO
-  if (pState->m_pFile) {
-    MZ_FCLOSE(pState->m_pFile);
-    pState->m_pFile = NULL;
-  }
-#endif // #ifndef MINIZ_NO_STDIO
-
-  if ((pZip->m_pWrite == mz_zip_heap_write_func) && (pState->m_pMem)) {
-    pZip->m_pFree(pZip->m_pAlloc_opaque, pState->m_pMem);
-    pState->m_pMem = NULL;
-  }
-
-  pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
-  pZip->m_zip_mode = MZ_ZIP_MODE_INVALID;
-  return status;
+  return mz_zip_writer_end_internal(pZip, MZ_TRUE);
 }
 
 #ifndef MINIZ_NO_STDIO
@@ -6754,117 +9880,367 @@ mz_bool mz_zip_add_mem_to_archive_file_in_place(
     const char *pZip_filename, const char *pArchive_name, const void *pBuf,
     size_t buf_size, const void *pComment, mz_uint16 comment_size,
     mz_uint level_and_flags) {
+  return mz_zip_add_mem_to_archive_file_in_place_v2(
+      pZip_filename, pArchive_name, pBuf, buf_size, pComment, comment_size,
+      level_and_flags, NULL);
+}
+
+mz_bool mz_zip_add_mem_to_archive_file_in_place_v2(
+    const char *pZip_filename, const char *pArchive_name, const void *pBuf,
+    size_t buf_size, const void *pComment, mz_uint16 comment_size,
+    mz_uint level_and_flags, mz_zip_error *pErr) {
   mz_bool status, created_new_archive = MZ_FALSE;
   mz_zip_archive zip_archive;
   struct MZ_FILE_STAT_STRUCT file_stat;
-  MZ_CLEAR_OBJ(zip_archive);
+  mz_zip_error actual_err = MZ_ZIP_NO_ERROR;
+
+  mz_zip_zero_struct(&zip_archive);
   if ((int)level_and_flags < 0)
     level_and_flags = MZ_DEFAULT_LEVEL;
+
   if ((!pZip_filename) || (!pArchive_name) || ((buf_size) && (!pBuf)) ||
       ((comment_size) && (!pComment)) ||
-      ((level_and_flags & 0xF) > MZ_UBER_COMPRESSION))
+      ((level_and_flags & 0xF) > MZ_UBER_COMPRESSION)) {
+    if (pErr)
+      *pErr = MZ_ZIP_INVALID_PARAMETER;
     return MZ_FALSE;
-  if (!mz_zip_writer_validate_archive_name(pArchive_name))
+  }
+
+  if (!mz_zip_writer_validate_archive_name(pArchive_name)) {
+    if (pErr)
+      *pErr = MZ_ZIP_INVALID_FILENAME;
     return MZ_FALSE;
+  }
+
+  /* Important: The regular non-64 bit version of stat() can fail here if the
+   * file is very large, which could cause the archive to be overwritten. */
+  /* So be sure to compile with _LARGEFILE64_SOURCE 1 */
   if (MZ_FILE_STAT(pZip_filename, &file_stat) != 0) {
-    // Create a new archive.
-    if (!mz_zip_writer_init_file(&zip_archive, pZip_filename, 0))
+    /* Create a new archive. */
+    if (!mz_zip_writer_init_file_v2(&zip_archive, pZip_filename, 0,
+                                    level_and_flags)) {
+      if (pErr)
+        *pErr = zip_archive.m_last_error;
       return MZ_FALSE;
+    }
+
     created_new_archive = MZ_TRUE;
   } else {
-    // Append to an existing archive.
-    if (!mz_zip_reader_init_file(&zip_archive, pZip_filename,
-                                 level_and_flags |
-                                     MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY))
+    /* Append to an existing archive. */
+    if (!mz_zip_reader_init_file_v2(
+            &zip_archive, pZip_filename,
+            level_and_flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY, 0,
+            0)) {
+      if (pErr)
+        *pErr = zip_archive.m_last_error;
       return MZ_FALSE;
-    if (!mz_zip_writer_init_from_reader(&zip_archive, pZip_filename)) {
-      mz_zip_reader_end(&zip_archive);
+    }
+
+    if (!mz_zip_writer_init_from_reader_v2(&zip_archive, pZip_filename,
+                                           level_and_flags)) {
+      if (pErr)
+        *pErr = zip_archive.m_last_error;
+
+      mz_zip_reader_end_internal(&zip_archive, MZ_FALSE);
+
       return MZ_FALSE;
     }
   }
+
   status =
       mz_zip_writer_add_mem_ex(&zip_archive, pArchive_name, pBuf, buf_size,
                                pComment, comment_size, level_and_flags, 0, 0);
-  // Always finalize, even if adding failed for some reason, so we have a valid
-  // central directory. (This may not always succeed, but we can try.)
-  if (!mz_zip_writer_finalize_archive(&zip_archive))
+  actual_err = zip_archive.m_last_error;
+
+  /* Always finalize, even if adding failed for some reason, so we have a valid
+   * central directory. (This may not always succeed, but we can try.) */
+  if (!mz_zip_writer_finalize_archive(&zip_archive)) {
+    if (!actual_err)
+      actual_err = zip_archive.m_last_error;
+
     status = MZ_FALSE;
-  if (!mz_zip_writer_end(&zip_archive))
+  }
+
+  if (!mz_zip_writer_end_internal(&zip_archive, status)) {
+    if (!actual_err)
+      actual_err = zip_archive.m_last_error;
+
     status = MZ_FALSE;
+  }
+
   if ((!status) && (created_new_archive)) {
-    // It's a new archive and something went wrong, so just delete it.
+    /* It's a new archive and something went wrong, so just delete it. */
     int ignoredStatus = MZ_DELETE_FILE(pZip_filename);
     (void)ignoredStatus;
   }
+
+  if (pErr)
+    *pErr = actual_err;
+
   return status;
 }
 
-void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename,
-                                          const char *pArchive_name,
-                                          size_t *pSize, mz_uint flags) {
-  int file_index;
+void *mz_zip_extract_archive_file_to_heap_v2(const char *pZip_filename,
+                                             const char *pArchive_name,
+                                             const char *pComment,
+                                             size_t *pSize, mz_uint flags,
+                                             mz_zip_error *pErr) {
+  mz_uint32 file_index;
   mz_zip_archive zip_archive;
   void *p = NULL;
 
   if (pSize)
     *pSize = 0;
 
-  if ((!pZip_filename) || (!pArchive_name))
-    return NULL;
+  if ((!pZip_filename) || (!pArchive_name)) {
+    if (pErr)
+      *pErr = MZ_ZIP_INVALID_PARAMETER;
 
-  MZ_CLEAR_OBJ(zip_archive);
-  if (!mz_zip_reader_init_file(&zip_archive, pZip_filename,
-                               flags |
-                                   MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY))
     return NULL;
+  }
 
-  if ((file_index = mz_zip_reader_locate_file(&zip_archive, pArchive_name, NULL,
-                                              flags)) >= 0)
+  mz_zip_zero_struct(&zip_archive);
+  if (!mz_zip_reader_init_file_v2(
+          &zip_archive, pZip_filename,
+          flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY, 0, 0)) {
+    if (pErr)
+      *pErr = zip_archive.m_last_error;
+
+    return NULL;
+  }
+
+  if (mz_zip_reader_locate_file_v2(&zip_archive, pArchive_name, pComment, flags,
+                                   &file_index)) {
     p = mz_zip_reader_extract_to_heap(&zip_archive, file_index, pSize, flags);
+  }
+
+  mz_zip_reader_end_internal(&zip_archive, p != NULL);
+
+  if (pErr)
+    *pErr = zip_archive.m_last_error;
 
-  mz_zip_reader_end(&zip_archive);
   return p;
 }
 
-#ifdef _MSC_VER
-#pragma warning(pop)
+void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename,
+                                          const char *pArchive_name,
+                                          size_t *pSize, mz_uint flags) {
+  return mz_zip_extract_archive_file_to_heap_v2(pZip_filename, pArchive_name,
+                                                NULL, pSize, flags, NULL);
+}
+
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS */
+
+/* ------------------- Misc utils */
+
+mz_zip_mode mz_zip_get_mode(mz_zip_archive *pZip) {
+  return pZip ? pZip->m_zip_mode : MZ_ZIP_MODE_INVALID;
+}
+
+mz_zip_type mz_zip_get_type(mz_zip_archive *pZip) {
+  return pZip ? pZip->m_zip_type : MZ_ZIP_TYPE_INVALID;
+}
+
+mz_zip_error mz_zip_set_last_error(mz_zip_archive *pZip, mz_zip_error err_num) {
+  mz_zip_error prev_err;
+
+  if (!pZip)
+    return MZ_ZIP_INVALID_PARAMETER;
+
+  prev_err = pZip->m_last_error;
+
+  pZip->m_last_error = err_num;
+  return prev_err;
+}
+
+mz_zip_error mz_zip_peek_last_error(mz_zip_archive *pZip) {
+  if (!pZip)
+    return MZ_ZIP_INVALID_PARAMETER;
+
+  return pZip->m_last_error;
+}
+
+mz_zip_error mz_zip_clear_last_error(mz_zip_archive *pZip) {
+  return mz_zip_set_last_error(pZip, MZ_ZIP_NO_ERROR);
+}
+
+mz_zip_error mz_zip_get_last_error(mz_zip_archive *pZip) {
+  mz_zip_error prev_err;
+
+  if (!pZip)
+    return MZ_ZIP_INVALID_PARAMETER;
+
+  prev_err = pZip->m_last_error;
+
+  pZip->m_last_error = MZ_ZIP_NO_ERROR;
+  return prev_err;
+}
+
+const char *mz_zip_get_error_string(mz_zip_error mz_err) {
+  switch (mz_err) {
+  case MZ_ZIP_NO_ERROR:
+    return "no error";
+  case MZ_ZIP_UNDEFINED_ERROR:
+    return "undefined error";
+  case MZ_ZIP_TOO_MANY_FILES:
+    return "too many files";
+  case MZ_ZIP_FILE_TOO_LARGE:
+    return "file too large";
+  case MZ_ZIP_UNSUPPORTED_METHOD:
+    return "unsupported method";
+  case MZ_ZIP_UNSUPPORTED_ENCRYPTION:
+    return "unsupported encryption";
+  case MZ_ZIP_UNSUPPORTED_FEATURE:
+    return "unsupported feature";
+  case MZ_ZIP_FAILED_FINDING_CENTRAL_DIR:
+    return "failed finding central directory";
+  case MZ_ZIP_NOT_AN_ARCHIVE:
+    return "not a ZIP archive";
+  case MZ_ZIP_INVALID_HEADER_OR_CORRUPTED:
+    return "invalid header or archive is corrupted";
+  case MZ_ZIP_UNSUPPORTED_MULTIDISK:
+    return "unsupported multidisk archive";
+  case MZ_ZIP_DECOMPRESSION_FAILED:
+    return "decompression failed or archive is corrupted";
+  case MZ_ZIP_COMPRESSION_FAILED:
+    return "compression failed";
+  case MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE:
+    return "unexpected decompressed size";
+  case MZ_ZIP_CRC_CHECK_FAILED:
+    return "CRC-32 check failed";
+  case MZ_ZIP_UNSUPPORTED_CDIR_SIZE:
+    return "unsupported central directory size";
+  case MZ_ZIP_ALLOC_FAILED:
+    return "allocation failed";
+  case MZ_ZIP_FILE_OPEN_FAILED:
+    return "file open failed";
+  case MZ_ZIP_FILE_CREATE_FAILED:
+    return "file create failed";
+  case MZ_ZIP_FILE_WRITE_FAILED:
+    return "file write failed";
+  case MZ_ZIP_FILE_READ_FAILED:
+    return "file read failed";
+  case MZ_ZIP_FILE_CLOSE_FAILED:
+    return "file close failed";
+  case MZ_ZIP_FILE_SEEK_FAILED:
+    return "file seek failed";
+  case MZ_ZIP_FILE_STAT_FAILED:
+    return "file stat failed";
+  case MZ_ZIP_INVALID_PARAMETER:
+    return "invalid parameter";
+  case MZ_ZIP_INVALID_FILENAME:
+    return "invalid filename";
+  case MZ_ZIP_BUF_TOO_SMALL:
+    return "buffer too small";
+  case MZ_ZIP_INTERNAL_ERROR:
+    return "internal error";
+  case MZ_ZIP_FILE_NOT_FOUND:
+    return "file not found";
+  case MZ_ZIP_ARCHIVE_TOO_LARGE:
+    return "archive is too large";
+  case MZ_ZIP_VALIDATION_FAILED:
+    return "validation failed";
+  case MZ_ZIP_WRITE_CALLBACK_FAILED:
+    return "write callback failed";
+  case MZ_ZIP_TOTAL_ERRORS:
+    return "total errors";
+  default:
+    break;
+  }
+
+  return "unknown error";
+}
+
+/* Note: Just because the archive is not zip64 doesn't necessarily mean it
+ * doesn't have Zip64 extended information extra field, argh. */
+mz_bool mz_zip_is_zip64(mz_zip_archive *pZip) {
+  if ((!pZip) || (!pZip->m_pState))
+    return MZ_FALSE;
+
+  return pZip->m_pState->m_zip64;
+}
+
+size_t mz_zip_get_central_dir_size(mz_zip_archive *pZip) {
+  if ((!pZip) || (!pZip->m_pState))
+    return 0;
+
+  return pZip->m_pState->m_central_dir.m_size;
+}
+
+mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip) {
+  return pZip ? pZip->m_total_files : 0;
+}
+
+mz_uint64 mz_zip_get_archive_size(mz_zip_archive *pZip) {
+  if (!pZip)
+    return 0;
+  return pZip->m_archive_size;
+}
+
+mz_uint64 mz_zip_get_archive_file_start_offset(mz_zip_archive *pZip) {
+  if ((!pZip) || (!pZip->m_pState))
+    return 0;
+  return pZip->m_pState->m_file_archive_start_ofs;
+}
+
+MZ_FILE *mz_zip_get_cfile(mz_zip_archive *pZip) {
+  if ((!pZip) || (!pZip->m_pState))
+    return 0;
+  return pZip->m_pState->m_pFile;
+}
+
+size_t mz_zip_read_archive_data(mz_zip_archive *pZip, mz_uint64 file_ofs,
+                                void *pBuf, size_t n) {
+  if ((!pZip) || (!pZip->m_pState) || (!pBuf) || (!pZip->m_pRead))
+    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+  return pZip->m_pRead(pZip->m_pIO_opaque, file_ofs, pBuf, n);
+}
+
+mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index,
+                                   char *pFilename, mz_uint filename_buf_size) {
+  mz_uint n;
+  const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
+  if (!p) {
+    if (filename_buf_size)
+      pFilename[0] = '\0';
+    mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+    return 0;
+  }
+  n = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
+  if (filename_buf_size) {
+    n = MZ_MIN(n, filename_buf_size - 1);
+    memcpy(pFilename, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n);
+    pFilename[n] = '\0';
+  }
+  return n + 1;
+}
+
+mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index,
+                                mz_zip_archive_file_stat *pStat) {
+  return mz_zip_file_stat_internal(
+      pZip, file_index, mz_zip_get_cdh(pZip, file_index), pStat, NULL);
+}
+
+mz_bool mz_zip_end(mz_zip_archive *pZip) {
+  if (!pZip)
+    return MZ_FALSE;
+
+  if (pZip->m_zip_mode == MZ_ZIP_MODE_READING)
+    return mz_zip_reader_end(pZip);
+#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
+  else if ((pZip->m_zip_mode == MZ_ZIP_MODE_WRITING) ||
+           (pZip->m_zip_mode == MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED))
+    return mz_zip_writer_end(pZip);
 #endif
 
-#endif // #ifndef MINIZ_NO_STDIO
-
-#endif // #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
-
-#endif // #ifndef MINIZ_NO_ARCHIVE_APIS
+  return MZ_FALSE;
+}
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif // MINIZ_HEADER_FILE_ONLY
-
-/*
-  This is free and unencumbered software released into the public domain.
-
-  Anyone is free to copy, modify, publish, use, compile, sell, or
-  distribute this software, either in source code form or as a compiled
-  binary, for any purpose, commercial or non-commercial, and by any
-  means.
-
-  In jurisdictions that recognize copyright laws, the author or authors
-  of this software dedicate any and all copyright interest in the
-  software to the public domain. We make this dedication for the benefit
-  of the public at large and to the detriment of our heirs and
-  successors. We intend this dedication to be an overt act of
-  relinquishment in perpetuity of all present and future rights to this
-  software under copyright law.
-
-  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 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.
-
-  For more information, please refer to <http://unlicense.org/>
-*/
+#endif /*#ifndef MINIZ_NO_ARCHIVE_APIS*/
diff --git a/contrib/zip/src/zip.c b/contrib/zip/src/zip.c
index 29af2ec99..553d910f1 100644
--- a/contrib/zip/src/zip.c
+++ b/contrib/zip/src/zip.c
@@ -13,12 +13,16 @@
 #include <sys/stat.h>
 #include <time.h>
 
+#if defined(_MSC_VER)
+/* For Visual Studio only, NOT MinGW (GCC) -- ThatOSDev */
+#pragma warning( disable : 4706 )
+#endif
+
 #if defined(_WIN32) || defined(__WIN32__) || defined(_MSC_VER) ||              \
     defined(__MINGW32__)
-/* Win32, DOS, MSVC, MSVS */
+/* Win32, DOS, MSVC, MSVS, MinGW(GCC for windows) */
 #include <direct.h>
 
-#define MKDIR(DIRNAME) _mkdir(DIRNAME)
 #define STRCLONE(STR) ((STR) ? _strdup(STR) : NULL)
 #define HAS_DEVICE(P)                                                          \
   ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) &&   \
@@ -28,8 +32,6 @@
 #else
 
 #include <unistd.h> // needed for symlink()
-
-#define MKDIR(DIRNAME) mkdir(DIRNAME, 0755)
 #define STRCLONE(STR) ((STR) ? strdup(STR) : NULL)
 
 #endif
@@ -44,7 +46,13 @@
 
 #ifdef _MSC_VER
 #include <io.h>
-#pragma warning(disable : 4706 4244 4028)
+
+#define ftruncate(fd, sz) (-(_chsize_s((fd), (sz)) != 0))
+#define fileno _fileno
+#endif
+
+#if defined(__TINYC__) && (defined(_WIN32) || defined(_WIN64))
+#include <io.h>
 
 #define ftruncate(fd, sz) (-(_chsize_s((fd), (sz)) != 0))
 #define fileno _fileno
@@ -70,13 +78,21 @@
     }                                                                          \
   } while (0)
 
+#define UNX_IFDIR 0040000  /* Unix directory */
+#define UNX_IFREG 0100000  /* Unix regular file */
+#define UNX_IFSOCK 0140000 /* Unix socket (BSD, not SysV or Amiga) */
+#define UNX_IFLNK 0120000  /* Unix symbolic link (not SysV, Amiga) */
+#define UNX_IFBLK 0060000  /* Unix block special       (not Amiga) */
+#define UNX_IFCHR 0020000  /* Unix character special   (not Amiga) */
+#define UNX_IFIFO 0010000  /* Unix fifo    (BCC, not MSC or Amiga) */
+
 struct zip_entry_t {
-  int index;
+  ssize_t index;
   char *name;
   mz_uint64 uncomp_size;
   mz_uint64 comp_size;
   mz_uint32 uncomp_crc32;
-  mz_uint64 offset;
+  mz_uint64 dir_offset;
   mz_uint8 header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE];
   mz_uint64 header_offset;
   mz_uint16 method;
@@ -99,13 +115,13 @@ enum zip_modify_t {
 };
 
 struct zip_entry_mark_t {
-  int file_index;
+  ssize_t file_index;
   enum zip_modify_t type;
   mz_uint64 m_local_header_ofs;
-  mz_uint64 lf_length;
+  size_t lf_length;
 };
 
-static const char *const zip_errlist[30] = {
+static const char *const zip_errlist[33] = {
     NULL,
     "not initialized\0",
     "invalid entry name\0",
@@ -129,18 +145,21 @@ static const char *const zip_errlist[30] = {
     "no permission\0",
     "out of memory\0",
     "invalid zip archive name\0",
-    "make dir error\0"
-    "symlink error\0"
-    "close archive error\0"
+    "make dir error\0",
+    "symlink error\0",
+    "close archive error\0",
     "capacity size too small\0",
     "fseek error\0",
     "fread error\0",
     "fwrite error\0",
+    "cannot initialize reader\0",
+    "cannot initialize writer\0",
+    "cannot initialize writer from reader\0",
 };
 
 const char *zip_strerror(int errnum) {
   errnum = -errnum;
-  if (errnum <= 0 || errnum >= 30) {
+  if (errnum <= 0 || errnum >= 33) {
     return NULL;
   }
 
@@ -168,18 +187,18 @@ static const char *zip_basename(const char *name) {
 
 static int zip_mkpath(char *path) {
   char *p;
-  char npath[MAX_PATH + 1];
+  char npath[MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE + 1];
   int len = 0;
   int has_device = HAS_DEVICE(path);
 
-  memset(npath, 0, MAX_PATH + 1);
+  memset(npath, 0, MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE + 1);
   if (has_device) {
     // only on windows
     npath[0] = path[0];
     npath[1] = path[1];
     len = 2;
   }
-  for (p = path + len; *p && len < MAX_PATH; p++) {
+  for (p = path + len; *p && len < MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE; p++) {
     if (ISSLASH(*p) && ((!has_device && len > 0) || (has_device && len > 2))) {
 #if defined(_WIN32) || defined(__WIN32__) || defined(_MSC_VER) ||              \
     defined(__MINGW32__)
@@ -189,7 +208,7 @@ static int zip_mkpath(char *path) {
       }
 #endif
 
-      if (MKDIR(npath) == -1) {
+      if (MZ_MKDIR(npath) == -1) {
         if (errno != EEXIST) {
           return ZIP_EMKDIR;
         }
@@ -254,8 +273,14 @@ static char *zip_name_normalize(char *name, char *const nname, size_t len) {
 }
 
 static mz_bool zip_name_match(const char *name1, const char *name2) {
-  int len2 = (int) strlen(name2);
-  char *nname2 = zip_strrpl(name2, len2, '\\', '/');
+  char *nname2 = NULL;
+
+#ifdef ZIP_RAW_ENTRYNAME
+  nname2 = STRCLONE(name2);
+#else
+  nname2 = zip_strrpl(name2, strlen(name2), '\\', '/');
+#endif
+
   if (!nname2) {
     return MZ_FALSE;
   }
@@ -286,24 +311,24 @@ static int zip_archive_extract(mz_zip_archive *zip_archive, const char *dir,
                                void *arg) {
   int err = 0;
   mz_uint i, n;
-  char path[MAX_PATH + 1];
-  char symlink_to[MAX_PATH + 1];
+  char path[MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE + 1];
+  char symlink_to[MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE + 1];
   mz_zip_archive_file_stat info;
-  size_t dirlen = 0;
+  size_t dirlen = 0, filename_size = MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE;
   mz_uint32 xattr = 0;
 
   memset(path, 0, sizeof(path));
   memset(symlink_to, 0, sizeof(symlink_to));
 
   dirlen = strlen(dir);
-  if (dirlen + 1 > MAX_PATH) {
+  if (dirlen + 1 > MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE) {
     return ZIP_EINVENTNAME;
   }
 
   memset((void *)&info, 0, sizeof(mz_zip_archive_file_stat));
 
 #if defined(_MSC_VER)
-  strcpy_s(path, MAX_PATH, dir);
+  strcpy_s(path, MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE, dir);
 #else
   strcpy(path, dir);
 #endif
@@ -317,6 +342,9 @@ static int zip_archive_extract(mz_zip_archive *zip_archive, const char *dir,
     ++dirlen;
   }
 
+  if (filename_size > MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE - dirlen) {
+    filename_size = MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE - dirlen;
+  }
   // Get and print information about each file in the archive.
   n = mz_zip_reader_get_num_files(zip_archive);
   for (i = 0; i < n; ++i) {
@@ -332,11 +360,11 @@ static int zip_archive_extract(mz_zip_archive *zip_archive, const char *dir,
       err = ZIP_EINVENTNAME;
       goto out;
     }
+
 #if defined(_MSC_VER)
-    strncpy_s(&path[dirlen], MAX_PATH - dirlen, info.m_filename,
-              MAX_PATH - dirlen);
+    strncpy_s(&path[dirlen], filename_size, info.m_filename, filename_size);
 #else
-    strncpy(&path[dirlen], info.m_filename, MAX_PATH - dirlen);
+    strncpy(&path[dirlen], info.m_filename, filename_size);
 #endif
     err = zip_mkpath(path);
     if (err < 0) {
@@ -354,9 +382,10 @@ static int zip_archive_extract(mz_zip_archive *zip_archive, const char *dir,
 #if defined(_WIN32) || defined(__WIN32__) || defined(_MSC_VER) ||              \
     defined(__MINGW32__)
 #else
-      if (info.m_uncomp_size > MAX_PATH ||
-          !mz_zip_reader_extract_to_mem_no_alloc(zip_archive, i, symlink_to,
-                                                 MAX_PATH, 0, NULL, 0)) {
+      if (info.m_uncomp_size > MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE ||
+          !mz_zip_reader_extract_to_mem_no_alloc(
+              zip_archive, i, symlink_to, MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE, 0,
+              NULL, 0)) {
         err = ZIP_EMEMNOALLOC;
         goto out;
       }
@@ -375,12 +404,12 @@ static int zip_archive_extract(mz_zip_archive *zip_archive, const char *dir,
         }
       }
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(PS4)
       (void)xattr; // unused
 #else
       xattr = (info.m_external_attr >> 16) & 0xFFFF;
-      if (xattr > 0) {
-        if (chmod(path, (mode_t)xattr) < 0) {
+      if (xattr > 0 && xattr <= MZ_UINT16_MAX) {
+        if (CHMOD(path, (mode_t)xattr) < 0) {
           err = ZIP_ENOPERM;
           goto out;
         }
@@ -409,27 +438,31 @@ static inline void zip_archive_finalize(mz_zip_archive *pzip) {
   zip_archive_truncate(pzip);
 }
 
-static int zip_entry_mark(struct zip_t *zip,
-                          struct zip_entry_mark_t *entry_mark, int n,
-                          char *const entries[], const size_t len) {
-  int err = 0;
+static ssize_t zip_entry_mark(struct zip_t *zip,
+                              struct zip_entry_mark_t *entry_mark,
+                              const ssize_t n, char *const entries[],
+                              const size_t len) {
+  ssize_t i = 0;
+  ssize_t err = 0;
   if (!zip || !entry_mark || !entries) {
     return ZIP_ENOINIT;
   }
 
   mz_zip_archive_file_stat file_stat;
-  mz_uint64 d_pos = (mz_uint64) ~0;
-  for (int i = 0; i < n; ++i) {
-    err = zip_entry_openbyindex(zip, i);
-    if (err) {
-      return err;
+  mz_uint64 d_pos = UINT64_MAX;
+  for (i = 0; i < n; ++i) {
+    if ((err = zip_entry_openbyindex(zip, i))) {
+      return (ssize_t)err;
     }
 
     mz_bool name_matches = MZ_FALSE;
-    for (int j = 0; j < (const int)len; ++j) {
-      if (zip_name_match(zip->entry.name, entries[j])) {
-        name_matches = MZ_TRUE;
-        break;
+    {
+      size_t j;
+      for (j = 0; j < len; ++j) {
+        if (zip_name_match(zip->entry.name, entries[j])) {
+          name_matches = MZ_TRUE;
+          break;
+        }
       }
     }
     if (name_matches) {
@@ -438,21 +471,22 @@ static int zip_entry_mark(struct zip_t *zip,
       entry_mark[i].type = MZ_KEEP;
     }
 
-    if (!mz_zip_reader_file_stat(&zip->archive, i, &file_stat)) {
+    if (!mz_zip_reader_file_stat(&zip->archive, (mz_uint)i, &file_stat)) {
       return ZIP_ENOENT;
     }
 
     zip_entry_close(zip);
 
     entry_mark[i].m_local_header_ofs = file_stat.m_local_header_ofs;
-    entry_mark[i].file_index = -1;
+    entry_mark[i].file_index = (ssize_t)-1;
     entry_mark[i].lf_length = 0;
     if ((entry_mark[i].type) == MZ_DELETE &&
         (d_pos > entry_mark[i].m_local_header_ofs)) {
       d_pos = entry_mark[i].m_local_header_ofs;
     }
   }
-  for (int i = 0; i < n; ++i) {
+
+  for (i = 0; i < n; ++i) {
     if ((entry_mark[i].m_local_header_ofs > d_pos) &&
         (entry_mark[i].type != MZ_DELETE)) {
       entry_mark[i].type = MZ_MOVE;
@@ -461,9 +495,66 @@ static int zip_entry_mark(struct zip_t *zip,
   return err;
 }
 
-static int zip_index_next(mz_uint64 *local_header_ofs_array, int cur_index) {
-  int new_index = 0;
-  for (int i = cur_index - 1; i >= 0; --i) {
+static ssize_t zip_entry_markbyindex(struct zip_t *zip,
+                                     struct zip_entry_mark_t *entry_mark,
+                                     const ssize_t n, size_t entries[],
+                                     const size_t len) {
+  ssize_t i = 0;
+  ssize_t err = 0;
+  if (!zip || !entry_mark || !entries) {
+    return ZIP_ENOINIT;
+  }
+
+  mz_zip_archive_file_stat file_stat;
+  mz_uint64 d_pos = UINT64_MAX;
+  for (i = 0; i < n; ++i) {
+    if ((err = zip_entry_openbyindex(zip, i))) {
+      return (ssize_t)err;
+    }
+
+    mz_bool matches = MZ_FALSE;
+    {
+      size_t j;
+      for (j = 0; j < len; ++j) {
+        if ((size_t)i == entries[j]) {
+          matches = MZ_TRUE;
+          break;
+        }
+      }
+    }
+    if (matches) {
+      entry_mark[i].type = MZ_DELETE;
+    } else {
+      entry_mark[i].type = MZ_KEEP;
+    }
+
+    if (!mz_zip_reader_file_stat(&zip->archive, (mz_uint)i, &file_stat)) {
+      return ZIP_ENOENT;
+    }
+
+    zip_entry_close(zip);
+
+    entry_mark[i].m_local_header_ofs = file_stat.m_local_header_ofs;
+    entry_mark[i].file_index = (ssize_t)-1;
+    entry_mark[i].lf_length = 0;
+    if ((entry_mark[i].type) == MZ_DELETE &&
+        (d_pos > entry_mark[i].m_local_header_ofs)) {
+      d_pos = entry_mark[i].m_local_header_ofs;
+    }
+  }
+
+  for (i = 0; i < n; ++i) {
+    if ((entry_mark[i].m_local_header_ofs > d_pos) &&
+        (entry_mark[i].type != MZ_DELETE)) {
+      entry_mark[i].type = MZ_MOVE;
+    }
+  }
+  return err;
+}
+static ssize_t zip_index_next(mz_uint64 *local_header_ofs_array,
+                              ssize_t cur_index) {
+  ssize_t new_index = 0, i;
+  for (i = cur_index - 1; i >= 0; --i) {
     if (local_header_ofs_array[cur_index] > local_header_ofs_array[i]) {
       new_index = i + 1;
       return new_index;
@@ -472,12 +563,13 @@ static int zip_index_next(mz_uint64 *local_header_ofs_array, int cur_index) {
   return new_index;
 }
 
-static int zip_sort(mz_uint64 *local_header_ofs_array, int cur_index) {
-  int nxt_index = zip_index_next(local_header_ofs_array, cur_index);
+static ssize_t zip_sort(mz_uint64 *local_header_ofs_array, ssize_t cur_index) {
+  ssize_t nxt_index = zip_index_next(local_header_ofs_array, cur_index);
 
   if (nxt_index != cur_index) {
     mz_uint64 temp = local_header_ofs_array[cur_index];
-    for (int i = cur_index; i > nxt_index; i--) {
+    ssize_t i;
+    for (i = cur_index; i > nxt_index; i--) {
       local_header_ofs_array[i] = local_header_ofs_array[i - 1];
     }
     local_header_ofs_array[nxt_index] = temp;
@@ -485,9 +577,10 @@ static int zip_sort(mz_uint64 *local_header_ofs_array, int cur_index) {
   return nxt_index;
 }
 
-static int zip_index_update(struct zip_entry_mark_t *entry_mark, int last_index,
-                            int nxt_index) {
-  for (int j = 0; j < last_index; j++) {
+static int zip_index_update(struct zip_entry_mark_t *entry_mark,
+                            ssize_t last_index, ssize_t nxt_index) {
+  ssize_t j;
+  for (j = 0; j < last_index; j++) {
     if (entry_mark[j].file_index >= nxt_index) {
       entry_mark[j].file_index += 1;
     }
@@ -498,16 +591,17 @@ static int zip_index_update(struct zip_entry_mark_t *entry_mark, int last_index,
 
 static int zip_entry_finalize(struct zip_t *zip,
                               struct zip_entry_mark_t *entry_mark,
-                              const int n) {
+                              const ssize_t n) {
 
+  ssize_t i = 0;
   mz_uint64 *local_header_ofs_array = (mz_uint64 *)calloc(n, sizeof(mz_uint64));
   if (!local_header_ofs_array) {
     return ZIP_EOOMEM;
   }
 
-  for (int i = 0; i < n; ++i) {
+  for (i = 0; i < n; ++i) {
     local_header_ofs_array[i] = entry_mark[i].m_local_header_ofs;
-    int index = zip_sort(local_header_ofs_array, i);
+    ssize_t index = zip_sort(local_header_ofs_array, i);
 
     if (index != i) {
       zip_index_update(entry_mark, i, index);
@@ -515,17 +609,19 @@ static int zip_entry_finalize(struct zip_t *zip,
     entry_mark[i].file_index = index;
   }
 
-  mz_uint64 *length = (mz_uint64 *)calloc(n, sizeof(mz_uint64));
+  size_t *length = (size_t *)calloc(n, sizeof(size_t));
   if (!length) {
     CLEANUP(local_header_ofs_array);
     return ZIP_EOOMEM;
   }
-  for (int i = 0; i < n - 1; i++) {
-    length[i] = local_header_ofs_array[i + 1] - local_header_ofs_array[i];
+  for (i = 0; i < n - 1; i++) {
+    length[i] =
+        (size_t)(local_header_ofs_array[i + 1] - local_header_ofs_array[i]);
   }
-  length[n - 1] = zip->archive.m_archive_size - local_header_ofs_array[n - 1];
+  length[n - 1] =
+      (size_t)(zip->archive.m_archive_size - local_header_ofs_array[n - 1]);
 
-  for (int i = 0; i < n; i++) {
+  for (i = 0; i < n; i++) {
     entry_mark[i].lf_length = length[entry_mark[i].file_index];
   }
 
@@ -534,9 +630,10 @@ static int zip_entry_finalize(struct zip_t *zip,
   return 0;
 }
 
-static int zip_entry_set(struct zip_t *zip, struct zip_entry_mark_t *entry_mark,
-                         int n, char *const entries[], const size_t len) {
-  int err = 0;
+static ssize_t zip_entry_set(struct zip_t *zip,
+                             struct zip_entry_mark_t *entry_mark, ssize_t n,
+                             char *const entries[], const size_t len) {
+  ssize_t err = 0;
 
   if ((err = zip_entry_mark(zip, entry_mark, n, entries, len)) < 0) {
     return err;
@@ -547,47 +644,56 @@ static int zip_entry_set(struct zip_t *zip, struct zip_entry_mark_t *entry_mark,
   return 0;
 }
 
-static mz_int64 zip_file_move(MZ_FILE *m_pFile, const mz_uint64 to,
-                              const mz_uint64 from, const mz_uint64 length,
-                              mz_uint8 *move_buf,
-                              const mz_int64 capacity_size) {
-  if ((mz_int64)length > capacity_size) {
+static ssize_t zip_entry_setbyindex(struct zip_t *zip,
+                                    struct zip_entry_mark_t *entry_mark,
+                                    ssize_t n, size_t entries[],
+                                    const size_t len) {
+  ssize_t err = 0;
+
+  if ((err = zip_entry_markbyindex(zip, entry_mark, n, entries, len)) < 0) {
+    return err;
+  }
+  if ((err = zip_entry_finalize(zip, entry_mark, n)) < 0) {
+    return err;
+  }
+  return 0;
+}
+
+static ssize_t zip_file_move(MZ_FILE *m_pFile, const mz_uint64 to,
+                             const mz_uint64 from, const size_t length,
+                             mz_uint8 *move_buf, const size_t capacity_size) {
+  if (length > capacity_size) {
     return ZIP_ECAPSIZE;
   }
   if (MZ_FSEEK64(m_pFile, from, SEEK_SET)) {
-    MZ_FCLOSE(m_pFile);
     return ZIP_EFSEEK;
   }
-
   if (fread(move_buf, 1, length, m_pFile) != length) {
-    MZ_FCLOSE(m_pFile);
     return ZIP_EFREAD;
   }
   if (MZ_FSEEK64(m_pFile, to, SEEK_SET)) {
-    MZ_FCLOSE(m_pFile);
     return ZIP_EFSEEK;
   }
   if (fwrite(move_buf, 1, length, m_pFile) != length) {
-    MZ_FCLOSE(m_pFile);
     return ZIP_EFWRITE;
   }
-  return (mz_int64)length;
+  return (ssize_t)length;
 }
 
-static mz_int64 zip_files_move(MZ_FILE *m_pFile, mz_uint64 writen_num,
-                               mz_uint64 read_num, mz_uint64 length) {
-  int n = 0;
-  const mz_int64 page_size = 1 << 12; // 4K
+static ssize_t zip_files_move(MZ_FILE *m_pFile, mz_uint64 writen_num,
+                              mz_uint64 read_num, size_t length) {
+  ssize_t n = 0;
+  const size_t page_size = 1 << 12; // 4K
   mz_uint8 *move_buf = (mz_uint8 *)calloc(1, page_size);
-  if (move_buf == NULL) {
+  if (!move_buf) {
     return ZIP_EOOMEM;
   }
 
-  mz_int64 moved_length = 0;
-  mz_int64 move_count = 0;
+  ssize_t moved_length = 0;
+  ssize_t move_count = 0;
   while ((mz_int64)length > 0) {
-    move_count = ((mz_int64)length >= page_size) ? page_size : (mz_int64)length;
-    n = (int) zip_file_move(m_pFile, writen_num, read_num, move_count, move_buf,
+    move_count = (length >= page_size) ? page_size : length;
+    n = zip_file_move(m_pFile, writen_num, read_num, move_count, move_buf,
                       page_size);
     if (n < 0) {
       moved_length = n;
@@ -615,14 +721,14 @@ static int zip_central_dir_move(mz_zip_internal_state *pState, int begin,
     return 0;
   }
 
-  mz_uint64 l_size = 0;
-  mz_uint64 r_size = 0;
-  mz_uint64 d_size = 0;
+  size_t l_size = 0;
+  size_t r_size = 0;
+  mz_uint32 d_size = 0;
   mz_uint8 *next = NULL;
   mz_uint8 *deleted = &MZ_ZIP_ARRAY_ELEMENT(
       &pState->m_central_dir, mz_uint8,
       MZ_ZIP_ARRAY_ELEMENT(&pState->m_central_dir_offsets, mz_uint32, begin));
-  l_size = (mz_uint32)(deleted - (mz_uint8 *)(pState->m_central_dir.m_p));
+  l_size = (size_t)(deleted - (mz_uint8 *)(pState->m_central_dir.m_p));
   if (end == entry_num) {
     r_size = 0;
   } else {
@@ -631,23 +737,29 @@ static int zip_central_dir_move(mz_zip_internal_state *pState, int begin,
         MZ_ZIP_ARRAY_ELEMENT(&pState->m_central_dir_offsets, mz_uint32, end));
     r_size = pState->m_central_dir.m_size -
              (mz_uint32)(next - (mz_uint8 *)(pState->m_central_dir.m_p));
-    d_size = next - deleted;
+    d_size = (mz_uint32)(next - deleted);
   }
 
-  if (l_size == 0) {
+  if (next && l_size == 0) {
     memmove(pState->m_central_dir.m_p, next, r_size);
     pState->m_central_dir.m_p = MZ_REALLOC(pState->m_central_dir.m_p, r_size);
-    for (int i = end; i < entry_num; i++) {
-      MZ_ZIP_ARRAY_ELEMENT(&pState->m_central_dir_offsets, mz_uint64, i) -=
-          d_size;
+    {
+      int i;
+      for (i = end; i < entry_num; i++) {
+        MZ_ZIP_ARRAY_ELEMENT(&pState->m_central_dir_offsets, mz_uint32, i) -=
+            d_size;
+      }
     }
   }
 
-  if (l_size * r_size != 0) {
+  if (next && l_size * r_size != 0) {
     memmove(deleted, next, r_size);
-    for (int i = end; i < entry_num; i++) {
-      MZ_ZIP_ARRAY_ELEMENT(&pState->m_central_dir_offsets, mz_uint64, i) -=
-          d_size;
+    {
+      int i;
+      for (i = end; i < entry_num; i++) {
+        MZ_ZIP_ARRAY_ELEMENT(&pState->m_central_dir_offsets, mz_uint32, i) -=
+            d_size;
+      }
     }
   }
 
@@ -663,12 +775,12 @@ static int zip_central_dir_delete(mz_zip_internal_state *pState,
   int end = 0;
   int d_num = 0;
   while (i < entry_num) {
-    while ((!deleted_entry_index_array[i]) && (i < entry_num)) {
+    while ((i < entry_num) && (!deleted_entry_index_array[i])) {
       i++;
     }
     begin = i;
 
-    while ((deleted_entry_index_array[i]) && (i < entry_num)) {
+    while ((i < entry_num) && (deleted_entry_index_array[i])) {
       i++;
     }
     end = i;
@@ -677,19 +789,19 @@ static int zip_central_dir_delete(mz_zip_internal_state *pState,
 
   i = 0;
   while (i < entry_num) {
-    while ((!deleted_entry_index_array[i]) && (i < entry_num)) {
+    while ((i < entry_num) && (!deleted_entry_index_array[i])) {
       i++;
     }
     begin = i;
     if (begin == entry_num) {
       break;
     }
-    while ((deleted_entry_index_array[i]) && (i < entry_num)) {
+    while ((i < entry_num) && (deleted_entry_index_array[i])) {
       i++;
     }
     end = i;
-    int k = 0;
-    for (int j = end; j < entry_num; j++) {
+    int k = 0, j;
+    for (j = end; j < entry_num; j++) {
       MZ_ZIP_ARRAY_ELEMENT(&pState->m_central_dir_offsets, mz_uint32,
                            begin + k) =
           (mz_uint32)MZ_ZIP_ARRAY_ELEMENT(&pState->m_central_dir_offsets,
@@ -704,16 +816,16 @@ static int zip_central_dir_delete(mz_zip_internal_state *pState,
   return 0;
 }
 
-static int zip_entries_delete_mark(struct zip_t *zip,
-                                   struct zip_entry_mark_t *entry_mark,
-                                   int entry_num) {
+static ssize_t zip_entries_delete_mark(struct zip_t *zip,
+                                       struct zip_entry_mark_t *entry_mark,
+                                       int entry_num) {
   mz_uint64 writen_num = 0;
   mz_uint64 read_num = 0;
-  mz_uint64 deleted_length = 0;
-  mz_uint64 move_length = 0;
+  size_t deleted_length = 0;
+  size_t move_length = 0;
   int i = 0;
-  int deleted_entry_num = 0;
-  int n = 0;
+  size_t deleted_entry_num = 0;
+  ssize_t n = 0;
 
   mz_bool *deleted_entry_flag_array =
       (mz_bool *)calloc(entry_num, sizeof(mz_bool));
@@ -724,19 +836,19 @@ static int zip_entries_delete_mark(struct zip_t *zip,
   mz_zip_internal_state *pState = zip->archive.m_pState;
   zip->archive.m_zip_mode = MZ_ZIP_MODE_WRITING;
 
-  if (MZ_FSEEK64(pState->m_pFile, 0, SEEK_SET)) {
+  if ((!pState->m_pFile) || MZ_FSEEK64(pState->m_pFile, 0, SEEK_SET)) {
     CLEANUP(deleted_entry_flag_array);
     return ZIP_ENOENT;
   }
 
   while (i < entry_num) {
-    while ((entry_mark[i].type == MZ_KEEP) && (i < entry_num)) {
+    while ((i < entry_num) && (entry_mark[i].type == MZ_KEEP)) {
       writen_num += entry_mark[i].lf_length;
       read_num = writen_num;
       i++;
     }
 
-    while ((entry_mark[i].type == MZ_DELETE) && (i < entry_num)) {
+    while ((i < entry_num) && (entry_mark[i].type == MZ_DELETE)) {
       deleted_entry_flag_array[i] = MZ_TRUE;
       read_num += entry_mark[i].lf_length;
       deleted_length += entry_mark[i].lf_length;
@@ -744,7 +856,7 @@ static int zip_entries_delete_mark(struct zip_t *zip,
       deleted_entry_num++;
     }
 
-    while ((entry_mark[i].type == MZ_MOVE) && (i < entry_num)) {
+    while ((i < entry_num) && (entry_mark[i].type == MZ_MOVE)) {
       move_length += entry_mark[i].lf_length;
       mz_uint8 *p = &MZ_ZIP_ARRAY_ELEMENT(
           &pState->m_central_dir, mz_uint8,
@@ -759,8 +871,8 @@ static int zip_entries_delete_mark(struct zip_t *zip,
       i++;
     }
 
-    n = (int) zip_files_move(pState->m_pFile, writen_num, read_num, move_length);
-    if (n != (mz_int64)move_length) {
+    n = zip_files_move(pState->m_pFile, writen_num, read_num, move_length);
+    if (n != (ssize_t)move_length) {
       CLEANUP(deleted_entry_flag_array);
       return n;
     }
@@ -768,20 +880,29 @@ static int zip_entries_delete_mark(struct zip_t *zip,
     read_num += move_length;
   }
 
-  zip->archive.m_archive_size -= deleted_length;
-  zip->archive.m_total_files = entry_num - deleted_entry_num;
+  zip->archive.m_archive_size -= (mz_uint64)deleted_length;
+  zip->archive.m_total_files =
+      (mz_uint32)entry_num - (mz_uint32)deleted_entry_num;
 
   zip_central_dir_delete(pState, deleted_entry_flag_array, entry_num);
   CLEANUP(deleted_entry_flag_array);
 
-  return deleted_entry_num;
+  return (ssize_t)deleted_entry_num;
 }
 
 struct zip_t *zip_open(const char *zipname, int level, char mode) {
+  int errnum = 0;
+  return zip_openwitherror(zipname, level, mode, &errnum);
+}
+
+struct zip_t *zip_openwitherror(const char *zipname, int level, char mode,
+                                int *errnum) {
   struct zip_t *zip = NULL;
+  *errnum = 0;
 
   if (!zipname || strlen(zipname) < 1) {
     // zip_t archive name is empty or NULL
+    *errnum = ZIP_EINVZIPNAME;
     goto cleanup;
   }
 
@@ -789,41 +910,62 @@ struct zip_t *zip_open(const char *zipname, int level, char mode) {
     level = MZ_DEFAULT_LEVEL;
   if ((level & 0xF) > MZ_UBER_COMPRESSION) {
     // Wrong compression level
+    *errnum = ZIP_EINVLVL;
     goto cleanup;
   }
 
   zip = (struct zip_t *)calloc((size_t)1, sizeof(struct zip_t));
-  if (!zip)
+  if (!zip) {
+    // out of memory
+    *errnum = ZIP_EOOMEM;
     goto cleanup;
+  }
 
   zip->level = (mz_uint)level;
   switch (mode) {
   case 'w':
     // Create a new archive.
-    if (!mz_zip_writer_init_file(&(zip->archive), zipname, 0)) {
+    if (!mz_zip_writer_init_file_v2(&(zip->archive), zipname, 0,
+                                    MZ_ZIP_FLAG_WRITE_ZIP64)) {
       // Cannot initialize zip_archive writer
+      *errnum = ZIP_EWINIT;
       goto cleanup;
     }
     break;
 
   case 'r':
-  case 'a':
-  case 'd':
-    if (!mz_zip_reader_init_file(
+    if (!mz_zip_reader_init_file_v2(
             &(zip->archive), zipname,
-            zip->level | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY)) {
+            zip->level | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY, 0, 0)) {
       // An archive file does not exist or cannot initialize
       // zip_archive reader
-      goto cleanup;
-    }
-    if ((mode == 'a' || mode == 'd') &&
-        !mz_zip_writer_init_from_reader(&(zip->archive), zipname)) {
-      mz_zip_reader_end(&(zip->archive));
+      *errnum = ZIP_ERINIT;
       goto cleanup;
     }
     break;
 
+  case 'a':
+  case 'd':
+    if (!mz_zip_reader_init_file_v2_rpb(
+            &(zip->archive), zipname,
+            zip->level | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY, 0, 0)) {
+      // An archive file does not exist or cannot initialize
+      // zip_archive reader
+      *errnum = ZIP_ERINIT;
+      goto cleanup;
+    }
+    if ((mode == 'a' || mode == 'd')) {
+      if (!mz_zip_writer_init_from_reader_v2_noreopen(&(zip->archive), zipname,
+                                                      0)) {
+        *errnum = ZIP_EWRINIT;
+        mz_zip_reader_end(&(zip->archive));
+        goto cleanup;
+      }
+    }
+    break;
+
   default:
+    *errnum = ZIP_EINVMODE;
     goto cleanup;
   }
 
@@ -836,12 +978,21 @@ cleanup:
 
 void zip_close(struct zip_t *zip) {
   if (zip) {
+    mz_zip_archive *pZip = &(zip->archive);
     // Always finalize, even if adding failed for some reason, so we have a
     // valid central directory.
-    mz_zip_writer_finalize_archive(&(zip->archive));
-    zip_archive_truncate(&(zip->archive));
-    mz_zip_writer_end(&(zip->archive));
-    mz_zip_reader_end(&(zip->archive));
+    if (pZip->m_zip_mode == MZ_ZIP_MODE_WRITING) {
+      mz_zip_writer_finalize_archive(pZip);
+    }
+
+    if (pZip->m_zip_mode == MZ_ZIP_MODE_WRITING ||
+        pZip->m_zip_mode == MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED) {
+      zip_archive_truncate(pZip);
+      mz_zip_writer_end(pZip);
+    }
+    if (pZip->m_zip_mode == MZ_ZIP_MODE_READING) {
+      mz_zip_reader_end(pZip);
+    }
 
     CLEANUP(zip);
   }
@@ -856,17 +1007,24 @@ int zip_is64(struct zip_t *zip) {
   return (int)zip->archive.m_pState->m_zip64;
 }
 
-int zip_entry_open(struct zip_t *zip, const char *entryname) {
+static int _zip_entry_open(struct zip_t *zip, const char *entryname,
+                           int case_sensitive) {
   size_t entrylen = 0;
   mz_zip_archive *pzip = NULL;
   mz_uint num_alignment_padding_bytes, level;
   mz_zip_archive_file_stat stats;
   int err = 0;
+  mz_uint16 dos_time = 0, dos_date = 0;
+  mz_uint32 extra_size = 0;
+  mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE];
+  mz_uint64 local_dir_header_ofs = 0;
 
   if (!zip) {
     return ZIP_ENOINIT;
   }
 
+  local_dir_header_ofs = zip->archive.m_archive_size;
+
   if (!entryname) {
     return ZIP_EINVENTNAME;
   }
@@ -890,7 +1048,12 @@ int zip_entry_open(struct zip_t *zip, const char *entryname) {
   if (zip->entry.name) {
     CLEANUP(zip->entry.name);
   }
+#ifdef ZIP_RAW_ENTRYNAME
+  zip->entry.name = STRCLONE(entryname);
+#else
   zip->entry.name = zip_strrpl(entryname, entrylen, '\\', '/');
+#endif
+
   if (!zip->entry.name) {
     // Cannot parse zip entry name
     return ZIP_EINVENTNAME;
@@ -898,9 +1061,10 @@ int zip_entry_open(struct zip_t *zip, const char *entryname) {
 
   pzip = &(zip->archive);
   if (pzip->m_zip_mode == MZ_ZIP_MODE_READING) {
-    zip->entry.index =
-        mz_zip_reader_locate_file(pzip, zip->entry.name, NULL, 0);
-    if (zip->entry.index < 0) {
+    zip->entry.index = (ssize_t)mz_zip_reader_locate_file(
+        pzip, zip->entry.name, NULL,
+        case_sensitive ? MZ_ZIP_FLAG_CASE_SENSITIVE : 0);
+    if (zip->entry.index < (ssize_t)0) {
       err = ZIP_ENOENT;
       goto cleanup;
     }
@@ -913,7 +1077,7 @@ int zip_entry_open(struct zip_t *zip, const char *entryname) {
     zip->entry.comp_size = stats.m_comp_size;
     zip->entry.uncomp_size = stats.m_uncomp_size;
     zip->entry.uncomp_crc32 = stats.m_crc32;
-    zip->entry.offset = stats.m_central_dir_ofs;
+    zip->entry.dir_offset = stats.m_central_dir_ofs;
     zip->entry.header_offset = stats.m_local_header_ofs;
     zip->entry.method = stats.m_method;
     zip->entry.external_attr = stats.m_external_attr;
@@ -924,18 +1088,20 @@ int zip_entry_open(struct zip_t *zip, const char *entryname) {
     return 0;
   }
 
-  zip->entry.index = (int)zip->archive.m_total_files;
+  level = zip->level & 0xF;
+
+  zip->entry.index = (ssize_t)zip->archive.m_total_files;
   zip->entry.comp_size = 0;
   zip->entry.uncomp_size = 0;
   zip->entry.uncomp_crc32 = MZ_CRC32_INIT;
-  zip->entry.offset = zip->archive.m_archive_size;
+  zip->entry.dir_offset = zip->archive.m_archive_size;
   zip->entry.header_offset = zip->archive.m_archive_size;
   memset(zip->entry.header, 0, MZ_ZIP_LOCAL_DIR_HEADER_SIZE * sizeof(mz_uint8));
-  zip->entry.method = 0;
+  zip->entry.method = level ? MZ_DEFLATED : 0;
 
   // UNIX or APPLE
 #if MZ_PLATFORM == 3 || MZ_PLATFORM == 19
-  // regular file with rw-r--r-- persmissions
+  // regular file with rw-r--r-- permissions
   zip->entry.external_attr = (mz_uint32)(0100644) << 16;
 #else
   zip->entry.external_attr = 0;
@@ -954,42 +1120,75 @@ int zip_entry_open(struct zip_t *zip, const char *entryname) {
     err = ZIP_EINVLVL;
     goto cleanup;
   }
-  // no zip64 support yet
-  if ((pzip->m_total_files == 0xFFFF) ||
-      ((pzip->m_archive_size + num_alignment_padding_bytes +
-        MZ_ZIP_LOCAL_DIR_HEADER_SIZE + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE +
-        entrylen) > 0xFFFFFFFF)) {
-    // No zip64 support yet
-    err = ZIP_ENOSUP64;
-    goto cleanup;
-  }
-  if (!mz_zip_writer_write_zeros(pzip, zip->entry.offset,
-                                 num_alignment_padding_bytes +
-                                     sizeof(zip->entry.header))) {
+
+  if (!mz_zip_writer_write_zeros(pzip, zip->entry.dir_offset,
+                                 num_alignment_padding_bytes)) {
     // Cannot memset zip entry header
     err = ZIP_EMEMSET;
     goto cleanup;
   }
+  local_dir_header_ofs += num_alignment_padding_bytes;
+
+  zip->entry.m_time = time(NULL);
+#ifndef MINIZ_NO_TIME
+  mz_zip_time_t_to_dos_time(zip->entry.m_time, &dos_time, &dos_date);
+#endif
+
+  // ZIP64 header with NULL sizes (sizes will be in the data descriptor, just
+  // after file data)
+  extra_size = mz_zip_writer_create_zip64_extra_data(
+      extra_data, NULL, NULL,
+      (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
+
+  if (!mz_zip_writer_create_local_dir_header(
+          pzip, zip->entry.header, (mz_uint16) entrylen, (mz_uint16)extra_size, 0, 0, 0,
+          zip->entry.method,
+          MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8 |
+              MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR,
+          dos_time, dos_date)) {
+    // Cannot create zip entry header
+    err = ZIP_EMEMSET;
+    goto cleanup;
+  }
+
+  zip->entry.header_offset =
+      zip->entry.dir_offset + num_alignment_padding_bytes;
+
+  if (pzip->m_pWrite(pzip->m_pIO_opaque, zip->entry.header_offset,
+                     zip->entry.header,
+                     sizeof(zip->entry.header)) != sizeof(zip->entry.header)) {
+    // Cannot write zip entry header
+    err = ZIP_EMEMSET;
+    goto cleanup;
+  }
 
-  zip->entry.header_offset += num_alignment_padding_bytes;
   if (pzip->m_file_offset_alignment) {
     MZ_ASSERT(
         (zip->entry.header_offset & (pzip->m_file_offset_alignment - 1)) == 0);
   }
-  zip->entry.offset += num_alignment_padding_bytes + sizeof(zip->entry.header);
+  zip->entry.dir_offset +=
+      num_alignment_padding_bytes + sizeof(zip->entry.header);
 
-  if (pzip->m_pWrite(pzip->m_pIO_opaque, zip->entry.offset, zip->entry.name,
+  if (pzip->m_pWrite(pzip->m_pIO_opaque, zip->entry.dir_offset, zip->entry.name,
                      entrylen) != entrylen) {
     // Cannot write data to zip entry
     err = ZIP_EWRTENT;
     goto cleanup;
   }
 
-  zip->entry.offset += entrylen;
-  level = zip->level & 0xF;
+  zip->entry.dir_offset += entrylen;
+
+  if (pzip->m_pWrite(pzip->m_pIO_opaque, zip->entry.dir_offset, extra_data,
+                     extra_size) != extra_size) {
+    // Cannot write ZIP64 data to zip entry
+    err = ZIP_EWRTENT;
+    goto cleanup;
+  }
+  zip->entry.dir_offset += extra_size;
+
   if (level) {
     zip->entry.state.m_pZip = pzip;
-    zip->entry.state.m_cur_archive_file_ofs = zip->entry.offset;
+    zip->entry.state.m_cur_archive_file_ofs = zip->entry.dir_offset;
     zip->entry.state.m_comp_size = 0;
 
     if (tdefl_init(&(zip->entry.comp), mz_zip_writer_add_put_buf_callback,
@@ -1003,8 +1202,6 @@ int zip_entry_open(struct zip_t *zip, const char *entryname) {
     }
   }
 
-  zip->entry.m_time = time(NULL);
-
   return 0;
 
 cleanup:
@@ -1012,7 +1209,15 @@ cleanup:
   return err;
 }
 
-int zip_entry_openbyindex(struct zip_t *zip, int index) {
+int zip_entry_open(struct zip_t *zip, const char *entryname) {
+  return _zip_entry_open(zip, entryname, 0);
+}
+
+int zip_entry_opencasesensitive(struct zip_t *zip, const char *entryname) {
+  return _zip_entry_open(zip, entryname, 1);
+}
+
+int zip_entry_openbyindex(struct zip_t *zip, size_t index) {
   mz_zip_archive *pZip = NULL;
   mz_zip_archive_file_stat stats;
   mz_uint namelen;
@@ -1030,17 +1235,19 @@ int zip_entry_openbyindex(struct zip_t *zip, int index) {
     return ZIP_EINVMODE;
   }
 
-  if (index < 0 || (mz_uint)index >= pZip->m_total_files) {
+  if (index >= (size_t)pZip->m_total_files) {
     // index out of range
     return ZIP_EINVIDX;
   }
+
   if (!(pHeader = &MZ_ZIP_ARRAY_ELEMENT(
             &pZip->m_pState->m_central_dir, mz_uint8,
             MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets,
-                                 mz_uint32, index)))) {
+                                 mz_uint32, (mz_uint)index)))) {
     // cannot find header in central directory
     return ZIP_ENOHDR;
   }
+
   namelen = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_FILENAME_LEN_OFS);
   pFilename = (const char *)pHeader + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
 
@@ -1058,7 +1265,12 @@ int zip_entry_openbyindex(struct zip_t *zip, int index) {
   if (zip->entry.name) {
     CLEANUP(zip->entry.name);
   }
+#ifdef ZIP_RAW_ENTRYNAME
+  zip->entry.name = STRCLONE(pFilename);
+#else
   zip->entry.name = zip_strrpl(pFilename, namelen, '\\', '/');
+#endif
+
   if (!zip->entry.name) {
     // local entry name is NULL
     return ZIP_EINVENTNAME;
@@ -1068,11 +1280,11 @@ int zip_entry_openbyindex(struct zip_t *zip, int index) {
     return ZIP_ENOENT;
   }
 
-  zip->entry.index = index;
+  zip->entry.index = (ssize_t)index;
   zip->entry.comp_size = stats.m_comp_size;
   zip->entry.uncomp_size = stats.m_uncomp_size;
   zip->entry.uncomp_crc32 = stats.m_crc32;
-  zip->entry.offset = stats.m_central_dir_ofs;
+  zip->entry.dir_offset = stats.m_central_dir_ofs;
   zip->entry.header_offset = stats.m_local_header_ofs;
   zip->entry.method = stats.m_method;
   zip->entry.external_attr = stats.m_external_attr;
@@ -1090,6 +1302,11 @@ int zip_entry_close(struct zip_t *zip) {
   mz_uint16 entrylen;
   mz_uint16 dos_time = 0, dos_date = 0;
   int err = 0;
+  mz_uint8 *pExtra_data = NULL;
+  mz_uint32 extra_size = 0;
+  mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE];
+  mz_uint8 local_dir_footer[MZ_ZIP_DATA_DESCRIPTER_SIZE64];
+  mz_uint32 local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE64;
 
   if (!zip) {
     // zip_t handler is not initialized
@@ -1111,50 +1328,59 @@ int zip_entry_close(struct zip_t *zip) {
       goto cleanup;
     }
     zip->entry.comp_size = zip->entry.state.m_comp_size;
-    zip->entry.offset = zip->entry.state.m_cur_archive_file_ofs;
+    zip->entry.dir_offset = zip->entry.state.m_cur_archive_file_ofs;
     zip->entry.method = MZ_DEFLATED;
   }
 
   entrylen = (mz_uint16)strlen(zip->entry.name);
-  if ((zip->entry.comp_size > 0xFFFFFFFF) || (zip->entry.offset > 0xFFFFFFFF)) {
-    // No zip64 support, yet
-    err = ZIP_ENOSUP64;
-    goto cleanup;
-  }
-
 #ifndef MINIZ_NO_TIME
   mz_zip_time_t_to_dos_time(zip->entry.m_time, &dos_time, &dos_date);
 #endif
 
-  if (!mz_zip_writer_create_local_dir_header(
-          pzip, zip->entry.header, entrylen, 0, zip->entry.uncomp_size,
-          zip->entry.comp_size, zip->entry.uncomp_crc32, zip->entry.method, 0,
-          dos_time, dos_date)) {
-    // Cannot create zip entry header
-    err = ZIP_ECRTHDR;
-    goto cleanup;
-  }
+  MZ_WRITE_LE32(local_dir_footer + 0, MZ_ZIP_DATA_DESCRIPTOR_ID);
+  MZ_WRITE_LE32(local_dir_footer + 4, zip->entry.uncomp_crc32);
+  MZ_WRITE_LE64(local_dir_footer + 8, zip->entry.comp_size);
+  MZ_WRITE_LE64(local_dir_footer + 16, zip->entry.uncomp_size);
 
-  if (pzip->m_pWrite(pzip->m_pIO_opaque, zip->entry.header_offset,
-                     zip->entry.header,
-                     sizeof(zip->entry.header)) != sizeof(zip->entry.header)) {
+  if (pzip->m_pWrite(pzip->m_pIO_opaque, zip->entry.dir_offset,
+                     local_dir_footer,
+                     local_dir_footer_size) != local_dir_footer_size) {
     // Cannot write zip entry header
     err = ZIP_EWRTHDR;
     goto cleanup;
   }
+  zip->entry.dir_offset += local_dir_footer_size;
+
+  pExtra_data = extra_data;
+  extra_size = mz_zip_writer_create_zip64_extra_data(
+      extra_data,
+      (zip->entry.uncomp_size >= MZ_UINT32_MAX) ? &zip->entry.uncomp_size
+                                                : NULL,
+      (zip->entry.comp_size >= MZ_UINT32_MAX) ? &zip->entry.comp_size : NULL,
+      (zip->entry.header_offset >= MZ_UINT32_MAX) ? &zip->entry.header_offset
+                                                  : NULL);
+
+  if ((entrylen) && (zip->entry.name[entrylen - 1] == '/') &&
+      !zip->entry.uncomp_size) {
+    /* Set DOS Subdirectory attribute bit. */
+    zip->entry.external_attr |= MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG;
+  }
 
   if (!mz_zip_writer_add_to_central_dir(
-          pzip, zip->entry.name, entrylen, NULL, 0, "", 0,
-          zip->entry.uncomp_size, zip->entry.comp_size, zip->entry.uncomp_crc32,
-          zip->entry.method, 0, dos_time, dos_date, zip->entry.header_offset,
-          zip->entry.external_attr)) {
+          pzip, zip->entry.name, entrylen, pExtra_data, (mz_uint16)extra_size,
+          "", 0, zip->entry.uncomp_size, zip->entry.comp_size,
+          zip->entry.uncomp_crc32, zip->entry.method,
+          MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8 |
+              MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR,
+          dos_time, dos_date, zip->entry.header_offset,
+          zip->entry.external_attr, NULL, 0)) {
     // Cannot write to zip central dir
     err = ZIP_EWRTDIR;
     goto cleanup;
   }
 
   pzip->m_total_files++;
-  pzip->m_archive_size = zip->entry.offset;
+  pzip->m_archive_size = zip->entry.dir_offset;
 
 cleanup:
   if (zip) {
@@ -1173,10 +1399,10 @@ const char *zip_entry_name(struct zip_t *zip) {
   return zip->entry.name;
 }
 
-int zip_entry_index(struct zip_t *zip) {
+ssize_t zip_entry_index(struct zip_t *zip) {
   if (!zip) {
     // zip_t handler is not initialized
-    return ZIP_ENOINIT;
+    return (ssize_t)ZIP_ENOINIT;
   }
 
   return zip->entry.index;
@@ -1188,7 +1414,7 @@ int zip_entry_isdir(struct zip_t *zip) {
     return ZIP_ENOINIT;
   }
 
-  if (zip->entry.index < 0) {
+  if (zip->entry.index < (ssize_t)0) {
     // zip entry is not opened
     return ZIP_EINVIDX;
   }
@@ -1198,13 +1424,29 @@ int zip_entry_isdir(struct zip_t *zip) {
 }
 
 unsigned long long zip_entry_size(struct zip_t *zip) {
+  return zip_entry_uncomp_size(zip);
+}
+
+unsigned long long zip_entry_uncomp_size(struct zip_t *zip) {
   return zip ? zip->entry.uncomp_size : 0;
 }
 
+unsigned long long zip_entry_comp_size(struct zip_t *zip) {
+  return zip ? zip->entry.comp_size : 0;
+}
+
 unsigned int zip_entry_crc32(struct zip_t *zip) {
   return zip ? zip->entry.uncomp_crc32 : 0;
 }
 
+unsigned long long zip_entry_dir_offset(struct zip_t *zip) {
+  return zip ? zip->entry.dir_offset : 0;
+}
+
+unsigned long long zip_entry_header_offset(struct zip_t *zip) {
+  return zip ? zip->entry.header_offset : 0;
+}
+
 int zip_entry_write(struct zip_t *zip, const void *buf, size_t bufsize) {
   mz_uint level;
   mz_zip_archive *pzip = NULL;
@@ -1223,12 +1465,12 @@ int zip_entry_write(struct zip_t *zip, const void *buf, size_t bufsize) {
 
     level = zip->level & 0xF;
     if (!level) {
-      if ((pzip->m_pWrite(pzip->m_pIO_opaque, zip->entry.offset, buf,
+      if ((pzip->m_pWrite(pzip->m_pIO_opaque, zip->entry.dir_offset, buf,
                           bufsize) != bufsize)) {
         // Cannot write buffer
         return ZIP_EWRTENT;
       }
-      zip->entry.offset += bufsize;
+      zip->entry.dir_offset += bufsize;
       zip->entry.comp_size += bufsize;
     } else {
       status = tdefl_compress_buffer(&(zip->entry.comp), buf, bufsize,
@@ -1246,9 +1488,10 @@ int zip_entry_write(struct zip_t *zip, const void *buf, size_t bufsize) {
 int zip_entry_fwrite(struct zip_t *zip, const char *filename) {
   int err = 0;
   size_t n = 0;
-  FILE *stream = NULL;
+  MZ_FILE *stream = NULL;
   mz_uint8 buf[MZ_ZIP_MAX_IO_BUF_SIZE];
   struct MZ_FILE_STAT_STRUCT file_stat;
+  mz_uint16 modes;
 
   if (!zip) {
     // zip_t handler is not initialized
@@ -1262,19 +1505,35 @@ int zip_entry_fwrite(struct zip_t *zip, const char *filename) {
     return ZIP_ENOENT;
   }
 
-  if ((file_stat.st_mode & 0200) == 0) {
-    // MS-DOS read-only attribute
-    zip->entry.external_attr |= 0x01;
+#if defined(_WIN32) || defined(__WIN32__) || defined(DJGPP)
+  (void)modes; // unused
+#else
+  /* Initialize with permission bits--which are not implementation-optional */
+  modes = file_stat.st_mode &
+          (S_IRWXU | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISVTX);
+  if (S_ISDIR(file_stat.st_mode))
+    modes |= UNX_IFDIR;
+  if (S_ISREG(file_stat.st_mode))
+    modes |= UNX_IFREG;
+  if (S_ISLNK(file_stat.st_mode))
+    modes |= UNX_IFLNK;
+  if (S_ISBLK(file_stat.st_mode))
+    modes |= UNX_IFBLK;
+  if (S_ISCHR(file_stat.st_mode))
+    modes |= UNX_IFCHR;
+  if (S_ISFIFO(file_stat.st_mode))
+    modes |= UNX_IFIFO;
+  if (S_ISSOCK(file_stat.st_mode))
+    modes |= UNX_IFSOCK;
+  zip->entry.external_attr = (modes << 16) | !(file_stat.st_mode & S_IWUSR);
+  if ((file_stat.st_mode & S_IFMT) == S_IFDIR) {
+    zip->entry.external_attr |= MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG;
   }
-  zip->entry.external_attr |= (mz_uint32)((file_stat.st_mode & 0xFFFF) << 16);
+#endif
+
   zip->entry.m_time = file_stat.st_mtime;
 
-#if defined(_MSC_VER)
-  if (fopen_s(&stream, filename, "rb"))
-#else
-  if (!(stream = fopen(filename, "rb")))
-#endif
-  {
+  if (!(stream = MZ_FOPEN(filename, "rb"))) {
     // Cannot open filename
     return ZIP_EOPNFILE;
   }
@@ -1298,26 +1557,27 @@ ssize_t zip_entry_read(struct zip_t *zip, void **buf, size_t *bufsize) {
 
   if (!zip) {
     // zip_t handler is not initialized
-    return ZIP_ENOINIT;
+    return (ssize_t)ZIP_ENOINIT;
   }
 
   pzip = &(zip->archive);
-  if (pzip->m_zip_mode != MZ_ZIP_MODE_READING || zip->entry.index < 0) {
+  if (pzip->m_zip_mode != MZ_ZIP_MODE_READING ||
+      zip->entry.index < (ssize_t)0) {
     // the entry is not found or we do not have read access
-    return ZIP_ENOENT;
+    return (ssize_t)ZIP_ENOENT;
   }
 
   idx = (mz_uint)zip->entry.index;
   if (mz_zip_reader_is_file_a_directory(pzip, idx)) {
     // the entry is a directory
-    return ZIP_EINVENTTYPE;
+    return (ssize_t)ZIP_EINVENTTYPE;
   }
 
   *buf = mz_zip_reader_extract_to_heap(pzip, idx, &size, 0);
   if (*buf && bufsize) {
     *bufsize = size;
   }
-  return size;
+  return (ssize_t)size;
 }
 
 ssize_t zip_entry_noallocread(struct zip_t *zip, void *buf, size_t bufsize) {
@@ -1325,18 +1585,19 @@ ssize_t zip_entry_noallocread(struct zip_t *zip, void *buf, size_t bufsize) {
 
   if (!zip) {
     // zip_t handler is not initialized
-    return ZIP_ENOINIT;
+    return (ssize_t)ZIP_ENOINIT;
   }
 
   pzip = &(zip->archive);
-  if (pzip->m_zip_mode != MZ_ZIP_MODE_READING || zip->entry.index < 0) {
+  if (pzip->m_zip_mode != MZ_ZIP_MODE_READING ||
+      zip->entry.index < (ssize_t)0) {
     // the entry is not found or we do not have read access
-    return ZIP_ENOENT;
+    return (ssize_t)ZIP_ENOENT;
   }
 
   if (!mz_zip_reader_extract_to_mem_no_alloc(pzip, (mz_uint)zip->entry.index,
                                              buf, bufsize, 0, NULL, 0)) {
-    return ZIP_EMEMNOALLOC;
+    return (ssize_t)ZIP_EMEMNOALLOC;
   }
 
   return (ssize_t)zip->entry.uncomp_size;
@@ -1355,7 +1616,8 @@ int zip_entry_fread(struct zip_t *zip, const char *filename) {
 
   memset((void *)&info, 0, sizeof(mz_zip_archive_file_stat));
   pzip = &(zip->archive);
-  if (pzip->m_zip_mode != MZ_ZIP_MODE_READING || zip->entry.index < 0) {
+  if (pzip->m_zip_mode != MZ_ZIP_MODE_READING ||
+      zip->entry.index < (ssize_t)0) {
     // the entry is not found or we do not have read access
     return ZIP_ENOENT;
   }
@@ -1370,7 +1632,7 @@ int zip_entry_fread(struct zip_t *zip, const char *filename) {
     return ZIP_ENOFILE;
   }
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(PS4)
   (void)xattr; // unused
 #else
   if (!mz_zip_reader_file_stat(pzip, idx, &info)) {
@@ -1379,8 +1641,8 @@ int zip_entry_fread(struct zip_t *zip, const char *filename) {
   }
 
   xattr = (info.m_external_attr >> 16) & 0xFFFF;
-  if (xattr > 0) {
-    if (chmod(filename, (mode_t)xattr) < 0) {
+  if (xattr > 0 && xattr <= MZ_UINT16_MAX) {
+    if (CHMOD(filename, (mode_t)xattr) < 0) {
       return ZIP_ENOPERM;
     }
   }
@@ -1390,7 +1652,7 @@ int zip_entry_fread(struct zip_t *zip, const char *filename) {
 }
 
 int zip_entry_extract(struct zip_t *zip,
-                      size_t (*on_extract)(void *arg, unsigned long long offset,
+                      size_t (*on_extract)(void *arg, uint64_t offset,
                                            const void *buf, size_t bufsize),
                       void *arg) {
   mz_zip_archive *pzip = NULL;
@@ -1402,7 +1664,8 @@ int zip_entry_extract(struct zip_t *zip,
   }
 
   pzip = &(zip->archive);
-  if (pzip->m_zip_mode != MZ_ZIP_MODE_READING || zip->entry.index < 0) {
+  if (pzip->m_zip_mode != MZ_ZIP_MODE_READING ||
+      zip->entry.index < (ssize_t)0) {
     // the entry is not found or we do not have read access
     return ZIP_ENOENT;
   }
@@ -1413,19 +1676,19 @@ int zip_entry_extract(struct zip_t *zip,
              : ZIP_EINVIDX;
 }
 
-int zip_entries_total(struct zip_t *zip) {
+ssize_t zip_entries_total(struct zip_t *zip) {
   if (!zip) {
     // zip_t handler is not initialized
     return ZIP_ENOINIT;
   }
 
-  return (int)zip->archive.m_total_files;
+  return (ssize_t)zip->archive.m_total_files;
 }
 
-int zip_entries_delete(struct zip_t *zip, char *const entries[],
-                       const size_t len) {
-  int n = 0;
-  int err = 0;
+ssize_t zip_entries_delete(struct zip_t *zip, char *const entries[],
+                           size_t len) {
+  ssize_t n = 0;
+  ssize_t err = 0;
   struct zip_entry_mark_t *entry_mark = NULL;
 
   if (zip == NULL || (entries == NULL && len != 0)) {
@@ -1438,8 +1701,8 @@ int zip_entries_delete(struct zip_t *zip, char *const entries[],
 
   n = zip_entries_total(zip);
 
-  entry_mark =
-      (struct zip_entry_mark_t *)calloc(n, sizeof(struct zip_entry_mark_t));
+  entry_mark = (struct zip_entry_mark_t *)calloc(
+      (size_t)n, sizeof(struct zip_entry_mark_t));
   if (!entry_mark) {
     return ZIP_EOOMEM;
   }
@@ -1452,7 +1715,42 @@ int zip_entries_delete(struct zip_t *zip, char *const entries[],
     return err;
   }
 
-  err = zip_entries_delete_mark(zip, entry_mark, n);
+  err = zip_entries_delete_mark(zip, entry_mark, (int)n);
+  CLEANUP(entry_mark);
+  return err;
+}
+
+ssize_t zip_entries_deletebyindex(struct zip_t *zip, size_t entries[],
+                                  size_t len) {
+  ssize_t n = 0;
+  ssize_t err = 0;
+  struct zip_entry_mark_t *entry_mark = NULL;
+
+  if (zip == NULL || (entries == NULL && len != 0)) {
+    return ZIP_ENOINIT;
+  }
+
+  if (entries == NULL && len == 0) {
+    return 0;
+  }
+
+  n = zip_entries_total(zip);
+
+  entry_mark = (struct zip_entry_mark_t *)calloc(
+      (size_t)n, sizeof(struct zip_entry_mark_t));
+  if (!entry_mark) {
+    return ZIP_EOOMEM;
+  }
+
+  zip->archive.m_zip_mode = MZ_ZIP_MODE_READING;
+
+  err = zip_entry_setbyindex(zip, entry_mark, n, entries, len);
+  if (err < 0) {
+    CLEANUP(entry_mark);
+    return err;
+  }
+
+  err = zip_entries_delete_mark(zip, entry_mark, (int)n);
   CLEANUP(entry_mark);
   return err;
 }
@@ -1479,8 +1777,16 @@ int zip_stream_extract(const char *stream, size_t size, const char *dir,
 
 struct zip_t *zip_stream_open(const char *stream, size_t size, int level,
                               char mode) {
+  int errnum = 0;
+  return zip_stream_openwitherror(stream, size, level, mode, &errnum);
+}
+
+struct zip_t *zip_stream_openwitherror(const char *stream, size_t size,
+                                       int level, char mode, int *errnum) {
   struct zip_t *zip = (struct zip_t *)calloc((size_t)1, sizeof(struct zip_t));
   if (!zip) {
+    // out of memory
+    *errnum = ZIP_EOOMEM;
     return NULL;
   }
 
@@ -1489,23 +1795,29 @@ struct zip_t *zip_stream_open(const char *stream, size_t size, int level,
   }
   if ((level & 0xF) > MZ_UBER_COMPRESSION) {
     // Wrong compression level
+    *errnum = ZIP_EINVLVL;
     goto cleanup;
   }
   zip->level = (mz_uint)level;
 
   if ((stream != NULL) && (size > 0) && (mode == 'r')) {
     if (!mz_zip_reader_init_mem(&(zip->archive), stream, size, 0)) {
+      *errnum = ZIP_ERINIT;
       goto cleanup;
     }
   } else if ((stream == NULL) && (size == 0) && (mode == 'w')) {
     // Create a new archive.
     if (!mz_zip_writer_init_heap(&(zip->archive), 0, 1024)) {
       // Cannot initialize zip_archive writer
+      *errnum = ZIP_EWINIT;
       goto cleanup;
     }
   } else {
+    *errnum = ZIP_EINVMODE;
     goto cleanup;
   }
+
+  *errnum = 0;
   return zip;
 
 cleanup:
@@ -1513,20 +1825,23 @@ cleanup:
   return NULL;
 }
 
-ssize_t zip_stream_copy(struct zip_t *zip, void **buf, ssize_t *bufsize) {
-  if (!zip) {
-    return ZIP_ENOINIT;
-  }
+ssize_t zip_stream_copy(struct zip_t *zip, void **buf, size_t *bufsize) {
+  size_t n;
 
+  if (!zip) {
+    return (ssize_t)ZIP_ENOINIT;
+  }
   zip_archive_finalize(&(zip->archive));
 
+  n = (size_t)zip->archive.m_archive_size;
   if (bufsize != NULL) {
-    *bufsize = zip->archive.m_archive_size;
+    *bufsize = n;
   }
-  *buf = calloc(sizeof(unsigned char), zip->archive.m_archive_size);
-  memcpy(*buf, zip->archive.m_pState->m_pMem, zip->archive.m_archive_size);
 
-  return zip->archive.m_archive_size;
+  *buf = calloc(sizeof(unsigned char), n);
+  memcpy(*buf, zip->archive.m_pState->m_pMem, n);
+
+  return (ssize_t)n;
 }
 
 void zip_stream_close(struct zip_t *zip) {
@@ -1543,6 +1858,7 @@ int zip_create(const char *zipname, const char *filenames[], size_t len) {
   mz_zip_archive zip_archive;
   struct MZ_FILE_STAT_STRUCT file_stat;
   mz_uint32 ext_attributes = 0;
+  mz_uint16 modes;
 
   if (!zipname || strlen(zipname) < 1) {
     // zip_t archive name is empty or NULL
@@ -1577,11 +1893,32 @@ int zip_create(const char *zipname, const char *filenames[], size_t len) {
       break;
     }
 
-    if ((file_stat.st_mode & 0200) == 0) {
-      // MS-DOS read-only attribute
-      ext_attributes |= 0x01;
+#if defined(_WIN32) || defined(__WIN32__) || defined(DJGPP)
+    (void)modes; // unused
+#else
+
+    /* Initialize with permission bits--which are not implementation-optional */
+    modes = file_stat.st_mode &
+            (S_IRWXU | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISVTX);
+    if (S_ISDIR(file_stat.st_mode))
+      modes |= UNX_IFDIR;
+    if (S_ISREG(file_stat.st_mode))
+      modes |= UNX_IFREG;
+    if (S_ISLNK(file_stat.st_mode))
+      modes |= UNX_IFLNK;
+    if (S_ISBLK(file_stat.st_mode))
+      modes |= UNX_IFBLK;
+    if (S_ISCHR(file_stat.st_mode))
+      modes |= UNX_IFCHR;
+    if (S_ISFIFO(file_stat.st_mode))
+      modes |= UNX_IFIFO;
+    if (S_ISSOCK(file_stat.st_mode))
+      modes |= UNX_IFSOCK;
+    ext_attributes = (modes << 16) | !(file_stat.st_mode & S_IWUSR);
+    if ((file_stat.st_mode & S_IFMT) == S_IFDIR) {
+      ext_attributes |= MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG;
     }
-    ext_attributes |= (mz_uint32)((file_stat.st_mode & 0xFFFF) << 16);
+#endif
 
     if (!mz_zip_writer_add_file(&zip_archive, zip_basename(name), name, "", 0,
                                 ZIP_DEFAULT_COMPRESSION_LEVEL,
diff --git a/contrib/zip/src/zip.h b/contrib/zip/src/zip.h
index 5c47f1f1f..324904ca6 100644
--- a/contrib/zip/src/zip.h
+++ b/contrib/zip/src/zip.h
@@ -12,9 +12,24 @@
 #ifndef ZIP_H
 #define ZIP_H
 
+#include <stdint.h>
 #include <string.h>
 #include <sys/types.h>
 
+#ifndef ZIP_SHARED
+#define ZIP_EXPORT
+#else
+#ifdef _WIN32
+#ifdef ZIP_BUILD_SHARED
+#define ZIP_EXPORT __declspec(dllexport)
+#else
+#define ZIP_EXPORT __declspec(dllimport)
+#endif
+#else
+#define ZIP_EXPORT __attribute__((visibility("default")))
+#endif
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -29,14 +44,10 @@ typedef long ssize_t; /* byte count or error */
 #endif
 #endif
 
-#ifndef MAX_PATH
-#define MAX_PATH 32767 /* # chars in a path name including NULL */
-#endif
-
 /**
  * @mainpage
  *
- * Documenation for @ref zip.
+ * Documentation for @ref zip.
  */
 
 /**
@@ -81,6 +92,9 @@ typedef long ssize_t; /* byte count or error */
 #define ZIP_EFSEEK -27      // fseek error
 #define ZIP_EFREAD -28      // fread error
 #define ZIP_EFWRITE -29     // fwrite error
+#define ZIP_ERINIT -30      // cannot initialize reader
+#define ZIP_EWINIT -31      // cannot initialize writer
+#define ZIP_EWRINIT -32     // cannot initialize writer from reader
 
 /**
  * Looks up the error message string corresponding to an error number.
@@ -88,7 +102,7 @@ typedef long ssize_t; /* byte count or error */
  * @return error message string corresponding to errnum or NULL if error is not
  * found.
  */
-extern const char *zip_strerror(int errnum);
+extern ZIP_EXPORT const char *zip_strerror(int errnum);
 
 /**
  * @struct zip_t
@@ -110,14 +124,32 @@ struct zip_t;
  *
  * @return the zip archive handler or NULL on error
  */
-extern struct zip_t *zip_open(const char *zipname, int level, char mode);
+extern ZIP_EXPORT struct zip_t *zip_open(const char *zipname, int level,
+                                         char mode);
+
+/**
+ * Opens zip archive with compression level using the given mode.
+ * The function additionally returns @param errnum -
+ *
+ * @param zipname zip archive file name.
+ * @param level compression level (0-9 are the standard zlib-style levels).
+ * @param mode file access mode.
+ *        - 'r': opens a file for reading/extracting (the file must exists).
+ *        - 'w': creates an empty file for writing.
+ *        - 'a': appends to an existing archive.
+ * @param errnum 0 on success, negative number (< 0) on error.
+ *
+ * @return the zip archive handler or NULL on error
+ */
+extern ZIP_EXPORT struct zip_t *
+zip_openwitherror(const char *zipname, int level, char mode, int *errnum);
 
 /**
  * Closes the zip archive, releases resources - always finalize.
  *
  * @param zip zip archive handler.
  */
-extern void zip_close(struct zip_t *zip);
+extern ZIP_EXPORT void zip_close(struct zip_t *zip);
 
 /**
  * Determines if the archive has a zip64 end of central directory headers.
@@ -127,7 +159,7 @@ extern void zip_close(struct zip_t *zip);
  * @return the return code - 1 (true), 0 (false), negative number (< 0) on
  *         error.
  */
-extern int zip_is64(struct zip_t *zip);
+extern ZIP_EXPORT int zip_is64(struct zip_t *zip);
 
 /**
  * Opens an entry by name in the zip archive.
@@ -141,7 +173,22 @@ extern int zip_is64(struct zip_t *zip);
  *
  * @return the return code - 0 on success, negative number (< 0) on error.
  */
-extern int zip_entry_open(struct zip_t *zip, const char *entryname);
+extern ZIP_EXPORT int zip_entry_open(struct zip_t *zip, const char *entryname);
+
+/**
+ * Opens an entry by name in the zip archive.
+ *
+ * For zip archive opened in 'w' or 'a' mode the function will append
+ * a new entry. In readonly mode the function tries to locate the entry
+ * in global dictionary (case sensitive).
+ *
+ * @param zip zip archive handler.
+ * @param entryname an entry name in local dictionary (case sensitive).
+ *
+ * @return the return code - 0 on success, negative number (< 0) on error.
+ */
+extern ZIP_EXPORT int zip_entry_opencasesensitive(struct zip_t *zip,
+                                                  const char *entryname);
 
 /**
  * Opens a new entry by index in the zip archive.
@@ -153,7 +200,7 @@ extern int zip_entry_open(struct zip_t *zip, const char *entryname);
  *
  * @return the return code - 0 on success, negative number (< 0) on error.
  */
-extern int zip_entry_openbyindex(struct zip_t *zip, int index);
+extern ZIP_EXPORT int zip_entry_openbyindex(struct zip_t *zip, size_t index);
 
 /**
  * Closes a zip entry, flushes buffer and releases resources.
@@ -162,7 +209,7 @@ extern int zip_entry_openbyindex(struct zip_t *zip, int index);
  *
  * @return the return code - 0 on success, negative number (< 0) on error.
  */
-extern int zip_entry_close(struct zip_t *zip);
+extern ZIP_EXPORT int zip_entry_close(struct zip_t *zip);
 
 /**
  * Returns a local name of the current zip entry.
@@ -178,7 +225,7 @@ extern int zip_entry_close(struct zip_t *zip);
  *
  * @return the pointer to the current zip entry name, or NULL on error.
  */
-extern const char *zip_entry_name(struct zip_t *zip);
+extern ZIP_EXPORT const char *zip_entry_name(struct zip_t *zip);
 
 /**
  * Returns an index of the current zip entry.
@@ -187,7 +234,7 @@ extern const char *zip_entry_name(struct zip_t *zip);
  *
  * @return the index on success, negative number (< 0) on error.
  */
-extern int zip_entry_index(struct zip_t *zip);
+extern ZIP_EXPORT ssize_t zip_entry_index(struct zip_t *zip);
 
 /**
  * Determines if the current zip entry is a directory entry.
@@ -197,16 +244,35 @@ extern int zip_entry_index(struct zip_t *zip);
  * @return the return code - 1 (true), 0 (false), negative number (< 0) on
  *         error.
  */
-extern int zip_entry_isdir(struct zip_t *zip);
+extern ZIP_EXPORT int zip_entry_isdir(struct zip_t *zip);
 
 /**
- * Returns an uncompressed size of the current zip entry.
+ * Returns the uncompressed size of the current zip entry.
+ * Alias for zip_entry_uncomp_size (for backward compatibility).
  *
  * @param zip zip archive handler.
  *
  * @return the uncompressed size in bytes.
  */
-extern unsigned long long zip_entry_size(struct zip_t *zip);
+extern ZIP_EXPORT unsigned long long zip_entry_size(struct zip_t *zip);
+
+/**
+ * Returns the uncompressed size of the current zip entry.
+ *
+ * @param zip zip archive handler.
+ *
+ * @return the uncompressed size in bytes.
+ */
+extern ZIP_EXPORT unsigned long long zip_entry_uncomp_size(struct zip_t *zip);
+
+/**
+ * Returns the compressed size of the current zip entry.
+ *
+ * @param zip zip archive handler.
+ *
+ * @return the compressed size in bytes.
+ */
+extern ZIP_EXPORT unsigned long long zip_entry_comp_size(struct zip_t *zip);
 
 /**
  * Returns CRC-32 checksum of the current zip entry.
@@ -215,7 +281,26 @@ extern unsigned long long zip_entry_size(struct zip_t *zip);
  *
  * @return the CRC-32 checksum.
  */
-extern unsigned int zip_entry_crc32(struct zip_t *zip);
+extern ZIP_EXPORT unsigned int zip_entry_crc32(struct zip_t *zip);
+
+/**
+ * Returns byte offset of the current zip entry
+ * in the archive's central directory.
+ *
+ * @param zip zip archive handler.
+ *
+ * @return the offset in bytes.
+ */
+extern ZIP_EXPORT unsigned long long zip_entry_dir_offset(struct zip_t *zip);
+
+/**
+ * Returns the current zip entry's local header file offset in bytes.
+ *
+ * @param zip zip archive handler.
+ *
+ * @return the entry's local header file offset in bytes.
+ */
+extern ZIP_EXPORT unsigned long long zip_entry_header_offset(struct zip_t *zip);
 
 /**
  * Compresses an input buffer for the current zip entry.
@@ -226,7 +311,8 @@ extern unsigned int zip_entry_crc32(struct zip_t *zip);
  *
  * @return the return code - 0 on success, negative number (< 0) on error.
  */
-extern int zip_entry_write(struct zip_t *zip, const void *buf, size_t bufsize);
+extern ZIP_EXPORT int zip_entry_write(struct zip_t *zip, const void *buf,
+                                      size_t bufsize);
 
 /**
  * Compresses a file for the current zip entry.
@@ -236,7 +322,7 @@ extern int zip_entry_write(struct zip_t *zip, const void *buf, size_t bufsize);
  *
  * @return the return code - 0 on success, negative number (< 0) on error.
  */
-extern int zip_entry_fwrite(struct zip_t *zip, const char *filename);
+extern ZIP_EXPORT int zip_entry_fwrite(struct zip_t *zip, const char *filename);
 
 /**
  * Extracts the current zip entry into output buffer.
@@ -251,9 +337,10 @@ extern int zip_entry_fwrite(struct zip_t *zip, const char *filename);
  *       for large entries, please take a look at zip_entry_extract function.
  *
  * @return the return code - the number of bytes actually read on success.
- *         Otherwise a -1 on error.
+ *         Otherwise a negative number (< 0) on error.
  */
-extern ssize_t zip_entry_read(struct zip_t *zip, void **buf, size_t *bufsize);
+extern ZIP_EXPORT ssize_t zip_entry_read(struct zip_t *zip, void **buf,
+                                         size_t *bufsize);
 
 /**
  * Extracts the current zip entry into a memory buffer using no memory
@@ -269,10 +356,11 @@ extern ssize_t zip_entry_read(struct zip_t *zip, void **buf, size_t *bufsize);
  *       For large entries, please take a look at zip_entry_extract function.
  *
  * @return the return code - the number of bytes actually read on success.
- *         Otherwise a -1 on error (e.g. bufsize is not large enough).
+ *         Otherwise a negative number (< 0) on error (e.g. bufsize is not large
+ * enough).
  */
-extern ssize_t zip_entry_noallocread(struct zip_t *zip, void *buf,
-                                     size_t bufsize);
+extern ZIP_EXPORT ssize_t zip_entry_noallocread(struct zip_t *zip, void *buf,
+                                                size_t bufsize);
 
 /**
  * Extracts the current zip entry into output file.
@@ -282,7 +370,7 @@ extern ssize_t zip_entry_noallocread(struct zip_t *zip, void *buf,
  *
  * @return the return code - 0 on success, negative number (< 0) on error.
  */
-extern int zip_entry_fread(struct zip_t *zip, const char *filename);
+extern ZIP_EXPORT int zip_entry_fread(struct zip_t *zip, const char *filename);
 
 /**
  * Extracts the current zip entry using a callback function (on_extract).
@@ -294,9 +382,9 @@ extern int zip_entry_fread(struct zip_t *zip, const char *filename);
  *
  * @return the return code - 0 on success, negative number (< 0) on error.
  */
-extern int
+extern ZIP_EXPORT int
 zip_entry_extract(struct zip_t *zip,
-                  size_t (*on_extract)(void *arg, unsigned long long offset,
+                  size_t (*on_extract)(void *arg, uint64_t offset,
                                        const void *data, size_t size),
                   void *arg);
 
@@ -308,7 +396,7 @@ zip_entry_extract(struct zip_t *zip,
  * @return the return code - the number of entries on success, negative number
  *         (< 0) on error.
  */
-extern int zip_entries_total(struct zip_t *zip);
+extern ZIP_EXPORT ssize_t zip_entries_total(struct zip_t *zip);
 
 /**
  * Deletes zip archive entries.
@@ -318,8 +406,20 @@ extern int zip_entries_total(struct zip_t *zip);
  * @param len the number of entries to be deleted.
  * @return the number of deleted entries, or negative number (< 0) on error.
  */
-extern int zip_entries_delete(struct zip_t *zip, char *const entries[],
-                              size_t len);
+extern ZIP_EXPORT ssize_t zip_entries_delete(struct zip_t *zip,
+                                             char *const entries[], size_t len);
+
+/**
+ * Deletes zip archive entries.
+ *
+ * @param zip zip archive handler.
+ * @param entries array of zip archive entries indices to be deleted.
+ * @param len the number of entries to be deleted.
+ * @return the number of deleted entries, or negative number (< 0) on error.
+ */
+extern ZIP_EXPORT ssize_t zip_entries_deletebyindex(struct zip_t *zip,
+                                                    size_t entries[],
+                                                    size_t len);
 
 /**
  * Extracts a zip archive stream into directory.
@@ -338,21 +438,46 @@ extern int zip_entries_delete(struct zip_t *zip, char *const entries[],
  *
  * @return the return code - 0 on success, negative number (< 0) on error.
  */
-extern int zip_stream_extract(const char *stream, size_t size, const char *dir,
-                              int (*on_extract)(const char *filename,
-                                                void *arg),
-                              void *arg);
+extern ZIP_EXPORT int
+zip_stream_extract(const char *stream, size_t size, const char *dir,
+                   int (*on_extract)(const char *filename, void *arg),
+                   void *arg);
 
 /**
  * Opens zip archive stream into memory.
  *
  * @param stream zip archive stream.
  * @param size stream size.
+ * @param level compression level (0-9 are the standard zlib-style levels).
+ * @param mode file access mode.
+ *        - 'r': opens a file for reading/extracting (the file must exists).
+ *        - 'w': creates an empty file for writing.
+ *        - 'a': appends to an existing archive.
  *
  * @return the zip archive handler or NULL on error
  */
-extern struct zip_t *zip_stream_open(const char *stream, size_t size, int level,
-                                     char mode);
+extern ZIP_EXPORT struct zip_t *zip_stream_open(const char *stream, size_t size,
+                                                int level, char mode);
+
+/**
+ * Opens zip archive stream into memory.
+ * The function additionally returns @param errnum -
+ *
+ * @param stream zip archive stream.
+ * @param size stream size.*
+ * @param level compression level (0-9 are the standard zlib-style levels).
+ * @param mode file access mode.
+ *        - 'r': opens a file for reading/extracting (the file must exists).
+ *        - 'w': creates an empty file for writing.
+ *        - 'a': appends to an existing archive.
+ * @param errnum 0 on success, negative number (< 0) on error.
+ *
+ * @return the zip archive handler or NULL on error
+ */
+extern ZIP_EXPORT struct zip_t *zip_stream_openwitherror(const char *stream,
+                                                         size_t size, int level,
+                                                         char mode,
+                                                         int *errnum);
 
 /**
  * Copy zip archive stream output buffer.
@@ -363,7 +488,8 @@ extern struct zip_t *zip_stream_open(const char *stream, size_t size, int level,
  *
  * @return copy size
  */
-extern ssize_t zip_stream_copy(struct zip_t *zip, void **buf, ssize_t *bufsize);
+extern ZIP_EXPORT ssize_t zip_stream_copy(struct zip_t *zip, void **buf,
+                                          size_t *bufsize);
 
 /**
  * Close zip archive releases resources.
@@ -372,7 +498,7 @@ extern ssize_t zip_stream_copy(struct zip_t *zip, void **buf, ssize_t *bufsize);
  *
  * @return
  */
-extern void zip_stream_close(struct zip_t *zip);
+extern ZIP_EXPORT void zip_stream_close(struct zip_t *zip);
 
 /**
  * Creates a new archive and puts files into a single zip archive.
@@ -383,7 +509,8 @@ extern void zip_stream_close(struct zip_t *zip);
  *
  * @return the return code - 0 on success, negative number (< 0) on error.
  */
-extern int zip_create(const char *zipname, const char *filenames[], size_t len);
+extern ZIP_EXPORT int zip_create(const char *zipname, const char *filenames[],
+                                 size_t len);
 
 /**
  * Extracts a zip archive file into directory.
@@ -401,10 +528,10 @@ extern int zip_create(const char *zipname, const char *filenames[], size_t len);
  *
  * @return the return code - 0 on success, negative number (< 0) on error.
  */
-extern int zip_extract(const char *zipname, const char *dir,
-                       int (*on_extract_entry)(const char *filename, void *arg),
-                       void *arg);
-
+extern ZIP_EXPORT int zip_extract(const char *zipname, const char *dir,
+                                  int (*on_extract_entry)(const char *filename,
+                                                          void *arg),
+                                  void *arg);
 /** @} */
 #ifdef __cplusplus
 }
diff --git a/contrib/zip/test/CMakeLists.txt b/contrib/zip/test/CMakeLists.txt
index 0da1684d4..3a8d7cab0 100644
--- a/contrib/zip/test/CMakeLists.txt
+++ b/contrib/zip/test/CMakeLists.txt
@@ -1,38 +1,46 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.14)
+
+find_package(Sanitizers)
 
 # tests
 set(test_write_out test_write.out)
 add_executable(${test_write_out} test_write.c)
 target_link_libraries(${test_write_out} zip)
 add_test(NAME ${test_write_out} COMMAND ${test_write_out})
-set(test_write_out ${test_write_out} PARENT_SCOPE)
+add_sanitizers(${test_write_out})
 
 set(test_append_out test_append.out)
 add_executable(${test_append_out} test_append.c)
 target_link_libraries(${test_append_out} zip)
 add_test(NAME ${test_append_out} COMMAND ${test_append_out})
-set(test_append_out ${test_append_out} PARENT_SCOPE)
+add_sanitizers(${test_append_out})
 
 set(test_read_out test_read.out)
 add_executable(${test_read_out} test_read.c)
 target_link_libraries(${test_read_out} zip)
 add_test(NAME ${test_read_out} COMMAND ${test_read_out})
-set(test_read_out ${test_read_out} PARENT_SCOPE)
+add_sanitizers(${test_read_out})
 
 set(test_extract_out test_extract.out)
 add_executable(${test_extract_out} test_extract.c)
 target_link_libraries(${test_extract_out} zip)
 add_test(NAME ${test_extract_out} COMMAND ${test_extract_out})
-set(test_extract_out ${test_extract_out} PARENT_SCOPE)
+add_sanitizers(${test_extract_out})
 
 set(test_entry_out test_entry.out)
 add_executable(${test_entry_out} test_entry.c)
 target_link_libraries(${test_entry_out} zip)
 add_test(NAME ${test_entry_out} COMMAND ${test_entry_out})
-set(test_entry_out ${test_entry_out} PARENT_SCOPE)
+add_sanitizers(${test_entry_out})
 
 set(test_permissions_out test_permissions.out)
 add_executable(${test_permissions_out} test_permissions.c)
 target_link_libraries(${test_permissions_out} zip)
 add_test(NAME ${test_permissions_out} COMMAND ${test_permissions_out})
-set(test_permissions_out ${test_permissions_out} PARENT_SCOPE)
+add_sanitizers(${test_permissions_out})
+
+set(test_open_out test_open.out)
+add_executable(${test_open_out} test_open.c)
+target_link_libraries(${test_open_out} zip)
+add_test(NAME ${test_open_out} COMMAND ${test_open_out})
+add_sanitizers(${test_open_out})
diff --git a/contrib/zip/test/minunit.h b/contrib/zip/test/minunit.h
new file mode 100644
index 000000000..341a6e833
--- /dev/null
+++ b/contrib/zip/test/minunit.h
@@ -0,0 +1,370 @@
+/*
+ * Copyright (c) 2012 David Siñuela Pastor, siu.4coders@gmail.com
+ *
+ * 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.
+ */
+#ifndef MINUNIT_MINUNIT_H
+#define MINUNIT_MINUNIT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(_WIN32)
+#include <Windows.h>
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#define snprintf _snprintf
+#define __func__ __FUNCTION__
+#endif
+
+#elif defined(__unix__) || defined(__unix) || defined(unix) ||                 \
+    (defined(__APPLE__) && defined(__MACH__))
+
+/* Change POSIX C SOURCE version for pure c99 compilers */
+#if !defined(_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 200112L
+#undef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200112L
+#endif
+
+#include <string.h>
+#include <sys/resource.h>
+#include <sys/time.h> /* gethrtime(), gettimeofday() */
+#include <sys/times.h>
+#include <time.h>   /* clock_gettime(), time() */
+#include <unistd.h> /* POSIX flags */
+
+#if defined(__MACH__) && defined(__APPLE__)
+#include <mach/mach.h>
+#include <mach/mach_time.h>
+#endif
+
+#if __GNUC__ >= 5 && !defined(__STDC_VERSION__)
+#define __func__ __extension__ __FUNCTION__
+#endif
+
+#else
+#error "Unable to define timers for an unknown OS."
+#endif
+
+#include <math.h>
+#include <stdio.h>
+
+/*  Maximum length of last message */
+#define MINUNIT_MESSAGE_LEN 1024
+/*  Accuracy with which floats are compared */
+#define MINUNIT_EPSILON 1E-12
+
+/*  Misc. counters */
+static int minunit_run = 0;
+static int minunit_assert = 0;
+static int minunit_fail = 0;
+static int minunit_status = 0;
+
+/*  Timers */
+static double minunit_real_timer = 0;
+static double minunit_proc_timer = 0;
+
+/*  Last message */
+static char minunit_last_message[MINUNIT_MESSAGE_LEN];
+
+/*  Test setup and teardown function pointers */
+static void (*minunit_setup)(void) = NULL;
+static void (*minunit_teardown)(void) = NULL;
+
+/*  Definitions */
+#define MU_TEST(method_name) static void method_name(void)
+#define MU_TEST_SUITE(suite_name) static void suite_name(void)
+
+#define MU__SAFE_BLOCK(block)                                                  \
+  do {                                                                         \
+    block                                                                      \
+  } while (0)
+
+/*  Run test suite and unset setup and teardown functions */
+#define MU_RUN_SUITE(suite_name)                                               \
+  MU__SAFE_BLOCK(suite_name(); minunit_setup = NULL; minunit_teardown = NULL;)
+
+/*  Configure setup and teardown functions */
+#define MU_SUITE_CONFIGURE(setup_fun, teardown_fun)                            \
+  MU__SAFE_BLOCK(minunit_setup = setup_fun; minunit_teardown = teardown_fun;)
+
+/*  Test runner */
+#define MU_RUN_TEST(test)                                                      \
+  MU__SAFE_BLOCK(                                                              \
+      if (minunit_real_timer == 0 && minunit_proc_timer == 0) {                \
+        minunit_real_timer = mu_timer_real();                                  \
+        minunit_proc_timer = mu_timer_cpu();                                   \
+      } if (minunit_setup) (*minunit_setup)();                                 \
+      minunit_status = 0; test(); minunit_run++; if (minunit_status) {         \
+        minunit_fail++;                                                        \
+        printf("F");                                                           \
+        printf("\n%s\n", minunit_last_message);                                \
+      } fflush(stdout);                                                        \
+      if (minunit_teardown)(*minunit_teardown)();)
+
+/*  Report */
+#define MU_REPORT()                                                            \
+  MU__SAFE_BLOCK(                                                              \
+      double minunit_end_real_timer; double minunit_end_proc_timer;            \
+      printf("\n\n%d tests, %d assertions, %d failures\n", minunit_run,        \
+             minunit_assert, minunit_fail);                                    \
+      minunit_end_real_timer = mu_timer_real();                                \
+      minunit_end_proc_timer = mu_timer_cpu();                                 \
+      printf("\nFinished in %.8f seconds (real) %.8f seconds (proc)\n\n",      \
+             minunit_end_real_timer - minunit_real_timer,                      \
+             minunit_end_proc_timer - minunit_proc_timer);)
+#define MU_EXIT_CODE minunit_fail
+
+/*  Assertions */
+#define mu_check(test)                                                         \
+  MU__SAFE_BLOCK(                                                              \
+      minunit_assert++; if (!(test)) {                                         \
+        snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN,                    \
+                 "%s failed:\n\t%s:%d: %s", __func__, __FILE__, __LINE__,      \
+                 #test);                                                       \
+        minunit_status = 1;                                                    \
+        return;                                                                \
+      } else { printf("."); })
+
+#define mu_fail(message)                                                       \
+  MU__SAFE_BLOCK(minunit_assert++;                                             \
+                 snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN,           \
+                          "%s failed:\n\t%s:%d: %s", __func__, __FILE__,       \
+                          __LINE__, message);                                  \
+                 minunit_status = 1; return;)
+
+#define mu_assert(test, message)                                               \
+  MU__SAFE_BLOCK(                                                              \
+      minunit_assert++; if (!(test)) {                                         \
+        snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN,                    \
+                 "%s failed:\n\t%s:%d: %s", __func__, __FILE__, __LINE__,      \
+                 message);                                                     \
+        minunit_status = 1;                                                    \
+        return;                                                                \
+      } else { printf("."); })
+
+#define mu_assert_int_eq(expected, result)                                     \
+  MU__SAFE_BLOCK(                                                              \
+      int minunit_tmp_e; int minunit_tmp_r; minunit_assert++;                  \
+      minunit_tmp_e = (expected); minunit_tmp_r = (result);                    \
+      if (minunit_tmp_e != minunit_tmp_r) {                                    \
+        snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN,                    \
+                 "%s failed:\n\t%s:%d: %d expected but was %d", __func__,      \
+                 __FILE__, __LINE__, minunit_tmp_e, minunit_tmp_r);            \
+        minunit_status = 1;                                                    \
+        return;                                                                \
+      } else { printf("."); })
+
+#define mu_assert_double_eq(expected, result)                                  \
+  MU__SAFE_BLOCK(                                                              \
+      double minunit_tmp_e; double minunit_tmp_r; minunit_assert++;            \
+      minunit_tmp_e = (expected); minunit_tmp_r = (result);                    \
+      if (fabs(minunit_tmp_e - minunit_tmp_r) > MINUNIT_EPSILON) {             \
+        int minunit_significant_figures = 1 - log10(MINUNIT_EPSILON);          \
+        snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN,                    \
+                 "%s failed:\n\t%s:%d: %.*g expected but was %.*g", __func__,  \
+                 __FILE__, __LINE__, minunit_significant_figures,              \
+                 minunit_tmp_e, minunit_significant_figures, minunit_tmp_r);   \
+        minunit_status = 1;                                                    \
+        return;                                                                \
+      } else { printf("."); })
+
+#define mu_assert_string_eq(expected, result)                                  \
+  MU__SAFE_BLOCK(                                                              \
+      const char *minunit_tmp_e = expected;                                    \
+      const char *minunit_tmp_r = result; minunit_assert++;                    \
+      if (!minunit_tmp_e) {                                                    \
+        minunit_tmp_e = "<null pointer>";                                      \
+      } if (!minunit_tmp_r) {                                                  \
+        minunit_tmp_r = "<null pointer>";                                      \
+      } if (strcmp(minunit_tmp_e, minunit_tmp_r)) {                            \
+        snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN,                    \
+                 "%s failed:\n\t%s:%d: '%s' expected but was '%s'", __func__,  \
+                 __FILE__, __LINE__, minunit_tmp_e, minunit_tmp_r);            \
+        minunit_status = 1;                                                    \
+        return;                                                                \
+      } else { printf("."); })
+
+/*
+ * The following two functions were written by David Robert Nadeau
+ * from http://NadeauSoftware.com/ and distributed under the
+ * Creative Commons Attribution 3.0 Unported License
+ */
+
+/**
+ * Returns the real time, in seconds, or -1.0 if an error occurred.
+ *
+ * Time is measured since an arbitrary and OS-dependent start time.
+ * The returned real time is only useful for computing an elapsed time
+ * between two calls to this function.
+ */
+static double mu_timer_real(void) {
+#if defined(_WIN32)
+  /* Windows 2000 and later. ---------------------------------- */
+  LARGE_INTEGER Time;
+  LARGE_INTEGER Frequency;
+
+  QueryPerformanceFrequency(&Frequency);
+  QueryPerformanceCounter(&Time);
+
+  Time.QuadPart *= 1000000;
+  Time.QuadPart /= Frequency.QuadPart;
+
+  return (double)Time.QuadPart / 1000000.0;
+
+#elif (defined(__hpux) || defined(hpux)) ||                                    \
+    ((defined(__sun__) || defined(__sun) || defined(sun)) &&                   \
+     (defined(__SVR4) || defined(__svr4__)))
+  /* HP-UX, Solaris. ------------------------------------------ */
+  return (double)gethrtime() / 1000000000.0;
+
+#elif defined(__MACH__) && defined(__APPLE__)
+  /* OSX. ----------------------------------------------------- */
+  static double timeConvert = 0.0;
+  if (timeConvert == 0.0) {
+    mach_timebase_info_data_t timeBase;
+    (void)mach_timebase_info(&timeBase);
+    timeConvert =
+        (double)timeBase.numer / (double)timeBase.denom / 1000000000.0;
+  }
+  return (double)mach_absolute_time() * timeConvert;
+
+#elif defined(_POSIX_VERSION)
+  /* POSIX. --------------------------------------------------- */
+  struct timeval tm;
+#if defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0)
+  {
+    struct timespec ts;
+#if defined(CLOCK_MONOTONIC_PRECISE)
+    /* BSD. --------------------------------------------- */
+    const clockid_t id = CLOCK_MONOTONIC_PRECISE;
+#elif defined(CLOCK_MONOTONIC_RAW)
+    /* Linux. ------------------------------------------- */
+    const clockid_t id = CLOCK_MONOTONIC_RAW;
+#elif defined(CLOCK_HIGHRES)
+    /* Solaris. ----------------------------------------- */
+    const clockid_t id = CLOCK_HIGHRES;
+#elif defined(CLOCK_MONOTONIC)
+    /* AIX, BSD, Linux, POSIX, Solaris. ----------------- */
+    const clockid_t id = CLOCK_MONOTONIC;
+#elif defined(CLOCK_REALTIME)
+    /* AIX, BSD, HP-UX, Linux, POSIX. ------------------- */
+    const clockid_t id = CLOCK_REALTIME;
+#else
+    const clockid_t id = (clockid_t)-1; /* Unknown. */
+#endif /* CLOCK_* */
+    if (id != (clockid_t)-1 && clock_gettime(id, &ts) != -1)
+      return (double)ts.tv_sec + (double)ts.tv_nsec / 1000000000.0;
+    /* Fall thru. */
+  }
+#endif /* _POSIX_TIMERS */
+
+  /* AIX, BSD, Cygwin, HP-UX, Linux, OSX, POSIX, Solaris. ----- */
+  gettimeofday(&tm, NULL);
+  return (double)tm.tv_sec + (double)tm.tv_usec / 1000000.0;
+#else
+  return -1.0; /* Failed. */
+#endif
+}
+
+/**
+ * Returns the amount of CPU time used by the current process,
+ * in seconds, or -1.0 if an error occurred.
+ */
+static double mu_timer_cpu(void) {
+#if defined(_WIN32)
+  /* Windows -------------------------------------------------- */
+  FILETIME createTime;
+  FILETIME exitTime;
+  FILETIME kernelTime;
+  FILETIME userTime;
+
+  /* This approach has a resolution of 1/64 second. Unfortunately, Windows' API
+   * does not offer better */
+  if (GetProcessTimes(GetCurrentProcess(), &createTime, &exitTime, &kernelTime,
+                      &userTime) != 0) {
+    ULARGE_INTEGER userSystemTime;
+    memcpy(&userSystemTime, &userTime, sizeof(ULARGE_INTEGER));
+    return (double)userSystemTime.QuadPart / 10000000.0;
+  }
+
+#elif defined(__unix__) || defined(__unix) || defined(unix) ||                 \
+    (defined(__APPLE__) && defined(__MACH__))
+  /* AIX, BSD, Cygwin, HP-UX, Linux, OSX, and Solaris --------- */
+
+#if defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0)
+  /* Prefer high-res POSIX timers, when available. */
+  {
+    clockid_t id;
+    struct timespec ts;
+#if _POSIX_CPUTIME > 0
+    /* Clock ids vary by OS.  Query the id, if possible. */
+    if (clock_getcpuclockid(0, &id) == -1)
+#endif
+#if defined(CLOCK_PROCESS_CPUTIME_ID)
+      /* Use known clock id for AIX, Linux, or Solaris. */
+      id = CLOCK_PROCESS_CPUTIME_ID;
+#elif defined(CLOCK_VIRTUAL)
+    /* Use known clock id for BSD or HP-UX. */
+    id = CLOCK_VIRTUAL;
+#else
+    id = (clockid_t)-1;
+#endif
+    if (id != (clockid_t)-1 && clock_gettime(id, &ts) != -1)
+      return (double)ts.tv_sec + (double)ts.tv_nsec / 1000000000.0;
+  }
+#endif
+
+#if defined(RUSAGE_SELF)
+  {
+    struct rusage rusage;
+    if (getrusage(RUSAGE_SELF, &rusage) != -1)
+      return (double)rusage.ru_utime.tv_sec +
+             (double)rusage.ru_utime.tv_usec / 1000000.0;
+  }
+#endif
+
+#if defined(_SC_CLK_TCK)
+  {
+    const double ticks = (double)sysconf(_SC_CLK_TCK);
+    struct tms tms;
+    if (times(&tms) != (clock_t)-1)
+      return (double)tms.tms_utime / ticks;
+  }
+#endif
+
+#if defined(CLOCKS_PER_SEC)
+  {
+    clock_t cl = clock();
+    if (cl != (clock_t)-1)
+      return (double)cl / (double)CLOCKS_PER_SEC;
+  }
+#endif
+
+#endif
+
+  return -1; /* Failed. */
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MINUNIT_MINUNIT_H */
diff --git a/contrib/zip/test/test.c b/contrib/zip/test/test.c
deleted file mode 100644
index 9cc2248ac..000000000
--- a/contrib/zip/test/test.c
+++ /dev/null
@@ -1,495 +0,0 @@
-#include <zip.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-
-#if defined(_MSC_VER) || defined(__MINGW64__) || defined(__MINGW32__)
-#define MZ_FILE_STAT_STRUCT _stat
-#define MZ_FILE_STAT _stat
-#else
-#define MZ_FILE_STAT_STRUCT stat
-#define MZ_FILE_STAT stat
-#endif
-
-#define ZIPNAME "test.zip\0"
-#define TESTDATA1 "Some test data 1...\0"
-#define CRC32DATA1 2220805626
-#define TESTDATA2 "Some test data 2...\0"
-#define CRC32DATA2 2532008468
-
-#define RFILE "4.txt\0"
-#define RMODE 0100444
-
-#define WFILE "6.txt\0"
-#define WMODE 0100666
-
-#define XFILE "7.txt\0"
-#define XMODE 0100777
-
-#define UNIXMODE 0100644
-
-#define UNUSED(x) (void)x
-
-static int total_entries = 0;
-
-static void test_write(void) {
-  struct zip_t *zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w');
-  assert(zip != NULL);
-
-  assert(0 == zip_entry_open(zip, "test/test-1.txt"));
-  assert(0 == zip_entry_write(zip, TESTDATA1, strlen(TESTDATA1)));
-  assert(0 == strcmp(zip_entry_name(zip), "test/test-1.txt"));
-  assert(total_entries == zip_entry_index(zip));
-  assert(strlen(TESTDATA1) == zip_entry_size(zip));
-  assert(CRC32DATA1 == zip_entry_crc32(zip));
-  ++total_entries;
-  assert(0 == zip_entry_close(zip));
-  assert(0 == zip_is64(zip));
-  zip_close(zip);
-}
-
-static void test_append(void) {
-  struct zip_t *zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'a');
-  assert(zip != NULL);
-
-  assert(0 == zip_entry_open(zip, "test\\test-2.txt"));
-  assert(0 == strcmp(zip_entry_name(zip), "test/test-2.txt"));
-  assert(total_entries == zip_entry_index(zip));
-  assert(0 == zip_entry_write(zip, TESTDATA2, strlen(TESTDATA2)));
-  assert(strlen(TESTDATA2) == zip_entry_size(zip));
-  assert(CRC32DATA2 == zip_entry_crc32(zip));
-
-  ++total_entries;
-  assert(0 == zip_entry_close(zip));
-
-  assert(0 == zip_entry_open(zip, "test\\empty/"));
-  assert(0 == strcmp(zip_entry_name(zip), "test/empty/"));
-  assert(0 == zip_entry_size(zip));
-  assert(0 == zip_entry_crc32(zip));
-
-  assert(total_entries == zip_entry_index(zip));
-  ++total_entries;
-  assert(0 == zip_entry_close(zip));
-
-  assert(0 == zip_entry_open(zip, "empty/"));
-  assert(0 == strcmp(zip_entry_name(zip), "empty/"));
-  assert(0 == zip_entry_size(zip));
-  assert(0 == zip_entry_crc32(zip));
-
-  assert(total_entries == zip_entry_index(zip));
-  ++total_entries;
-  assert(0 == zip_entry_close(zip));
-
-  zip_close(zip);
-}
-
-static void test_read(void) {
-  char *buf = NULL;
-  ssize_t bufsize;
-  size_t buftmp;
-  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
-  assert(zip != NULL);
-  assert(0 == zip_is64(zip));
-
-  assert(0 == zip_entry_open(zip, "test\\test-1.txt"));
-  assert(strlen(TESTDATA1) == zip_entry_size(zip));
-  assert(CRC32DATA1 == zip_entry_crc32(zip));
-
-  bufsize = zip_entry_read(zip, (void **)&buf, &buftmp);
-  assert(bufsize == strlen(TESTDATA1));
-  assert((size_t)bufsize == buftmp);
-  assert(0 == strncmp(buf, TESTDATA1, bufsize));
-  assert(0 == zip_entry_close(zip));
-  free(buf);
-  buf = NULL;
-  bufsize = 0;
-
-  assert(0 == zip_entry_open(zip, "test/test-2.txt"));
-  assert(strlen(TESTDATA2) == zip_entry_size(zip));
-  assert(CRC32DATA2 == zip_entry_crc32(zip));
-
-  bufsize = zip_entry_read(zip, (void **)&buf, NULL);
-  assert((size_t)bufsize == strlen(TESTDATA2));
-  assert(0 == strncmp(buf, TESTDATA2, (size_t)bufsize));
-  assert(0 == zip_entry_close(zip));
-  free(buf);
-  buf = NULL;
-  bufsize = 0;
-
-  assert(0 == zip_entry_open(zip, "test\\empty/"));
-  assert(0 == strcmp(zip_entry_name(zip), "test/empty/"));
-  assert(0 == zip_entry_size(zip));
-  assert(0 == zip_entry_crc32(zip));
-  assert(0 == zip_entry_close(zip));
-
-  buftmp = strlen(TESTDATA2);
-  buf = calloc(buftmp, sizeof(char));
-  assert(0 == zip_entry_open(zip, "test/test-2.txt"));
-
-  bufsize = zip_entry_noallocread(zip, (void *)buf, buftmp);
-  assert(buftmp == (size_t)bufsize);
-  assert(0 == strncmp(buf, TESTDATA2, buftmp));
-  assert(0 == zip_entry_close(zip));
-  free(buf);
-  buf = NULL;
-  bufsize = 0;
-
-  buftmp = strlen(TESTDATA1);
-  buf = calloc(buftmp, sizeof(char));
-  assert(0 == zip_entry_open(zip, "test/test-1.txt"));
-
-  bufsize = zip_entry_noallocread(zip, (void *)buf, buftmp);
-  assert(buftmp == (size_t)bufsize);
-  assert(0 == strncmp(buf, TESTDATA1, buftmp));
-  assert(0 == zip_entry_close(zip));
-  free(buf);
-  buf = NULL;
-  bufsize = 0;
-
-  zip_close(zip);
-}
-
-struct buffer_t {
-  char *data;
-  size_t size;
-};
-
-static size_t on_extract(void *arg, unsigned long long offset, const void *data,
-                         size_t size) {
-  UNUSED(offset);
-
-  struct buffer_t *buf = (struct buffer_t *)arg;
-  buf->data = realloc(buf->data, buf->size + size + 1);
-  assert(NULL != buf->data);
-
-  memcpy(&(buf->data[buf->size]), data, size);
-  buf->size += size;
-  buf->data[buf->size] = 0;
-
-  return size;
-}
-
-static void test_extract(void) {
-  struct buffer_t buf;
-
-  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
-  assert(zip != NULL);
-  memset((void *)&buf, 0, sizeof(struct buffer_t));
-
-  assert(0 == zip_entry_open(zip, "test/test-1.txt"));
-  assert(0 == zip_entry_extract(zip, on_extract, &buf));
-
-  assert(buf.size == strlen(TESTDATA1));
-  assert(0 == strncmp(buf.data, TESTDATA1, buf.size));
-  assert(0 == zip_entry_close(zip));
-  free(buf.data);
-  buf.data = NULL;
-  buf.size = 0;
-
-  zip_close(zip);
-}
-
-static void test_total_entries(void) {
-  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
-  assert(zip != NULL);
-
-  int n = zip_total_entries(zip);
-  zip_close(zip);
-
-  assert(n == total_entries);
-}
-
-static void test_entry_name(void) {
-  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
-  assert(zip != NULL);
-
-  assert(zip_entry_name(zip) == NULL);
-
-  assert(0 == zip_entry_open(zip, "test\\test-1.txt"));
-  assert(NULL != zip_entry_name(zip));
-  assert(0 == strcmp(zip_entry_name(zip), "test/test-1.txt"));
-  assert(strlen(TESTDATA1) == zip_entry_size(zip));
-  assert(CRC32DATA1 == zip_entry_crc32(zip));
-  assert(0 == zip_entry_index(zip));
-
-  assert(0 == zip_entry_close(zip));
-
-  assert(0 == zip_entry_open(zip, "test/test-2.txt"));
-  assert(NULL != zip_entry_name(zip));
-  assert(0 == strcmp(zip_entry_name(zip), "test/test-2.txt"));
-  assert(strlen(TESTDATA2) == zip_entry_size(zip));
-  assert(CRC32DATA2 == zip_entry_crc32(zip));
-  assert(1 == zip_entry_index(zip));
-
-  assert(0 == zip_entry_close(zip));
-
-  zip_close(zip);
-}
-
-static void test_entry_index(void) {
-  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
-  assert(zip != NULL);
-
-  assert(0 == zip_entry_open(zip, "test\\test-1.txt"));
-  assert(0 == zip_entry_index(zip));
-  assert(0 == strcmp(zip_entry_name(zip), "test/test-1.txt"));
-  assert(strlen(TESTDATA1) == zip_entry_size(zip));
-  assert(CRC32DATA1 == zip_entry_crc32(zip));
-  assert(0 == zip_entry_close(zip));
-
-  assert(0 == zip_entry_open(zip, "test/test-2.txt"));
-  assert(1 == zip_entry_index(zip));
-  assert(0 == strcmp(zip_entry_name(zip), "test/test-2.txt"));
-  assert(strlen(TESTDATA2) == zip_entry_size(zip));
-  assert(CRC32DATA2 == zip_entry_crc32(zip));
-  assert(0 == zip_entry_close(zip));
-
-  zip_close(zip);
-}
-
-static void test_entry_openbyindex(void) {
-  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
-  assert(zip != NULL);
-
-  assert(0 == zip_entry_openbyindex(zip, 1));
-  assert(1 == zip_entry_index(zip));
-  assert(strlen(TESTDATA2) == zip_entry_size(zip));
-  assert(CRC32DATA2 == zip_entry_crc32(zip));
-  assert(0 == strcmp(zip_entry_name(zip), "test/test-2.txt"));
-  assert(0 == zip_entry_close(zip));
-
-  assert(0 == zip_entry_openbyindex(zip, 0));
-  assert(0 == zip_entry_index(zip));
-  assert(strlen(TESTDATA1) == zip_entry_size(zip));
-  assert(CRC32DATA1 == zip_entry_crc32(zip));
-  assert(0 == strcmp(zip_entry_name(zip), "test/test-1.txt"));
-  assert(0 == zip_entry_close(zip));
-
-  zip_close(zip);
-}
-
-static void test_list_entries(void) {
-  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
-  assert(zip != NULL);
-
-  int i = 0, n = zip_total_entries(zip);
-  for (; i < n; ++i) {
-    assert(0 == zip_entry_openbyindex(zip, i));
-    fprintf(stdout, "[%d]: %s", i, zip_entry_name(zip));
-    if (zip_entry_isdir(zip)) {
-      fprintf(stdout, " (DIR)");
-    }
-    fprintf(stdout, "\n");
-    assert(0 == zip_entry_close(zip));
-  }
-
-  zip_close(zip);
-}
-
-static void test_fwrite(void) {
-  const char *filename = WFILE;
-  FILE *stream = NULL;
-  struct zip_t *zip = NULL;
-#if defined(_MSC_VER)
-  if (0 != fopen_s(&stream, filename, "w+"))
-#else
-  if (!(stream = fopen(filename, "w+")))
-#endif
-  {
-    // Cannot open filename
-    fprintf(stdout, "Cannot open filename\n");
-    assert(0 == -1);
-  }
-  fwrite(TESTDATA1, sizeof(char), strlen(TESTDATA1), stream);
-  assert(0 == fclose(stream));
-
-  zip = zip_open(ZIPNAME, 9, 'w');
-  assert(zip != NULL);
-  assert(0 == zip_entry_open(zip, WFILE));
-  assert(0 == zip_entry_fwrite(zip, WFILE));
-  assert(0 == zip_entry_close(zip));
-  assert(0 == zip_is64(zip));
-
-  zip_close(zip);
-  remove(WFILE);
-  remove(ZIPNAME);
-}
-
-static void test_exe_permissions(void) {
-#if defined(_WIN32) || defined(__WIN32__)
-#else
-  struct MZ_FILE_STAT_STRUCT file_stats;
-  const char *filenames[] = {XFILE};
-  FILE *f = fopen(XFILE, "w");
-  fclose(f);
-  chmod(XFILE, XMODE);
-
-  remove(ZIPNAME);
-
-  assert(0 == zip_create(ZIPNAME, filenames, 1));
-
-  remove(XFILE);
-
-  assert(0 == zip_extract(ZIPNAME, ".", NULL, NULL));
-
-  assert(0 == MZ_FILE_STAT(XFILE, &file_stats));
-  assert(XMODE == file_stats.st_mode);
-
-  remove(XFILE);
-  remove(ZIPNAME);
-#endif
-}
-
-static void test_read_permissions(void) {
-#if defined(_MSC_VER)
-#else
-
-  struct MZ_FILE_STAT_STRUCT file_stats;
-  const char *filenames[] = {RFILE};
-  FILE *f = fopen(RFILE, "w");
-  fclose(f);
-  chmod(RFILE, RMODE);
-
-  remove(ZIPNAME);
-
-  assert(0 == zip_create(ZIPNAME, filenames, 1));
-
-  // chmod from 444 to 666 to be able delete the file on windows
-  chmod(RFILE, WMODE);
-  remove(RFILE);
-
-  assert(0 == zip_extract(ZIPNAME, ".", NULL, NULL));
-
-  assert(0 == MZ_FILE_STAT(RFILE, &file_stats));
-  assert(RMODE == file_stats.st_mode);
-
-  chmod(RFILE, WMODE);
-  remove(RFILE);
-  remove(ZIPNAME);
-#endif
-}
-
-static void test_write_permissions(void) {
-#if defined(_MSC_VER)
-#else
-
-  struct MZ_FILE_STAT_STRUCT file_stats;
-  const char *filenames[] = {WFILE};
-  FILE *f = fopen(WFILE, "w");
-  fclose(f);
-  chmod(WFILE, WMODE);
-
-  remove(ZIPNAME);
-
-  assert(0 == zip_create(ZIPNAME, filenames, 1));
-
-  remove(WFILE);
-
-  assert(0 == zip_extract(ZIPNAME, ".", NULL, NULL));
-
-  assert(0 == MZ_FILE_STAT(WFILE, &file_stats));
-  assert(WMODE == file_stats.st_mode);
-
-  remove(WFILE);
-  remove(ZIPNAME);
-#endif
-}
-
-static void test_mtime(void) {
-  struct MZ_FILE_STAT_STRUCT file_stat1, file_stat2;
-
-  const char *filename = WFILE;
-  FILE *stream = NULL;
-  struct zip_t *zip = NULL;
-#if defined(_MSC_VER)
-  if (0 != fopen_s(&stream, filename, "w+"))
-#else
-  if (!(stream = fopen(filename, "w+")))
-#endif
-  {
-    // Cannot open filename
-    fprintf(stdout, "Cannot open filename\n");
-    assert(0 == -1);
-  }
-  fwrite(TESTDATA1, sizeof(char), strlen(TESTDATA1), stream);
-  assert(0 == fclose(stream));
-
-  memset(&file_stat1, 0, sizeof(file_stat1));
-  memset(&file_stat2, 0, sizeof(file_stat2));
-  zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w');
-  assert(zip != NULL);
-  assert(0 == zip_entry_open(zip, filename));
-  assert(0 == zip_entry_fwrite(zip, filename));
-  assert(0 == zip_entry_close(zip));
-  zip_close(zip);
-
-  assert(0 == MZ_FILE_STAT(filename, &file_stat1));
-
-  remove(filename);
-  assert(0 == zip_extract(ZIPNAME, ".", NULL, NULL));
-  assert(0 == MZ_FILE_STAT(filename, &file_stat2));
-  fprintf(stdout, "file_stat1.st_mtime: %lu\n", file_stat1.st_mtime);
-  fprintf(stdout, "file_stat2.st_mtime: %lu\n", file_stat2.st_mtime);
-  assert(labs(file_stat1.st_mtime - file_stat2.st_mtime) <= 1);
-
-  remove(filename);
-  remove(ZIPNAME);
-}
-
-static void test_unix_permissions(void) {
-#if defined(_WIN64) || defined(_WIN32) || defined(__WIN32__)
-#else
-  // UNIX or APPLE
-  struct MZ_FILE_STAT_STRUCT file_stats;
-
-  remove(ZIPNAME);
-
-  struct zip_t *zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w');
-  assert(zip != NULL);
-
-  assert(0 == zip_entry_open(zip, RFILE));
-  assert(0 == zip_entry_write(zip, TESTDATA1, strlen(TESTDATA1)));
-  assert(0 == zip_entry_close(zip));
-
-  zip_close(zip);
-
-  remove(RFILE);
-
-  assert(0 == zip_extract(ZIPNAME, ".", NULL, NULL));
-
-  assert(0 == MZ_FILE_STAT(RFILE, &file_stats));
-  assert(UNIXMODE == file_stats.st_mode);
-
-  remove(RFILE);
-  remove(ZIPNAME);
-#endif
-}
-
-int main(int argc, char *argv[]) {
-  UNUSED(argc);
-  UNUSED(argv);
-
-  remove(ZIPNAME);
-
-  test_write();
-  test_append();
-  test_read();
-  test_extract();
-  test_total_entries();
-  test_entry_name();
-  test_entry_index();
-  test_entry_openbyindex();
-  test_list_entries();
-  test_fwrite();
-  test_read_permissions();
-  test_write_permissions();
-  test_exe_permissions();
-  test_mtime();
-  test_unix_permissions();
-
-  remove(ZIPNAME);
-  return 0;
-}
diff --git a/contrib/zip/test/test_append.c b/contrib/zip/test/test_append.c
new file mode 100644
index 000000000..b9799366b
--- /dev/null
+++ b/contrib/zip/test/test_append.c
@@ -0,0 +1,104 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <zip.h>
+
+#include "minunit.h"
+
+#if defined(_WIN32) || defined(_WIN64)
+#define MKTEMP _mktemp
+#define UNLINK _unlink
+#else
+#define MKTEMP mkstemp
+#define UNLINK unlink
+#endif
+
+static char ZIPNAME[L_tmpnam + 1] = {0};
+static int total_entries = 0;
+
+#define TESTDATA1 "Some test data 1...\0"
+
+void test_setup(void) {
+  strncpy(ZIPNAME, "z-XXXXXX\0", L_tmpnam);
+  MKTEMP(ZIPNAME);
+
+  struct zip_t *zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w');
+
+  zip_entry_open(zip, "test/test-1.txt");
+  zip_entry_write(zip, TESTDATA1, strlen(TESTDATA1));
+  zip_entry_close(zip);
+  ++total_entries;
+
+  zip_close(zip);
+}
+
+void test_teardown(void) { UNLINK(ZIPNAME); }
+
+#define TESTDATA2 "Some test data 2...\0"
+#define CRC32DATA2 2532008468
+
+MU_TEST(test_append) {
+  struct zip_t *zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'a');
+  mu_check(zip != NULL);
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "test\\test-2.txt"));
+  mu_assert_int_eq(0, strcmp(zip_entry_name(zip), "test/test-2.txt"));
+  mu_assert_int_eq(total_entries, zip_entry_index(zip));
+  mu_assert_int_eq(0, zip_entry_write(zip, TESTDATA2, strlen(TESTDATA2)));
+  mu_assert_int_eq(strlen(TESTDATA2), zip_entry_size(zip));
+  mu_check(CRC32DATA2 == zip_entry_crc32(zip));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  ++total_entries;
+  zip_close(zip);
+
+  zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'a');
+  mu_assert_int_eq(0, zip_entry_open(zip, "test\\empty/"));
+  mu_assert_int_eq(0, strcmp(zip_entry_name(zip), "test/empty/"));
+  mu_assert_int_eq(0, zip_entry_size(zip));
+  mu_assert_int_eq(0, zip_entry_crc32(zip));
+  mu_assert_int_eq(total_entries, zip_entry_index(zip));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  ++total_entries;
+  zip_close(zip);
+
+  zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'a');
+  mu_assert_int_eq(0, zip_entry_open(zip, "empty/"));
+  mu_assert_int_eq(0, strcmp(zip_entry_name(zip), "empty/"));
+  mu_assert_int_eq(0, zip_entry_size(zip));
+  mu_assert_int_eq(0, zip_entry_crc32(zip));
+  mu_assert_int_eq(total_entries, zip_entry_index(zip));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  ++total_entries;
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "dotfiles/.test"));
+  mu_assert_int_eq(0, strcmp(zip_entry_name(zip), "dotfiles/.test"));
+  mu_assert_int_eq(0, zip_entry_size(zip));
+  mu_assert_int_eq(0, zip_entry_crc32(zip));
+  mu_assert_int_eq(0, zip_entry_write(zip, TESTDATA2, strlen(TESTDATA2)));
+  mu_assert_int_eq(strlen(TESTDATA2), zip_entry_size(zip));
+  mu_check(CRC32DATA2 == zip_entry_crc32(zip));
+  mu_assert_int_eq(total_entries, zip_entry_index(zip));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  ++total_entries;
+
+  mu_assert_int_eq(total_entries, zip_entries_total(zip));
+
+  zip_close(zip);
+}
+
+MU_TEST_SUITE(test_append_suite) {
+  MU_SUITE_CONFIGURE(&test_setup, &test_teardown);
+
+  MU_RUN_TEST(test_append);
+}
+
+#define UNUSED(x) (void)x
+
+int main(int argc, char *argv[]) {
+  UNUSED(argc);
+  UNUSED(argv);
+
+  MU_RUN_SUITE(test_append_suite);
+  MU_REPORT();
+  return MU_EXIT_CODE;
+}
diff --git a/contrib/zip/test/test_entry.c b/contrib/zip/test/test_entry.c
new file mode 100644
index 000000000..a0c402562
--- /dev/null
+++ b/contrib/zip/test/test_entry.c
@@ -0,0 +1,438 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <zip.h>
+
+#include "minunit.h"
+
+#if defined(_WIN32) || defined(_WIN64)
+#define MKTEMP _mktemp
+#define UNLINK _unlink
+#else
+#define MKTEMP mkstemp
+#define UNLINK unlink
+#endif
+
+#define MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE                                  \
+  (sizeof(unsigned short) * 2 + sizeof(unsigned long long) * 3)
+#define MZ_ZIP_LOCAL_DIR_HEADER_SIZE 30
+
+static char ZIPNAME[L_tmpnam + 1] = {0};
+
+#define CRC32DATA1 2220805626
+#define TESTDATA1 "Some test data 1...\0"
+
+#define TESTDATA2 "Some test data 2...\0"
+#define CRC32DATA2 2532008468
+
+static int total_entries = 0;
+
+void test_setup(void) {
+  strncpy(ZIPNAME, "z-XXXXXX\0", L_tmpnam);
+  MKTEMP(ZIPNAME);
+
+  struct zip_t *zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w');
+
+  zip_entry_open(zip, "test/test-1.txt");
+  zip_entry_write(zip, TESTDATA1, strlen(TESTDATA1));
+  zip_entry_close(zip);
+  ++total_entries;
+
+  zip_entry_open(zip, "test\\test-2.txt");
+  zip_entry_write(zip, TESTDATA2, strlen(TESTDATA2));
+  zip_entry_close(zip);
+  ++total_entries;
+
+  zip_entry_open(zip, "test\\empty/");
+  zip_entry_close(zip);
+  ++total_entries;
+
+  zip_entry_open(zip, "empty/");
+  zip_entry_close(zip);
+  ++total_entries;
+
+  zip_entry_open(zip, "dotfiles/.test");
+  zip_entry_write(zip, TESTDATA2, strlen(TESTDATA2));
+  zip_entry_close(zip);
+  ++total_entries;
+
+  zip_entry_open(zip, "delete.me");
+  zip_entry_write(zip, TESTDATA1, strlen(TESTDATA1));
+  zip_entry_close(zip);
+  ++total_entries;
+
+  zip_entry_open(zip, "_");
+  zip_entry_write(zip, TESTDATA2, strlen(TESTDATA2));
+  zip_entry_close(zip);
+  ++total_entries;
+
+  zip_entry_open(zip, "delete/file.1");
+  zip_entry_write(zip, TESTDATA1, strlen(TESTDATA1));
+  zip_entry_close(zip);
+  ++total_entries;
+
+  zip_entry_open(zip, "delete/file.2");
+  zip_entry_write(zip, TESTDATA2, strlen(TESTDATA2));
+  zip_entry_close(zip);
+  ++total_entries;
+
+  zip_entry_open(zip, "deleteme/file.3");
+  zip_entry_write(zip, TESTDATA1, strlen(TESTDATA1));
+  zip_entry_close(zip);
+  ++total_entries;
+
+  zip_entry_open(zip, "delete/file.4");
+  zip_entry_write(zip, TESTDATA2, strlen(TESTDATA2));
+  zip_entry_close(zip);
+  ++total_entries;
+
+  zip_close(zip);
+}
+
+void test_teardown(void) {
+  total_entries = 0;
+
+  UNLINK(ZIPNAME);
+}
+
+MU_TEST(test_entry_name) {
+  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
+  mu_check(zip != NULL);
+
+  mu_check(zip_entry_name(zip) == NULL);
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "test\\test-1.txt"));
+  mu_check(NULL != zip_entry_name(zip));
+  mu_assert_int_eq(0, strcmp(zip_entry_name(zip), "test/test-1.txt"));
+  mu_assert_int_eq(strlen(TESTDATA1), zip_entry_size(zip));
+  mu_check(CRC32DATA1 == zip_entry_crc32(zip));
+  mu_assert_int_eq(0, zip_entry_index(zip));
+
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "test/test-2.txt"));
+  mu_check(NULL != zip_entry_name(zip));
+  mu_assert_int_eq(0, strcmp(zip_entry_name(zip), "test/test-2.txt"));
+  mu_assert_int_eq(strlen(TESTDATA2), zip_entry_size(zip));
+  mu_check(CRC32DATA2 == zip_entry_crc32(zip));
+  mu_assert_int_eq(1, zip_entry_index(zip));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  zip_close(zip);
+}
+
+MU_TEST(test_entry_opencasesensitive) {
+  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
+  mu_check(zip != NULL);
+
+  mu_check(zip_entry_name(zip) == NULL);
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "test/TEST-1.TXT"));
+  mu_check(NULL != zip_entry_name(zip));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  mu_assert_int_eq(ZIP_ENOENT,
+                   zip_entry_opencasesensitive(zip, "test/TEST-1.TXT"));
+
+  zip_close(zip);
+}
+
+MU_TEST(test_entry_index) {
+  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
+  mu_check(zip != NULL);
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "test\\test-1.txt"));
+  mu_assert_int_eq(0, zip_entry_index(zip));
+  mu_assert_int_eq(0, strcmp(zip_entry_name(zip), "test/test-1.txt"));
+  mu_assert_int_eq(strlen(TESTDATA1), zip_entry_size(zip));
+  mu_check(CRC32DATA1 == zip_entry_crc32(zip));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "test/test-2.txt"));
+  mu_assert_int_eq(1, zip_entry_index(zip));
+  mu_assert_int_eq(0, strcmp(zip_entry_name(zip), "test/test-2.txt"));
+  mu_assert_int_eq(strlen(TESTDATA2), zip_entry_size(zip));
+  mu_check(CRC32DATA2 == zip_entry_crc32(zip));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  zip_close(zip);
+}
+
+MU_TEST(test_entry_openbyindex) {
+  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
+  mu_check(zip != NULL);
+
+  mu_assert_int_eq(0, zip_entry_openbyindex(zip, 1));
+  mu_assert_int_eq(1, zip_entry_index(zip));
+
+  mu_assert_int_eq(strlen(TESTDATA2), zip_entry_size(zip));
+  mu_check(CRC32DATA2 == zip_entry_crc32(zip));
+
+  mu_assert_int_eq(0, strcmp(zip_entry_name(zip), "test/test-2.txt"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  mu_assert_int_eq(0, zip_entry_openbyindex(zip, 0));
+  mu_assert_int_eq(0, zip_entry_index(zip));
+  mu_assert_int_eq(strlen(TESTDATA1), zip_entry_size(zip));
+  mu_check(CRC32DATA1 == zip_entry_crc32(zip));
+
+  mu_assert_int_eq(0, strcmp(zip_entry_name(zip), "test/test-1.txt"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  zip_close(zip);
+}
+
+MU_TEST(test_entry_read) {
+  char *bufencode1 = NULL;
+  char *bufencode2 = NULL;
+  char *buf = NULL;
+  size_t bufsize;
+
+  struct zip_t *zip =
+      zip_stream_open(NULL, 0, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w');
+  mu_check(zip != NULL);
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "test/test-1.txt"));
+  mu_assert_int_eq(0, zip_entry_write(zip, TESTDATA1, strlen(TESTDATA1)));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  ssize_t n = zip_stream_copy(zip, (void **)&bufencode1, NULL);
+  zip_stream_copy(zip, (void **)&bufencode2, &bufsize);
+  mu_assert_int_eq(0, strncmp(bufencode1, bufencode2, bufsize));
+
+  zip_stream_close(zip);
+
+  struct zip_t *zipstream = zip_stream_open(bufencode1, n, 0, 'r');
+  mu_check(zipstream != NULL);
+
+  mu_assert_int_eq(0, zip_entry_open(zipstream, "test/test-1.txt"));
+  n = zip_entry_read(zipstream, (void **)&buf, NULL);
+  mu_assert_int_eq(0, strncmp(buf, TESTDATA1, (size_t)n));
+  mu_assert_int_eq(0, zip_entry_close(zipstream));
+
+  zip_stream_close(zipstream);
+
+  free(buf);
+  free(bufencode1);
+  free(bufencode2);
+}
+
+MU_TEST(test_list_entries) {
+  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
+  mu_check(zip != NULL);
+
+  int i = 0, n = zip_entries_total(zip);
+  for (; i < n; ++i) {
+    mu_assert_int_eq(0, zip_entry_openbyindex(zip, i));
+    fprintf(stdout, "[%d]: %s", i, zip_entry_name(zip));
+    if (zip_entry_isdir(zip)) {
+      fprintf(stdout, " (DIR)");
+    }
+    fprintf(stdout, "\n");
+    mu_assert_int_eq(0, zip_entry_close(zip));
+  }
+
+  zip_close(zip);
+}
+
+MU_TEST(test_entries_deletebyindex) {
+  size_t entries[] = {5, 6, 7, 9, 8};
+
+  struct zip_t *zip = zip_open(ZIPNAME, 0, 'd');
+  mu_check(zip != NULL);
+
+  mu_assert_int_eq(5, zip_entries_deletebyindex(zip, entries, 5));
+
+  zip_close(zip);
+
+  zip = zip_open(ZIPNAME, 0, 'r');
+  mu_check(zip != NULL);
+
+  mu_assert_int_eq(ZIP_ENOENT, zip_entry_open(zip, "delete.me"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  fprintf(stdout, "delete.me: %s\n", zip_strerror(ZIP_ENOENT));
+
+  mu_assert_int_eq(ZIP_ENOENT, zip_entry_open(zip, "_"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  fprintf(stdout, "_: %s\n", zip_strerror(ZIP_ENOENT));
+
+  mu_assert_int_eq(ZIP_ENOENT, zip_entry_open(zip, "delete/file.1"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  fprintf(stdout, "delete/file.1: %s\n", zip_strerror(ZIP_ENOENT));
+
+  mu_assert_int_eq(ZIP_ENOENT, zip_entry_open(zip, "deleteme/file.3"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  fprintf(stdout, "delete/file.3: %s\n", zip_strerror(ZIP_ENOENT));
+
+  mu_assert_int_eq(ZIP_ENOENT, zip_entry_open(zip, "delete/file.2"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  fprintf(stdout, "delete/file.2: %s\n", zip_strerror(ZIP_ENOENT));
+
+  mu_assert_int_eq(total_entries - 5, zip_entries_total(zip));
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "delete/file.4"));
+
+  size_t buftmp = 0;
+  char *buf = NULL;
+  ssize_t bufsize = zip_entry_read(zip, (void **)&buf, &buftmp);
+
+  mu_assert_int_eq(bufsize, strlen(TESTDATA2));
+  mu_assert_int_eq((size_t)bufsize, buftmp);
+  mu_assert_int_eq(0, strncmp(buf, TESTDATA2, bufsize));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  free(buf);
+  buf = NULL;
+
+  zip_close(zip);
+}
+
+MU_TEST(test_entries_deleteinvalid) {
+  size_t entries[] = {111, 222, 333, 444};
+
+  struct zip_t *zip = zip_open(ZIPNAME, 0, 'd');
+  mu_check(zip != NULL);
+
+  mu_assert_int_eq(0, zip_entries_deletebyindex(zip, entries, 4));
+
+  zip_close(zip);
+
+  zip = zip_open(ZIPNAME, 0, 'r');
+  mu_check(zip != NULL);
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "delete.me"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "_"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "delete/file.1"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "deleteme/file.3"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "delete/file.2"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  mu_assert_int_eq(total_entries, zip_entries_total(zip));
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "delete/file.4"));
+
+  size_t buftmp = 0;
+  char *buf = NULL;
+  ssize_t bufsize = zip_entry_read(zip, (void **)&buf, &buftmp);
+
+  mu_assert_int_eq(bufsize, strlen(TESTDATA2));
+  mu_assert_int_eq((size_t)bufsize, buftmp);
+  mu_assert_int_eq(0, strncmp(buf, TESTDATA2, bufsize));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  free(buf);
+  buf = NULL;
+
+  zip_close(zip);
+}
+
+MU_TEST(test_entries_delete) {
+  char *entries[] = {"delete.me", "_", "delete/file.1", "deleteme/file.3",
+                     "delete/file.2"};
+
+  struct zip_t *zip = zip_open(ZIPNAME, 0, 'd');
+  mu_check(zip != NULL);
+
+  mu_assert_int_eq(5, zip_entries_delete(zip, entries, 5));
+
+  zip_close(zip);
+
+  zip = zip_open(ZIPNAME, 0, 'r');
+  mu_check(zip != NULL);
+
+  mu_assert_int_eq(ZIP_ENOENT, zip_entry_open(zip, "delete.me"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  fprintf(stdout, "delete.me: %s\n", zip_strerror(ZIP_ENOENT));
+
+  mu_assert_int_eq(ZIP_ENOENT, zip_entry_open(zip, "_"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  fprintf(stdout, "_: %s\n", zip_strerror(ZIP_ENOENT));
+
+  mu_assert_int_eq(ZIP_ENOENT, zip_entry_open(zip, "delete/file.1"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  fprintf(stdout, "delete/file.1: %s\n", zip_strerror(ZIP_ENOENT));
+
+  mu_assert_int_eq(ZIP_ENOENT, zip_entry_open(zip, "deleteme/file.3"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  fprintf(stdout, "delete/file.3: %s\n", zip_strerror(ZIP_ENOENT));
+
+  mu_assert_int_eq(ZIP_ENOENT, zip_entry_open(zip, "delete/file.2"));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  fprintf(stdout, "delete/file.2: %s\n", zip_strerror(ZIP_ENOENT));
+
+  mu_assert_int_eq(total_entries - 5, zip_entries_total(zip));
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "delete/file.4"));
+
+  size_t buftmp = 0;
+  char *buf = NULL;
+  ssize_t bufsize = zip_entry_read(zip, (void **)&buf, &buftmp);
+
+  mu_assert_int_eq(bufsize, strlen(TESTDATA2));
+  mu_assert_int_eq((size_t)bufsize, buftmp);
+  mu_assert_int_eq(0, strncmp(buf, TESTDATA2, bufsize));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  free(buf);
+  buf = NULL;
+
+  zip_close(zip);
+}
+
+MU_TEST(test_entry_offset) {
+  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
+  mu_check(zip != NULL);
+
+  unsigned long long off = 0ULL;
+  int i = 0, n = zip_entries_total(zip);
+  for (; i < n; i++) {
+    mu_assert_int_eq(0, zip_entry_openbyindex(zip, i));
+    mu_assert_int_eq(i, zip_entry_index(zip));
+
+    mu_assert_int_eq(off, zip_entry_header_offset(zip));
+
+    off = zip_entry_header_offset(zip) + MZ_ZIP_LOCAL_DIR_HEADER_SIZE +
+          strlen(zip_entry_name(zip)) + MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE +
+          zip_entry_comp_size(zip);
+    fprintf(stdout, "\n[%d: %s]: header: %llu, dir: %llu, size: %llu (%llu)\n",
+            i, zip_entry_name(zip), zip_entry_header_offset(zip),
+            zip_entry_dir_offset(zip), zip_entry_comp_size(zip), off);
+
+    mu_assert_int_eq(0, zip_entry_close(zip));
+  }
+
+  zip_close(zip);
+}
+
+MU_TEST_SUITE(test_entry_suite) {
+  MU_SUITE_CONFIGURE(&test_setup, &test_teardown);
+
+  MU_RUN_TEST(test_entry_name);
+  MU_RUN_TEST(test_entry_opencasesensitive);
+  MU_RUN_TEST(test_entry_index);
+  MU_RUN_TEST(test_entry_openbyindex);
+  MU_RUN_TEST(test_entry_read);
+  MU_RUN_TEST(test_list_entries);
+  MU_RUN_TEST(test_entries_deletebyindex);
+  MU_RUN_TEST(test_entries_delete);
+  MU_RUN_TEST(test_entry_offset);
+}
+
+#define UNUSED(x) (void)x
+
+int main(int argc, char *argv[]) {
+  UNUSED(argc);
+  UNUSED(argv);
+
+  MU_RUN_SUITE(test_entry_suite);
+  MU_REPORT();
+  return MU_EXIT_CODE;
+}
diff --git a/contrib/zip/test/test_extract.c b/contrib/zip/test/test_extract.c
new file mode 100644
index 000000000..416365e11
--- /dev/null
+++ b/contrib/zip/test/test_extract.c
@@ -0,0 +1,161 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <zip.h>
+
+#include "minunit.h"
+
+#if defined(_WIN32) || defined(_WIN64)
+#define MKTEMP _mktemp
+#define UNLINK _unlink
+#else
+#define MKTEMP mkstemp
+#define UNLINK unlink
+#endif
+
+static char ZIPNAME[L_tmpnam + 1] = {0};
+
+#define TESTDATA1 "Some test data 1...\0"
+#define TESTDATA2 "Some test data 2...\0"
+
+void test_setup(void) {
+  strncpy(ZIPNAME, "z-XXXXXX\0", L_tmpnam);
+  MKTEMP(ZIPNAME);
+
+  struct zip_t *zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w');
+
+  zip_entry_open(zip, "test/test-1.txt");
+  zip_entry_write(zip, TESTDATA1, strlen(TESTDATA1));
+  zip_entry_close(zip);
+
+  zip_entry_open(zip, "test\\test-2.txt");
+  zip_entry_write(zip, TESTDATA2, strlen(TESTDATA2));
+  zip_entry_close(zip);
+
+  zip_entry_open(zip, "test\\empty/");
+  zip_entry_close(zip);
+
+  zip_entry_open(zip, "empty/");
+  zip_entry_close(zip);
+
+  zip_entry_open(zip, "dotfiles/.test");
+  zip_entry_write(zip, TESTDATA2, strlen(TESTDATA2));
+  zip_entry_close(zip);
+
+  zip_close(zip);
+}
+
+void test_teardown(void) {
+  UNLINK("test/test-1.txt");
+  UNLINK("test/test-2.txt");
+  UNLINK("test/empty");
+  UNLINK("test");
+  UNLINK("empty");
+  UNLINK("dotfiles/.test");
+  UNLINK("dotfiles");
+  UNLINK(ZIPNAME);
+}
+
+#define UNUSED(x) (void)x
+
+struct buffer_t {
+  char *data;
+  size_t size;
+};
+
+static size_t on_extract(void *arg, uint64_t offset, const void *data,
+                         size_t size) {
+  UNUSED(offset);
+
+  struct buffer_t *buf = (struct buffer_t *)arg;
+  buf->data = realloc(buf->data, buf->size + size + 1);
+
+  memcpy(&(buf->data[buf->size]), data, size);
+  buf->size += size;
+  buf->data[buf->size] = 0;
+
+  return size;
+}
+
+MU_TEST(test_extract) {
+  struct buffer_t buf;
+
+  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
+  mu_check(zip != NULL);
+
+  memset((void *)&buf, 0, sizeof(struct buffer_t));
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "test/test-1.txt"));
+  mu_assert_int_eq(0, zip_entry_extract(zip, on_extract, &buf));
+  mu_assert_int_eq(strlen(TESTDATA1), buf.size);
+  mu_assert_int_eq(0, strncmp(buf.data, TESTDATA1, buf.size));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  free(buf.data);
+  buf.data = NULL;
+  buf.size = 0;
+
+  memset((void *)&buf, 0, sizeof(struct buffer_t));
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "dotfiles/.test"));
+  mu_assert_int_eq(0, zip_entry_extract(zip, on_extract, &buf));
+  mu_assert_int_eq(strlen(TESTDATA2), buf.size);
+  mu_assert_int_eq(0, strncmp(buf.data, TESTDATA2, buf.size));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  free(buf.data);
+  buf.data = NULL;
+  buf.size = 0;
+
+  zip_close(zip);
+}
+
+MU_TEST(test_extract_stream) {
+  mu_assert_int_eq(
+      ZIP_ENOINIT,
+      zip_extract("non_existing_directory/non_existing_archive.zip", ".", NULL,
+                  NULL));
+  mu_assert_int_eq(ZIP_ENOINIT, zip_stream_extract("", 0, ".", NULL, NULL));
+  fprintf(stdout, "zip_stream_extract: %s\n", zip_strerror(ZIP_ENOINIT));
+
+  FILE *fp = NULL;
+#if defined(_MSC_VER)
+  if (0 != fopen_s(&fp, ZIPNAME, "rb+"))
+#else
+  if (!(fp = fopen(ZIPNAME, "rb+")))
+#endif
+  {
+    mu_fail("Cannot open filename\n");
+  }
+
+  fseek(fp, 0L, SEEK_END);
+  size_t filesize = ftell(fp);
+  fseek(fp, 0L, SEEK_SET);
+
+  char *stream = (char *)malloc(filesize * sizeof(char));
+  memset(stream, 0, filesize);
+
+  size_t size = fread(stream, sizeof(char), filesize, fp);
+  mu_assert_int_eq(filesize, size);
+
+  mu_assert_int_eq(0, zip_stream_extract(stream, size, ".", NULL, NULL));
+
+  free(stream);
+  fclose(fp);
+}
+
+MU_TEST_SUITE(test_extract_suite) {
+  MU_SUITE_CONFIGURE(&test_setup, &test_teardown);
+
+  MU_RUN_TEST(test_extract);
+  MU_RUN_TEST(test_extract_stream);
+}
+
+int main(int argc, char *argv[]) {
+  UNUSED(argc);
+  UNUSED(argv);
+
+  MU_RUN_SUITE(test_extract_suite);
+  MU_REPORT();
+  return MU_EXIT_CODE;
+}
diff --git a/contrib/zip/test/test_miniz.c b/contrib/zip/test/test_miniz.c
deleted file mode 100644
index babcaecdb..000000000
--- a/contrib/zip/test/test_miniz.c
+++ /dev/null
@@ -1,127 +0,0 @@
-// Demonstrates miniz.c's compress() and uncompress() functions
-// (same as zlib's). Public domain, May 15 2011, Rich Geldreich,
-// richgel99@gmail.com. See "unlicense" statement at the end of tinfl.c.
-
-#include <miniz.h>
-#include <stdio.h>
-
-typedef unsigned char uint8;
-typedef unsigned short uint16;
-typedef unsigned int uint;
-
-// The string to compress.
-static const char *s_pStr =
-    "Good morning Dr. Chandra. This is Hal. I am ready for my first lesson."
-    "Good morning Dr. Chandra. This is Hal. I am ready for my first lesson."
-    "Good morning Dr. Chandra. This is Hal. I am ready for my first lesson."
-    "Good morning Dr. Chandra. This is Hal. I am ready for my first lesson."
-    "Good morning Dr. Chandra. This is Hal. I am ready for my first lesson."
-    "Good morning Dr. Chandra. This is Hal. I am ready for my first lesson."
-    "Good morning Dr. Chandra. This is Hal. I am ready for my first lesson.";
-
-int main(int argc, char *argv[]) {
-  uint step = 0;
-  int cmp_status;
-  uLong src_len = (uLong)strlen(s_pStr);
-  uLong uncomp_len = src_len;
-  uLong cmp_len;
-  uint8 *pCmp, *pUncomp;
-  size_t sz;
-  uint total_succeeded = 0;
-  (void)argc, (void)argv;
-
-  printf("miniz.c version: %s\n", MZ_VERSION);
-
-  do {
-    pCmp = (uint8 *)tdefl_compress_mem_to_heap(s_pStr, src_len, &cmp_len, 0);
-    if (!pCmp) {
-      printf("tdefl_compress_mem_to_heap failed\n");
-      return EXIT_FAILURE;
-    }
-    if (src_len <= cmp_len) {
-      printf("tdefl_compress_mem_to_heap failed: from %u to %u bytes\n",
-             (mz_uint32)uncomp_len, (mz_uint32)cmp_len);
-      free(pCmp);
-      return EXIT_FAILURE;
-    }
-
-    sz = tdefl_compress_mem_to_mem(pCmp, cmp_len, s_pStr, src_len, 0);
-    if (sz != cmp_len) {
-      printf("tdefl_compress_mem_to_mem failed: expected %u, got %u\n",
-             (mz_uint32)cmp_len, (mz_uint32)sz);
-      free(pCmp);
-      return EXIT_FAILURE;
-    }
-
-    // Allocate buffers to hold compressed and uncompressed data.
-    free(pCmp);
-    cmp_len = compressBound(src_len);
-    pCmp = (mz_uint8 *)malloc((size_t)cmp_len);
-    pUncomp = (mz_uint8 *)malloc((size_t)src_len);
-    if ((!pCmp) || (!pUncomp)) {
-      printf("Out of memory!\n");
-      return EXIT_FAILURE;
-    }
-
-    // Compress the string.
-    cmp_status =
-        compress(pCmp, &cmp_len, (const unsigned char *)s_pStr, src_len);
-    if (cmp_status != Z_OK) {
-      printf("compress() failed!\n");
-      free(pCmp);
-      free(pUncomp);
-      return EXIT_FAILURE;
-    }
-
-    printf("Compressed from %u to %u bytes\n", (mz_uint32)src_len,
-           (mz_uint32)cmp_len);
-
-    if (step) {
-      // Purposely corrupt the compressed data if fuzzy testing (this is a
-      // very crude fuzzy test).
-      uint n = 1 + (rand() % 3);
-      while (n--) {
-        uint i = rand() % cmp_len;
-        pCmp[i] ^= (rand() & 0xFF);
-      }
-    }
-
-    // Decompress.
-    cmp_status = uncompress(pUncomp, &uncomp_len, pCmp, cmp_len);
-    total_succeeded += (cmp_status == Z_OK);
-
-    if (step) {
-      printf("Simple fuzzy test: step %u total_succeeded: %u\n", step,
-             total_succeeded);
-    } else {
-      if (cmp_status != Z_OK) {
-        printf("uncompress failed!\n");
-        free(pCmp);
-        free(pUncomp);
-        return EXIT_FAILURE;
-      }
-
-      printf("Decompressed from %u to %u bytes\n", (mz_uint32)cmp_len,
-             (mz_uint32)uncomp_len);
-
-      // Ensure uncompress() returned the expected data.
-      if ((uncomp_len != src_len) ||
-          (memcmp(pUncomp, s_pStr, (size_t)src_len))) {
-        printf("Decompression failed!\n");
-        free(pCmp);
-        free(pUncomp);
-        return EXIT_FAILURE;
-      }
-    }
-
-    free(pCmp);
-    free(pUncomp);
-
-    step++;
-
-    // Keep on fuzzy testing if there's a non-empty command line.
-  } while (argc >= 2);
-
-  printf("Success.\n");
-  return EXIT_SUCCESS;
-}
diff --git a/contrib/zip/test/test_open.c b/contrib/zip/test/test_open.c
new file mode 100644
index 000000000..41ab05975
--- /dev/null
+++ b/contrib/zip/test/test_open.c
@@ -0,0 +1,68 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <zip.h>
+
+#include "minunit.h"
+
+#if defined(_WIN32) || defined(_WIN64)
+#define MKTEMP _mktemp
+#else
+#define MKTEMP mkstemp
+#endif
+
+static char ZIPNAME[L_tmpnam + 1] = {0};
+
+void test_setup(void) {
+  strncpy(ZIPNAME, "z-XXXXXX\0", L_tmpnam);
+  MKTEMP(ZIPNAME);
+}
+
+void test_teardown(void) { remove(ZIPNAME); }
+
+MU_TEST(test_openwitherror) {
+  int errnum;
+  struct zip_t *zip =
+      zip_openwitherror(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'r', &errnum);
+  mu_check(zip == NULL);
+  mu_assert_int_eq(ZIP_ERINIT, errnum);
+
+  zip = zip_openwitherror(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w', &errnum);
+  mu_check(zip != NULL);
+  mu_assert_int_eq(0, errnum);
+
+  zip_close(zip);
+}
+
+MU_TEST(test_stream_openwitherror) {
+  int errnum;
+  struct zip_t *zip = zip_stream_openwitherror(
+      NULL, 0, ZIP_DEFAULT_COMPRESSION_LEVEL, 'r', &errnum);
+  mu_check(zip == NULL);
+  mu_assert_int_eq(ZIP_EINVMODE, errnum);
+
+  zip = zip_stream_openwitherror(NULL, 0, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w',
+                                 &errnum);
+  mu_check(zip != NULL);
+  mu_assert_int_eq(0, errnum);
+
+  zip_stream_close(zip);
+}
+
+MU_TEST_SUITE(test_entry_suite) {
+  MU_SUITE_CONFIGURE(&test_setup, &test_teardown);
+
+  MU_RUN_TEST(test_openwitherror);
+  MU_RUN_TEST(test_stream_openwitherror);
+}
+
+#define UNUSED(x) (void)x
+
+int main(int argc, char *argv[]) {
+  UNUSED(argc);
+  UNUSED(argv);
+
+  MU_RUN_SUITE(test_entry_suite);
+  MU_REPORT();
+  return MU_EXIT_CODE;
+}
\ No newline at end of file
diff --git a/contrib/zip/test/test_permissions.c b/contrib/zip/test/test_permissions.c
new file mode 100644
index 000000000..487ff089e
--- /dev/null
+++ b/contrib/zip/test/test_permissions.c
@@ -0,0 +1,191 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+
+#include <zip.h>
+
+#include "minunit.h"
+
+#if defined(_WIN32) || defined(_WIN64)
+#define MKTEMP _mktemp
+#define UNLINK _unlink
+#else
+#define MKTEMP mkstemp
+#define UNLINK unlink
+#endif
+
+static char ZIPNAME[L_tmpnam + 1] = {0};
+static char XFILE[L_tmpnam + 1] = {0};
+static char RFILE[L_tmpnam + 1] = {0};
+static char WFILE[L_tmpnam + 1] = {0};
+
+void test_setup(void) {
+  strncpy(ZIPNAME, "z-XXXXXX\0", L_tmpnam);
+  strncpy(XFILE, "x-XXXXXX\0", L_tmpnam);
+  strncpy(RFILE, "r-XXXXXX\0", L_tmpnam);
+  strncpy(WFILE, "w-XXXXXX\0", L_tmpnam);
+
+  MKTEMP(ZIPNAME);
+  MKTEMP(XFILE);
+  MKTEMP(RFILE);
+  MKTEMP(WFILE);
+}
+
+void test_teardown(void) {
+  UNLINK(WFILE);
+  UNLINK(RFILE);
+  UNLINK(XFILE);
+  UNLINK(ZIPNAME);
+}
+
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#define MZ_FILE_STAT_STRUCT _stat
+#define MZ_FILE_STAT _stat
+#else
+#define MZ_FILE_STAT_STRUCT stat
+#define MZ_FILE_STAT stat
+#endif
+
+#define XMODE 0100777
+#define RMODE 0100444
+#define WMODE 0100666
+#define UNIXMODE 0100600
+
+MU_TEST(test_exe_permissions) {
+  struct MZ_FILE_STAT_STRUCT file_stats;
+
+  const char *filenames[] = {XFILE};
+  FILE *f = fopen(XFILE, "w");
+  fclose(f);
+  chmod(XFILE, XMODE);
+
+  mu_assert_int_eq(0, zip_create(ZIPNAME, filenames, 1));
+  remove(XFILE);
+
+  mu_assert_int_eq(0, zip_extract(ZIPNAME, ".", NULL, NULL));
+
+  mu_assert_int_eq(0, MZ_FILE_STAT(XFILE, &file_stats));
+  mu_assert_int_eq(XMODE, file_stats.st_mode);
+}
+
+MU_TEST(test_read_permissions) {
+  struct MZ_FILE_STAT_STRUCT file_stats;
+
+  const char *filenames[] = {RFILE};
+  FILE *f = fopen(RFILE, "w");
+  fclose(f);
+  chmod(RFILE, RMODE);
+
+  mu_assert_int_eq(0, zip_create(ZIPNAME, filenames, 1));
+  remove(RFILE);
+
+  mu_assert_int_eq(0, zip_extract(ZIPNAME, ".", NULL, NULL));
+  mu_assert_int_eq(0, MZ_FILE_STAT(RFILE, &file_stats));
+  mu_assert_int_eq(RMODE, file_stats.st_mode);
+
+  // chmod from 444 to 666 to be able delete the file on windows
+  chmod(RFILE, WMODE);
+}
+
+MU_TEST(test_write_permissions) {
+  struct MZ_FILE_STAT_STRUCT file_stats;
+
+  const char *filenames[] = {WFILE};
+  FILE *f = fopen(WFILE, "w");
+  fclose(f);
+  chmod(WFILE, WMODE);
+
+  mu_assert_int_eq(0, zip_create(ZIPNAME, filenames, 1));
+  remove(WFILE);
+
+  mu_assert_int_eq(0, zip_extract(ZIPNAME, ".", NULL, NULL));
+  mu_assert_int_eq(0, MZ_FILE_STAT(WFILE, &file_stats));
+  mu_assert_int_eq(WMODE, file_stats.st_mode);
+}
+
+#define TESTDATA1 "Some test data 1...\0"
+
+MU_TEST(test_unix_permissions) {
+  // UNIX or APPLE
+  struct MZ_FILE_STAT_STRUCT file_stats;
+
+  struct zip_t *zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w');
+  mu_check(zip != NULL);
+
+  mu_assert_int_eq(0, zip_entry_open(zip, RFILE));
+  mu_assert_int_eq(0, zip_entry_write(zip, TESTDATA1, strlen(TESTDATA1)));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  zip_close(zip);
+
+  mu_assert_int_eq(0, zip_extract(ZIPNAME, ".", NULL, NULL));
+
+  mu_assert_int_eq(0, MZ_FILE_STAT(RFILE, &file_stats));
+
+  mu_assert_int_eq(UNIXMODE, file_stats.st_mode);
+}
+
+MU_TEST(test_mtime) {
+  struct MZ_FILE_STAT_STRUCT file_stat1, file_stat2;
+
+  const char *filename = "test.data";
+  FILE *stream = NULL;
+  struct zip_t *zip = NULL;
+#if defined(_MSC_VER)
+  if (0 != fopen_s(&stream, filename, "w+"))
+#else
+  if (!(stream = fopen(filename, "w+")))
+#endif
+  {
+    mu_fail("Cannot open filename\n");
+  }
+  fwrite(TESTDATA1, sizeof(char), strlen(TESTDATA1), stream);
+  mu_assert_int_eq(0, fclose(stream));
+
+  memset(&file_stat1, 0, sizeof(file_stat1));
+  memset(&file_stat2, 0, sizeof(file_stat2));
+
+  zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w');
+  mu_check(zip != NULL);
+
+  mu_assert_int_eq(0, zip_entry_open(zip, filename));
+  mu_assert_int_eq(0, zip_entry_fwrite(zip, filename));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  zip_close(zip);
+
+  mu_assert_int_eq(0, MZ_FILE_STAT(filename, &file_stat1));
+  remove(filename);
+
+  mu_assert_int_eq(0, zip_extract(ZIPNAME, ".", NULL, NULL));
+  mu_assert_int_eq(0, MZ_FILE_STAT(filename, &file_stat2));
+  remove(filename);
+
+  fprintf(stdout, "file_stat1.st_mtime: %lu\n", file_stat1.st_mtime);
+  fprintf(stdout, "file_stat2.st_mtime: %lu\n", file_stat2.st_mtime);
+  mu_check(labs(file_stat1.st_mtime - file_stat2.st_mtime) <= 1);
+}
+
+MU_TEST_SUITE(test_permissions_suite) {
+  MU_SUITE_CONFIGURE(&test_setup, &test_teardown);
+
+#if defined(_WIN32) || defined(__WIN32__)
+#else
+  MU_RUN_TEST(test_exe_permissions);
+  MU_RUN_TEST(test_read_permissions);
+  MU_RUN_TEST(test_write_permissions);
+  MU_RUN_TEST(test_unix_permissions);
+#endif
+  MU_RUN_TEST(test_mtime);
+}
+
+#define UNUSED(x) (void)x
+
+int main(int argc, char *argv[]) {
+  UNUSED(argc);
+  UNUSED(argv);
+
+  MU_RUN_SUITE(test_permissions_suite);
+  MU_REPORT();
+  return MU_EXIT_CODE;
+}
diff --git a/contrib/zip/test/test_read.c b/contrib/zip/test/test_read.c
new file mode 100644
index 000000000..7f0ce5072
--- /dev/null
+++ b/contrib/zip/test/test_read.c
@@ -0,0 +1,146 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <zip.h>
+
+#include "minunit.h"
+
+#if defined(_WIN32) || defined(_WIN64)
+#define MKTEMP _mktemp
+#else
+#define MKTEMP mkstemp
+#endif
+
+static char ZIPNAME[L_tmpnam + 1] = {0};
+
+#define CRC32DATA1 2220805626
+#define TESTDATA1 "Some test data 1...\0"
+
+#define TESTDATA2 "Some test data 2...\0"
+#define CRC32DATA2 2532008468
+
+void test_setup(void) {
+  strncpy(ZIPNAME, "z-XXXXXX\0", L_tmpnam);
+  MKTEMP(ZIPNAME);
+
+  struct zip_t *zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w');
+
+  zip_entry_open(zip, "test/test-1.txt");
+  zip_entry_write(zip, TESTDATA1, strlen(TESTDATA1));
+  zip_entry_close(zip);
+
+  zip_entry_open(zip, "test\\test-2.txt");
+  zip_entry_write(zip, TESTDATA2, strlen(TESTDATA2));
+  zip_entry_close(zip);
+
+  zip_entry_open(zip, "test\\empty/");
+  zip_entry_close(zip);
+
+  zip_entry_open(zip, "empty/");
+  zip_entry_close(zip);
+
+  zip_entry_open(zip, "dotfiles/.test");
+  zip_entry_write(zip, TESTDATA2, strlen(TESTDATA2));
+  zip_entry_close(zip);
+
+  zip_close(zip);
+}
+
+void test_teardown(void) { remove(ZIPNAME); }
+
+MU_TEST(test_read) {
+  char *buf = NULL;
+  ssize_t bufsize;
+  size_t buftmp;
+
+  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
+  mu_check(zip != NULL);
+  mu_assert_int_eq(1, zip_is64(zip));
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "test\\test-1.txt"));
+  mu_assert_int_eq(strlen(TESTDATA1), zip_entry_size(zip));
+  mu_check(CRC32DATA1 == zip_entry_crc32(zip));
+  bufsize = zip_entry_read(zip, (void **)&buf, &buftmp);
+  mu_assert_int_eq(strlen(TESTDATA1), bufsize);
+  mu_assert_int_eq((size_t)bufsize, buftmp);
+  mu_assert_int_eq(0, strncmp(buf, TESTDATA1, bufsize));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  free(buf);
+  buf = NULL;
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "test/test-2.txt"));
+  mu_assert_int_eq(strlen(TESTDATA2), zip_entry_size(zip));
+  mu_check(CRC32DATA2 == zip_entry_crc32(zip));
+  bufsize = zip_entry_read(zip, (void **)&buf, NULL);
+  mu_assert_int_eq(strlen(TESTDATA2), (size_t)bufsize);
+  mu_assert_int_eq(0, strncmp(buf, TESTDATA2, (size_t)bufsize));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  free(buf);
+  buf = NULL;
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "test\\empty/"));
+  mu_assert_int_eq(0, strcmp(zip_entry_name(zip), "test/empty/"));
+  mu_assert_int_eq(0, zip_entry_size(zip));
+  mu_assert_int_eq(0, zip_entry_crc32(zip));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  zip_close(zip);
+}
+
+MU_TEST(test_noallocread) {
+  ssize_t bufsize;
+  size_t buftmp = strlen(TESTDATA2);
+  char *buf = calloc(buftmp, sizeof(char));
+
+  struct zip_t *zip = zip_open(ZIPNAME, 0, 'r');
+  mu_check(zip != NULL);
+  mu_assert_int_eq(1, zip_is64(zip));
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "test/test-2.txt"));
+  bufsize = zip_entry_noallocread(zip, (void *)buf, buftmp);
+  mu_assert_int_eq(buftmp, (size_t)bufsize);
+  mu_assert_int_eq(0, strncmp(buf, TESTDATA2, buftmp));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  free(buf);
+  buf = NULL;
+
+  buftmp = strlen(TESTDATA1);
+  buf = calloc(buftmp, sizeof(char));
+  mu_assert_int_eq(0, zip_entry_open(zip, "test/test-1.txt"));
+  bufsize = zip_entry_noallocread(zip, (void *)buf, buftmp);
+  mu_assert_int_eq(buftmp, (size_t)bufsize);
+  mu_assert_int_eq(0, strncmp(buf, TESTDATA1, buftmp));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  free(buf);
+  buf = NULL;
+
+  buftmp = strlen(TESTDATA2);
+  buf = calloc(buftmp, sizeof(char));
+  mu_assert_int_eq(0, zip_entry_open(zip, "dotfiles/.test"));
+  bufsize = zip_entry_noallocread(zip, (void *)buf, buftmp);
+  mu_assert_int_eq(buftmp, (size_t)bufsize);
+  mu_assert_int_eq(0, strncmp(buf, TESTDATA2, buftmp));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  free(buf);
+  buf = NULL;
+
+  zip_close(zip);
+}
+
+MU_TEST_SUITE(test_read_suite) {
+  MU_SUITE_CONFIGURE(&test_setup, &test_teardown);
+
+  MU_RUN_TEST(test_read);
+  MU_RUN_TEST(test_noallocread);
+}
+
+#define UNUSED(x) (void)x
+
+int main(int argc, char *argv[]) {
+  UNUSED(argc);
+  UNUSED(argv);
+
+  MU_RUN_SUITE(test_read_suite);
+  MU_REPORT();
+  return MU_EXIT_CODE;
+}
diff --git a/contrib/zip/test/test_write.c b/contrib/zip/test/test_write.c
new file mode 100644
index 000000000..de028434e
--- /dev/null
+++ b/contrib/zip/test/test_write.c
@@ -0,0 +1,113 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <zip.h>
+
+#include "minunit.h"
+
+#if defined(_WIN32) || defined(_WIN64)
+#define MKTEMP _mktemp
+#define UNLINK _unlink
+#else
+#define MKTEMP mkstemp
+#define UNLINK unlink
+#endif
+
+static char ZIPNAME[L_tmpnam + 1] = {0};
+static char WFILE[L_tmpnam + 1] = {0};
+
+void test_setup(void) {
+  strncpy(ZIPNAME, "z-XXXXXX\0", L_tmpnam);
+  strncpy(WFILE, "w-XXXXXX\0", L_tmpnam);
+
+  MKTEMP(ZIPNAME);
+  MKTEMP(WFILE);
+}
+
+void test_teardown(void) {
+  UNLINK(WFILE);
+  UNLINK(ZIPNAME);
+}
+
+#define CRC32DATA1 2220805626
+#define TESTDATA1 "Some test data 1...\0"
+
+MU_TEST(test_write) {
+  struct zip_t *zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w');
+  mu_check(zip != NULL);
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "test/test-1.txt"));
+  mu_assert_int_eq(0, zip_entry_write(zip, TESTDATA1, strlen(TESTDATA1)));
+  mu_assert_int_eq(0, strcmp(zip_entry_name(zip), "test/test-1.txt"));
+  mu_assert_int_eq(0, zip_entry_index(zip));
+  mu_assert_int_eq(strlen(TESTDATA1), zip_entry_size(zip));
+  mu_check(CRC32DATA1 == zip_entry_crc32(zip));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  mu_assert_int_eq(1, zip_is64(zip));
+
+  zip_close(zip);
+}
+
+MU_TEST(test_write_utf) {
+  struct zip_t *zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w');
+  mu_check(zip != NULL);
+
+  mu_assert_int_eq(0, zip_entry_open(zip, "те�т/Е�ли-б-не-было-войны.txt"));
+  mu_assert_int_eq(0, zip_entry_write(zip, TESTDATA1, strlen(TESTDATA1)));
+  mu_assert_int_eq(
+      0, strcmp(zip_entry_name(zip), "те�т/Е�ли-б-не-было-войны.txt"));
+  mu_assert_int_eq(0, zip_entry_index(zip));
+  mu_assert_int_eq(strlen(TESTDATA1), zip_entry_size(zip));
+  mu_check(CRC32DATA1 == zip_entry_crc32(zip));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+
+  mu_assert_int_eq(1, zip_is64(zip));
+
+  zip_close(zip);
+}
+
+MU_TEST(test_fwrite) {
+  const char *filename = WFILE;
+  FILE *stream = NULL;
+  struct zip_t *zip = NULL;
+#if defined(_MSC_VER)
+  if (0 != fopen_s(&stream, filename, "w+"))
+#else
+  if (!(stream = fopen(filename, "w+")))
+#endif
+  {
+    // Cannot open filename
+    mu_fail("Cannot open filename\n");
+  }
+  fwrite(TESTDATA1, sizeof(char), strlen(TESTDATA1), stream);
+  mu_assert_int_eq(0, fclose(stream));
+
+  zip = zip_open(ZIPNAME, 9, 'w');
+  mu_check(zip != NULL);
+  mu_assert_int_eq(0, zip_entry_open(zip, WFILE));
+  mu_assert_int_eq(0, zip_entry_fwrite(zip, WFILE));
+  mu_assert_int_eq(0, zip_entry_close(zip));
+  mu_assert_int_eq(1, zip_is64(zip));
+
+  zip_close(zip);
+}
+
+MU_TEST_SUITE(test_write_suite) {
+  MU_SUITE_CONFIGURE(&test_setup, &test_teardown);
+
+  MU_RUN_TEST(test_write);
+  MU_RUN_TEST(test_write_utf);
+  MU_RUN_TEST(test_fwrite);
+}
+
+#define UNUSED(x) (void)x
+
+int main(int argc, char *argv[]) {
+  UNUSED(argc);
+  UNUSED(argv);
+
+  MU_RUN_SUITE(test_write_suite);
+  MU_REPORT();
+  return MU_EXIT_CODE;
+}
\ No newline at end of file
diff --git a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt
index e7897d6a1..0e4906cea 100644
--- a/contrib/zlib/CMakeLists.txt
+++ b/contrib/zlib/CMakeLists.txt
@@ -198,9 +198,11 @@ endif(MINGW)
 
 add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
 
-INSTALL( TARGETS zlibstatic
-     EXPORT "${TARGETS_EXPORT_NAME}"
-     LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-     ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-     RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR}
-     COMPONENT ${LIBASSIMP_COMPONENT})
+IF(ASSIMP_INSTALL)
+    INSTALL( TARGETS zlibstatic
+        EXPORT "${TARGETS_EXPORT_NAME}"
+        LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
+        ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
+        RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR}
+        COMPONENT ${LIBASSIMP_COMPONENT})
+ENDIF()
diff --git a/contrib/zlib/gzguts.h b/contrib/zlib/gzguts.h
index 57faf3716..e229b9562 100644
--- a/contrib/zlib/gzguts.h
+++ b/contrib/zlib/gzguts.h
@@ -12,6 +12,15 @@
 #  endif
 #endif
 
+#ifdef _WIN32
+#  ifndef _CRT_SECURE_NO_WARNINGS
+#    define _CRT_SECURE_NO_WARNINGS
+#  endif // _CRT_SECURE_NO_WARNINGS
+#  ifndef _CRT_NONSTDC_NO_DEPRECATE
+#    define _CRT_NONSTDC_NO_DEPRECATE
+#  endif // _CRT_NONSTDC_NO_DEPRECATE
+#endif // _WIN32
+
 #ifdef HAVE_HIDDEN
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
diff --git a/contrib/zlib/gzlib.c b/contrib/zlib/gzlib.c
index 55da46a45..0a577269c 100644
--- a/contrib/zlib/gzlib.c
+++ b/contrib/zlib/gzlib.c
@@ -3,6 +3,15 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#ifdef _WIN32
+#  ifndef _CRT_NONSTDC_NO_DEPRECATE
+#    define _CRT_NONSTDC_NO_DEPRECATE
+#  endif 
+#  ifndef _CRT_SECURE_NO_WARNINGS
+#    define _CRT_SECURE_NO_WARNINGS
+#  endif //_CRT_SECURE_NO_WARNINGS
+#endif // _WIN32
+
 #include "gzguts.h"
 
 #if defined(_WIN32) && !defined(__BORLANDC__)
diff --git a/contrib/zlib/gzread.c b/contrib/zlib/gzread.c
index dd7738159..6c1b5dcf3 100644
--- a/contrib/zlib/gzread.c
+++ b/contrib/zlib/gzread.c
@@ -3,6 +3,15 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#ifdef _WIN32
+#  ifndef _CRT_SECURE_NO_WARNINGS
+#    define _CRT_SECURE_NO_WARNINGS
+#  endif // _CRT_SECURE_NO_WARNINGS
+#  ifndef _CRT_NONSTDC_NO_DEPRECATE
+#    define _CRT_NONSTDC_NO_DEPRECATE
+#  endif // _CRT_NONSTDC_NO_DEPRECATE
+#endif // _WIN32
+
 #include "gzguts.h"
 
 /* Local functions */
diff --git a/contrib/zlib/gzwrite.c b/contrib/zlib/gzwrite.c
index eb8a0e589..d508ede83 100644
--- a/contrib/zlib/gzwrite.c
+++ b/contrib/zlib/gzwrite.c
@@ -2,7 +2,6 @@
  * Copyright (C) 2004-2019 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
-
 #include "gzguts.h"
 
 /* Local functions */
diff --git a/contrib/zlib/zutil.c b/contrib/zlib/zutil.c
index 9543ae825..30bbd2bde 100644
--- a/contrib/zlib/zutil.c
+++ b/contrib/zlib/zutil.c
@@ -23,7 +23,6 @@ z_const char * const z_errmsg[10] = {
     (z_const char *)""
 };
 
-
 const char * ZEXPORT zlibVersion()
 {
     return ZLIB_VERSION;
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 013305088..53a9bd329 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1,108 +1,134 @@
-# Doxyfile 1.8.3.1
+# Doxyfile 1.9.1
 
 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# This tag specifies the encoding used for all characters in the config file 
-# that follow. The default is UTF-8 which is also the encoding used for all 
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
-# iconv built into libc) for the transcoding. See 
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
+# The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
 
-# The PROJECT_NAME tag is a single word (or sequence of words) that should 
-# identify the project. Note that if you do not use Doxywizard you need 
-# to put quotes around the project name if it contains spaces.
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
 
-PROJECT_NAME           = Assimp
+PROJECT_NAME           = "My Project"
 
-# 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 control system is used.
+# 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
+# control system is used.
 
-PROJECT_NUMBER         = "v5.2.2 (January 2022)"
+PROJECT_NUMBER         =
 
-# 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 quick idea about the purpose of the project. Keep the description short.
+# 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
+# quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = The Asset-Importer-Lib API documentation.
+PROJECT_BRIEF          =
 
-# With the PROJECT_LOGO tag one can specify an logo or icon that is 
-# included in the documentation. The maximum height of the logo should not 
-# exceed 55 pixels and the maximum width should not exceed 200 pixels. 
-# Doxygen will copy the logo to the output directory.
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
 
-PROJECT_LOGO           = 
+PROJECT_LOGO           =
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
+# 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
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = 
+OUTPUT_DIRECTORY       =
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
-# otherwise cause performance problems for the file system.
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, 
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English 
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, 
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, 
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
+# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all generated output in the proper direction.
+# Possible values are: None, LTR, RTL and Context.
+# The default value is: None.
+
+OUTPUT_TEXT_DIRECTION  = None
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
+# The default value is: YES.
 
 REPEAT_BRIEF           = YES
 
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
-# "represents" "a" "an" "the"
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
 
-ABBREVIATE_BRIEF       = "The $name class      " \
-                         "The $name widget      " \
-                         "The $name file      " \
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
                          is \
                          provides \
                          specifies \
@@ -112,1742 +138,2519 @@ ABBREVIATE_BRIEF       = "The $name class      " \
                          an \
                          the
 
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
 # description.
+# The default value is: NO.
 
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
+# The default value is: NO.
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
 
-FULL_PATH_NAMES        = NO
+FULL_PATH_NAMES        = YES
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip. Note that you specify absolute paths here, but also 
-# relative paths, which will be relative from the directory where doxygen is 
-# started.
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
-STRIP_FROM_PATH        = @PROJECT_SOURCE_DIR@ \
-                         @PROJECT_BINARY_DIR@
+STRIP_FROM_PATH        =
 
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
 
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_INC_PATH    =
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful if your file system 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like regular Qt-style comments 
-# (thus requiring an explicit @brief command for a brief description.)
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
 
-JAVADOC_AUTOBRIEF      = YES
+JAVADOC_AUTOBRIEF      = NO
 
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
-# interpret the first line (until the first dot) of a Qt-style 
-# comment as the brief description. If set to NO, the comments 
-# will behave just like regular Qt-style comments (thus requiring 
-# an explicit \brief command for a brief description.)
+# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by doxygen.
+# The default value is: NO.
+
+JAVADOC_BANNER         = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
 
 QT_AUTOBRIEF           = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
+# 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.
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
-# be part of the file/class/namespace that contains it.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
 
 SEPARATE_MEMBER_PAGES  = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
 
 TAB_SIZE               = 4
 
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines (in the resulting output). You can put ^^ in the value part of an
+# alias to insert a newline as if a physical newline was in the original file.
+# When you need a literal { or } or , in the value part of an alias you have to
+# escape them by means of a backslash (\), this can lead to conflicts with the
+# commands \{ and \} for these it is advised to use the version @{ and @} or use
+# a double escape (\\{ and \\})
 
-ALIASES                = 
+ALIASES                =
 
-# 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              = 
-
-# 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 instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
+# 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
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Java. For instance, namespaces will be presented as packages, qualified 
-# scopes will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Fortran.
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
-# sources. Doxygen will then generate output that is tailored for 
-# VHDL.
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
-# Doxygen selects the parser to use depending on the extension of the files it 
-# 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++, D, PHP, Objective-C, Python, Fortran, VHDL, C, 
-# C++. 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 
-# that for custom extensions you also need to set FILE_PATTERNS otherwise the 
-# files are not read by doxygen.
+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
 
-EXTENSION_MAPPING      = 
+OPTIMIZE_OUTPUT_SLICE  = NO
 
-# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all 
-# comments according to the Markdown format, which allows for more readable 
-# documentation. See http://daringfireball.net/projects/markdown/ for details. 
-# The output of markdown processing is further processed by doxygen, so you 
-# can mix doxygen, HTML, and XML commands with Markdown formatting. 
-# Disable only in case of backward compatibilities issues.
+# Doxygen selects the parser to use depending on the extension of the files it
+# 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, 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). 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. When specifying no_extension you should add
+# * to the FILE_PATTERNS.
+#
+# Note see also the list of default file extension mappings.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
 
 MARKDOWN_SUPPORT       = YES
 
-# When enabled doxygen tries to link words that correspond to documented classes, 
-# or namespaces to their corresponding documentation. Such a link can be 
-# prevented in individual cases by by putting a % sign in front of the word or 
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 5.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 5
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
 # globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
 
 AUTOLINK_SUPPORT       = YES
 
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
-# to include (a tag file for) the STL sources as input, then you should 
-# set this tag to YES in order to let doxygen match functions declarations and 
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
-# func(std::string) {}). This also makes the inheritance and collaboration 
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
 
-BUILTIN_STL_SUPPORT    = YES
+BUILTIN_STL_SUPPORT    = NO
 
-# If you use Microsoft's C++/CLI language, you should set this option to YES to 
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
+# The default value is: NO.
 
 CPP_CLI_SUPPORT        = NO
 
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
-# Doxygen will parse them like normal C++ but will assume all classes use public 
-# instead of private inheritance when no explicit protection keyword is present.
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
 
 SIP_SUPPORT            = NO
 
-# For Microsoft's IDL there are propget and propput attributes to indicate 
-# getter and setter methods for a property. Setting this option to YES (the 
-# default) will make doxygen replace the get and set methods by a property in 
-# the documentation. This will only work if the methods are indeed getting or 
-# setting a simple type. If this is not the case, or you want to show the 
-# methods anyway, you should set this option to NO.
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
 
 IDL_PROPERTY_SUPPORT   = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
+# The default value is: NO.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
 
 SUBGROUPING            = YES
 
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and 
-# unions are shown inside the group in which they are included (e.g. using 
-# @ingroup) instead of on a separate page (for HTML and Man pages) or 
-# section (for LaTeX and RTF).
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
 
 INLINE_GROUPED_CLASSES = NO
 
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and 
-# unions with only public data fields will be shown inline in the documentation 
-# of the scope in which they are defined (i.e. file, namespace, or group 
-# documentation), provided this scope is documented. If set to NO (the default), 
-# structs, classes, and unions are shown on a separate page (for HTML and Man 
-# pages) or section (for LaTeX and RTF).
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
 
 INLINE_SIMPLE_STRUCTS  = NO
 
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
-# is documented as struct, union, or enum with the name of the typedef. So 
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
-# with name TypeT. When disabled the typedef will appear as a member of a file, 
-# namespace, or class. And the struct will be named TypeS. This can typically 
-# be useful for C code in case the coding convention dictates that all compound 
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
 
-TYPEDEF_HIDES_STRUCT   = YES
+TYPEDEF_HIDES_STRUCT   = NO
 
-# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be 
-# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given 
-# their name and scope. Since this can be an expensive process and often the 
-# same symbol appear multiple times in the code, doxygen keeps a cache of 
-# pre-resolved symbols. If the cache is too small doxygen will become slower. 
-# If the cache is too large, memory is wasted. The cache size is given by this 
-# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0, 
-# corresponding to a cache size of 2^16 = 65536 symbols.
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
 
 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
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
 
-EXTRACT_ALL            = YES
+EXTRACT_ALL            = NO
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PRIVATE        = NO
 
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal 
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIV_VIRTUAL   = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
 # scope will be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PACKAGE        = NO
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
 
-EXTRACT_STATIC         = YES
+EXTRACT_STATIC         = NO
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
 
 EXTRACT_LOCAL_CLASSES  = YES
 
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
 
 EXTRACT_LOCAL_METHODS  = NO
 
-# If this flag is set to YES, the members of anonymous namespaces will be 
-# extracted and appear in the documentation as a namespace called 
-# 'anonymous_namespace{file}', where file will be replaced with the base 
-# name of the file that contains the anonymous namespace. By default 
-# anonymous namespaces are hidden.
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
 
 EXTRACT_ANON_NSPACES   = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
+# 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.
 
-HIDE_UNDOC_MEMBERS     = YES
+RESOLVE_UNNAMED_PARAMS = YES
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
+# 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
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
-HIDE_UNDOC_CLASSES     = YES
+HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# declarations. If set to NO, these declarations will be included in the
 # documentation.
+# The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: 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 
-# and 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
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
 
 HIDE_SCOPE_NAMES       = NO
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
 
-SHOW_INCLUDE_FILES     = NO
+HIDE_COMPOUND_REFERENCE= NO
 
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen 
-# will list include files with double quotes in the documentation 
-# rather than with sharp brackets.
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
 
 FORCE_LOCAL_INCLUDES   = NO
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
 
 SORT_MEMBER_DOCS       = YES
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
 
-SORT_BRIEF_DOCS        = YES
+SORT_BRIEF_DOCS        = NO
 
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen 
-# will sort the (brief and detailed) documentation of class members so that 
-# constructors and destructors are listed first. If set to NO (the default) 
-# the constructors will appear in the respective orders defined by 
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. 
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO 
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
 
 SORT_MEMBERS_CTORS_1ST = NO
 
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
-# hierarchy of group names into alphabetical order. If set to NO (the default) 
-# the group names will appear in their defined order.
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
 
 SORT_GROUP_NAMES       = NO
 
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
 
-SORT_BY_SCOPE_NAME     = YES
+SORT_BY_SCOPE_NAME     = NO
 
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to 
-# do proper type resolution of all parameters of a function it will reject a 
-# match between the prototype and the implementation of a member function even 
-# if there is only one candidate or it is obvious which candidate to choose 
-# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen 
-# will still accept a match between prototype and implementation in such cases.
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
 
 STRICT_PROTO_MATCHING  = NO
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
 
 GENERATE_TESTLIST      = YES
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if section-label ... \endif 
-# and \cond section-label ... \endcond blocks.
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
 
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or macro consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and macros in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
 # list will mention the files that were used to generate the documentation.
+# The default value is: YES.
 
 SHOW_USED_FILES        = YES
 
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
-# This will remove the Files entry from the Quick Index and from the 
-# Folder Tree View (if specified). The default is YES.
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
 
 SHOW_FILES             = YES
 
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
-# Namespaces page.  This will remove the Namespaces entry from the Quick Index 
-# and from the Folder Tree View (if specified). The default is YES.
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
 
 SHOW_NAMESPACES        = YES
 
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from 
-# the version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command <command> <input-file>, where <command> is the value of 
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the program writes to standard output 
-# is used as the file version. See the manual for examples.
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
 
-FILE_VERSION_FILTER    = 
+FILE_VERSION_FILTER    =
 
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed 
-# by doxygen. The layout file controls the global structure of the generated 
-# output files in an output format independent way. To create the layout file 
-# that represents doxygen's defaults, run doxygen with the -l option. 
-# You can optionally specify a file name after the option, if omitted 
-# DoxygenLayout.xml will be used as the name of the layout file.
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
 
-LAYOUT_FILE            = 
+LAYOUT_FILE            =
 
-# The CITE_BIB_FILES tag can be used to specify one or more bib files 
-# containing the references data. This must be a list of .bib files. The 
-# .bib extension is automatically appended if omitted. Using this command 
-# requires the bibtex tool to be installed. See also 
-# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style 
-# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this 
-# feature you need bibtex and perl available in the search path. Do not use 
-# file names with spaces, bibtex cannot handle them.
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
 
-CITE_BIB_FILES         = 
+CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
 
 QUIET                  = NO
 
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
 
 WARN_IF_UNDOCUMENTED   = YES
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
-# The WARN_NO_PARAMDOC option can be enabled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
-# documentation.
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation. If
+# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# The default value is: NO.
 
-WARN_NO_PARAMDOC       = YES
+WARN_NO_PARAMDOC       = NO
 
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
-# be obtained via FILE_VERSION_FILTER)
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# 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
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
 
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
 
-INPUT                  = @doxy_main_page@ \
-                         @PROJECT_SOURCE_DIR@/include/
+INPUT                  =
 
-# This tag can be used to specify the character encoding of the source files 
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
-# also the default input encoding. Doxygen uses libiconv (or the iconv built 
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
-# the list of possible encodings.
+# 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.
+# The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh 
-# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py 
-# *.f90 *.f *.for *.vhd *.vhdl
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# 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 (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 \
-                         *.dox
+                         *.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 turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
 
-RECURSIVE              = YES
+RECURSIVE              = NO
 
-# The EXCLUDE tag can be used to specify files and/or directories that should be 
-# excluded from the INPUT source files. This way you can easily exclude a 
-# subdirectory from a directory tree whose root is specified with the INPUT tag. 
-# Note that relative paths are relative to the directory from which doxygen is 
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = contrib/*
+EXCLUDE                =
 
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or 
-# directories that are symbolic links (a Unix file system feature) are excluded 
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
+# The default value is: NO.
 
 EXCLUDE_SYMLINKS       = NO
 
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories. Note that the wildcards are matched 
-# against the file with absolute path, so to exclude all test directories 
-# for example use the pattern */test/*
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */.git/* 
+EXCLUDE_PATTERNS       =
 
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
-# (namespaces, classes, functions, etc.) that should be excluded from the 
-# output. The symbol name can be a fully qualified name, a word, or if the 
-# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
 
-EXCLUDE_SYMBOLS        = 
+EXCLUDE_SYMBOLS        =
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
 
-EXAMPLE_PATH           = 
+EXAMPLE_PATH           =
 
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
 
 EXAMPLE_PATTERNS       = *
 
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
 
 EXAMPLE_RECURSIVE      = NO
 
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
 
-IMAGE_PATH             = 
+IMAGE_PATH             =
 
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
-# ignored.
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
-INPUT_FILTER           = 
+INPUT_FILTER           =
 
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis.  Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match.  The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty or if 
-# non of the patterns match the file name, INPUT_FILTER is applied.
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
-FILTER_PATTERNS        = 
+FILTER_PATTERNS        =
 
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
 
 FILTER_SOURCE_FILES    = NO
 
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file 
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) 
-# and it is also possible to disable source filtering for a specific pattern 
-# using *.ext= (so without naming a filter). This option only has effect when 
-# FILTER_SOURCE_FILES is enabled.
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
 
-FILTER_SOURCE_PATTERNS = 
+FILTER_SOURCE_PATTERNS =
 
-# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that 
-# is part of the input, its contents will be placed on the main page (index.html). 
-# This can be useful if you have a project on for instance GitHub and want reuse 
-# the introduction page also for the doxygen output.
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (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 = 
+USE_MDFILE_AS_MAINPAGE =
 
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
 
 SOURCE_BROWSER         = NO
 
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
 
 INLINE_SOURCES         = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C, C++ and Fortran comments will always remain visible.
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES 
-# then for each documented function all documented 
-# functions referencing it will be listed.
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# entity all documented functions referencing it will be listed.
+# The default value is: NO.
 
 REFERENCED_BY_RELATION = NO
 
-# If the REFERENCES_RELATION tag is set to YES 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
 
 REFERENCES_RELATION    = NO
 
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
-# link to the source code.  Otherwise they will link to the documentation.
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
 
 REFERENCES_LINK_SOURCE = YES
 
-# If the USE_HTAGS tag is set to YES then the references to source code 
-# will point to the HTML generated by the htags(1) tool instead of doxygen 
-# built-in source browser. The htags tool is part of GNU's global source 
-# tagging system (see http://www.gnu.org/software/global/global.html). You 
-# will need version 4.8.6 or higher.
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see https://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
 
 USE_HTAGS              = NO
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
 
-VERBATIM_HEADERS       = 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
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
+# 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
+# while generating the index headers.
+# 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 one or more prefixes that 
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
 
-GENERATE_HTML          = NO
+GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_OUTPUT            = @HTML_OUTPUT@
+HTML_OUTPUT            = html
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header. Note that when using a custom header you are responsible  
-# for the proper inclusion of any scripts and style sheets that doxygen 
-# needs, which is dependent on the configuration options used. 
-# It is advised to generate a default header using "doxygen -w html 
-# header.html footer.html stylesheet.css YourConfigFile" and then modify 
-# that header. Note that the header is subject to change so you typically 
-# have to redo this when upgrading to a newer version of doxygen or when 
-# changing the value of configuration settings such as GENERATE_TREEVIEW!
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_HEADER            = 
+HTML_HEADER            =
 
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_FOOTER            = 
+HTML_FOOTER            =
 
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If left blank doxygen will 
-# generate a default style sheet. Note that it is recommended to use 
-# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this 
-# tag will in the future become obsolete.
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-# HTML_STYLESHEET        =  @CMAKE_CURRENT_SOURCE_DIR@/style.css
+HTML_STYLESHEET        =
 
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional 
-# user-defined cascading style sheet that is included after the standard 
-# style sheets created by doxygen. Using this option one can overrule 
-# certain style aspects. This is preferred over using HTML_STYLESHEET 
-# since it does not replace the standard style sheet and is therefor more 
-# robust against future updates. Doxygen will copy the style sheet file to 
-# the output directory.
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = 
+HTML_EXTRA_STYLESHEET  =
 
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or 
-# other source files which should be copied to the HTML output directory. Note 
-# that these files will be copied to the base HTML output directory. Use the 
-# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these 
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that 
-# the files will be copied as-is; there are no commands or markers available.
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_FILES       = 
+HTML_EXTRA_FILES       =
 
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. 
-# Doxygen will adjust the colors in the style sheet and background images 
-# according to this color. Hue is specified as an angle on a colorwheel, 
-# see http://en.wikipedia.org/wiki/Hue for more information. 
-# For instance the value 0 represents red, 60 is yellow, 120 is green, 
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. 
-# The allowed range is 0 to 359.
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_HUE    = 220
 
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of 
-# the colors in the HTML output. For a value of 0 the output will use 
-# grayscales only. A value of 255 will produce the most vivid colors.
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_SAT    = 100
 
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to 
-# the luminance component of the colors in the HTML output. Values below 
-# 100 gradually make the output lighter, whereas values above 100 make 
-# the output darker. The value divided by 100 is the actual gamma applied, 
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, 
-# and 100 does not change the gamma.
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_GAMMA  = 80
 
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML 
-# page will contain the date and time when the page was generated. Setting 
-# this to NO can help when comparing the output of multiple runs.
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_TIMESTAMP         = YES
+HTML_TIMESTAMP         = NO
 
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
-# documentation will contain sections that can be hidden and shown after the 
+# 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
+# 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,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
 # page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_DYNAMIC_SECTIONS  = NO
 
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of 
-# entries shown in the various tree structured indices initially; the user 
-# can expand and collapse entries dynamically later on. Doxygen will expand 
-# the tree to such a level that at most the specified number of entries are 
-# visible (unless a fully collapsed tree already exceeds this amount). 
-# So setting the number of entries 1 will produce a full collapsed tree by 
-# default. 0 is a special value representing an infinite number of entries 
-# and will result in a full expanded tree by default.
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 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, 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 http://developer.apple.com/tools/creatingdocsetswithdoxygen.html 
-# for more information.
+# 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
+# ~/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.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_DOCSET        = NO
 
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
-# feed. A documentation feed provides an umbrella under which multiple 
-# documentation sets from a single provider (such as a company or product suite) 
-# can be grouped.
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
-# should uniquely identify the documentation set bundle. This should be a 
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
-# will append .docset to the name.
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely 
-# identify the documentation publisher. This should be a reverse domain-name 
-# style string, e.g. com.mycompany.MyDocSet.documentation.
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_NAME  = Publisher
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
-# of the generated HTML documentation.
+# 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.
+#
+# 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
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_HTMLHELP      = @MICROSOFT_HELP_WORKSHOP@
+GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
 # written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               = AssimpDoc.chm
+CHM_FILE               =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-HHC_LOCATION           = "C:\Program Files (x86)\HTML Help Workshop/hhc.exe"
+HHC_LOCATION           =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the main .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
-# content.
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_INDEX_ENCODING     = 
+CHM_INDEX_ENCODING     =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 TOC_EXPAND             = NO
 
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and 
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated 
-# that can be used as input for Qt's qhelpgenerator to generate a 
-# Qt Compressed Help (.qch) of the generated HTML documentation.
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_QHP           = NO
 
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
-# be used to specify the file name of the resulting .qch file. 
-# The path specified is relative to the HTML output folder.
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
-QCH_FILE               = 
+QCH_FILE               =
 
-# The QHP_NAMESPACE tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#namespace
+# 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).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 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 
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+# 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).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_VIRTUAL_FOLDER     = doc
 
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to 
-# add. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
+# 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).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_CUST_FILTER_NAME   = 
+QHP_CUST_FILTER_NAME   =
 
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the 
-# custom filter to add. For more information please see 
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters"> 
-# Qt Help Project / Custom Filters</a>.
+# 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).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_CUST_FILTER_ATTRS  = 
+QHP_CUST_FILTER_ATTRS  =
 
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this 
-# project's 
-# filter section matches. 
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes"> 
-# Qt Help Project / Filter Attributes</a>.
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_SECT_FILTER_ATTRS  = 
+QHP_SECT_FILTER_ATTRS  =
 
-# If the GENERATE_QHP tag is set to YES, 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           = 
+QHG_LOCATION           =
 
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files  
-# will be generated, which together with the HTML files, form an Eclipse help 
-# plugin. To install this plugin and make it available under the help contents 
-# menu in Eclipse, the contents of the directory containing the HTML and XML 
-# files needs to be copied into the plugins directory of eclipse. The name of 
-# the directory within the plugins directory should be the same as 
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before 
-# the help appears.
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_ECLIPSEHELP   = NO
 
-# A unique identifier for the eclipse help plugin. When installing the plugin 
-# the directory name containing the HTML and XML files should also have 
-# this name.
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
 
 ECLIPSE_DOC_ID         = org.doxygen.Project
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) 
-# at top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it. Since the tabs have the same information as the 
-# navigation tree you can set this option to NO if you already set 
-# GENERATE_TREEVIEW to YES.
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 DISABLE_INDEX          = NO
 
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
-# structure should be generated to display hierarchical information. 
-# If the tag value is set to YES, a side panel will be generated 
-# containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). 
-# Windows users are probably better off using the HTML help feature. 
-# Since the tree basically has the same information as the tab index you 
-# could consider to set DISABLE_INDEX to NO when enabling this option.
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_TREEVIEW      = YES
+GENERATE_TREEVIEW      = NO
 
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values 
-# (range [0,1..20]) that doxygen will group on one line in the generated HTML 
-# documentation. Note that a value of 0 will completely suppress the enum 
-# values from appearing in the overview section.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 ENUM_VALUES_PER_LINE   = 4
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 TREEVIEW_WIDTH         = 250
 
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open 
-# links to external symbols imported via tag files in a separate window.
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 EXT_LINKS_IN_WINDOW    = NO
 
-# Use this tag to change the font size of Latex formulas included 
-# as images in the HTML documentation. The default is 10. Note that 
-# when you change the font size after a successful doxygen run you need 
-# to manually remove any form_*.png images from the HTML output directory 
-# to force them to be regenerated.
+# 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
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images 
-# generated for formulas are transparent PNGs. Transparent PNGs are 
-# not supported properly for IE 6.0, but are supported on all modern browsers. 
-# Note that when changing this option you need to delete any form_*.png files 
-# in the HTML output before the changes have effect.
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_TRANSPARENT    = YES
 
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax 
-# (see http://www.mathjax.org) which uses client side Javascript for the 
-# rendering instead of using prerendered 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 to it using the MATHJAX_RELPATH option.
+# 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
+# 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
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 USE_MATHJAX            = NO
 
-# When MathJax is enabled you can set the default output format to be used for 
-# thA MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and 
-# SVG. The default value is HTML-CSS, which is slower, but has the best 
-# compatibility.
+# 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/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.
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_FORMAT         = HTML-CSS
 
-# When MathJax is enabled you need to specify the location relative to the 
-# HTML output directory using the MATHJAX_RELPATH option. The destination 
-# directory should contain the MathJax.js script. For instance, if the mathjax 
-# directory is located at the same level as the HTML output directory, then 
-# MATHJAX_RELPATH should be ../mathjax. The default value points to 
-# the MathJax 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 http://www.mathjax.org before deployment.
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# 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://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
+MATHJAX_RELPATH        = https://cdn.jsdelivr.net/npm/mathjax@2
 
-# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension 
-# names that should be enabled during MathJax rendering.
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_EXTENSIONS     = 
+MATHJAX_EXTENSIONS     =
 
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box 
-# for the HTML output. The underlying search engine uses javascript 
-# and DHTML and should work on any modern browser. Note that when using 
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets 
-# (GENERATE_DOCSET) there is already a search function so this one should 
-# typically be disabled. For large projects the javascript based search engine 
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+# 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/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.
 
-SEARCHENGINE           = NO
+MATHJAX_CODEFILE       =
 
-# 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 are two flavours of web server based search 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 and searching needs to be provided by external tools. 
-# See the manual for details.
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+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
+# 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
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 SERVER_BASED_SEARCH    = NO
 
-# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP 
-# script for searching. Instead the search results are written to an XML file 
-# which needs to be processed by an external indexer. Doxygen will invoke an 
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain 
-# the search results. Doxygen ships with an example indexer (doxyindexer) and 
-# search engine (doxysearch.cgi) which are based on the open source search engine 
-# library Xapian. See the manual for configuration details.
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# 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.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 EXTERNAL_SEARCH        = NO
 
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server 
-# which will returned the search results when EXTERNAL_SEARCH is enabled. 
-# Doxygen ships with an example search engine (doxysearch) which is based on 
-# the open source search engine library Xapian. See the manual for configuration 
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# 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.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
-SEARCHENGINE_URL       = 
+SEARCHENGINE_URL       =
 
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed 
-# search data is written to a file for indexing by an external tool. With the 
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
 # SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 SEARCHDATA_FILE        = searchdata.xml
 
-# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the 
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is 
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple 
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
 # projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
-EXTERNAL_SEARCH_ID     = 
+EXTERNAL_SEARCH_ID     =
 
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen 
-# projects other than the one defined by this configuration file, but that are 
-# all added to the same external search index. Each project needs to have a 
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id 
-# of to a relative location where the documentation can be found. 
-# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
-EXTRA_SEARCH_MAPPINGS  = 
+EXTRA_SEARCH_MAPPINGS  =
 
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
 
-GENERATE_LATEX         = NO
+GENERATE_LATEX         = YES
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_OUTPUT           = latex
 
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name. 
-# Note that when enabling USE_PDFLATEX this option is only used for 
-# generating bitmaps for formulas in the HTML output, but not in the 
-# Makefile that is written to the output directory.
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_CMD_NAME         = latex
+LATEX_CMD_NAME         =
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX. In case there is no backslash (\) as first character
+# it will be automatically added in the LaTeX code.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_MAKEINDEX_CMD    = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, letter, legal and 
-# executive. If left blank a4wide will be used.
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-PAPER_TYPE             = a4wide
+PAPER_TYPE             = a4
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-EXTRA_PACKAGES         = 
+EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_HEADER           = 
+LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for 
-# the generated latex document. The footer should contain everything after 
-# the last chapter. If it is left blank doxygen will generate a 
-# standard footer. Notice: only use this tag if you know what you are doing!
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_FOOTER           = 
+LATEX_FOOTER           =
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-PDF_HYPERLINKS         = NO
+LATEX_EXTRA_STYLESHEET =
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
-# higher quality PDF documentation.
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-USE_PDFLATEX           = NO
+LATEX_EXTRA_FILES      =
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# 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.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HIDE_INDICES     = NO
 
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include 
-# source code with syntax highlighting in the LaTeX output. 
-# Note that which sources are shown also depends on other settings 
-# such as SOURCE_BROWSER.
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_SOURCE_CODE      = NO
 
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the 
-# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See 
-# http://en.wikipedia.org/wiki/BibTeX for more info.
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BIB_STYLE        = plain
 
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EMOJI_DIRECTORY  =
+
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_HYPERLINKS         = NO
 
-# Load style sheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
 # replacements, missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_STYLESHEET_FILE    = 
+RTF_STYLESHEET_FILE    =
 
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_EXTENSIONS_FILE    = 
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
 
-GENERATE_XML           = YES
+GENERATE_XML           = NO
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_OUTPUT             = xml
 
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_PROGRAMLISTING     = YES
 
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_NS_MEMB_FILE_SCOPE = NO
+
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-MACRO_EXPANSION        = YES
+MACRO_EXPANSION        = NO
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_DEFINED tags.
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-EXPAND_ONLY_PREDEF     = YES
+EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# pointed to by INCLUDE_PATH will be searched when a #include is found.
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SEARCH_INCLUDES        = YES
 
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           = 
+INCLUDE_PATH           =
 
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  =
 
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = ASSIMP_DOXYGEN_BUILD=1 \
-                         __cplusplus
+PREDEFINED             =
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition that 
-# overrules the definition found in the source code.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-EXPAND_AS_DEFINED      = C_STRUCT \
-                         C_ENUM
+EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all references to function-like macros 
-# that are alone on a line, have an all uppercase name, and do not end with a 
-# semicolon, because these will confuse the parser if not removed.
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles. For each 
-# tag file the location of the external documentation should be added. The 
-# format of a tag file without this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths 
-# or URLs. Note that each tag file must have a unique name (where the name does 
-# NOT include the path). If a tag file is not located in the directory in which 
-# doxygen is run, you must also specify the path to the tagfile here.
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
 
-TAGFILES               = 
+TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
 
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
 
 EXTERNAL_GROUPS        = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
 
-PERL_PATH              = /usr/bin/perl
+EXTERNAL_PAGES         = YES
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# this option also works with HAVE_DOT disabled, but it is recommended to 
-# install and use dot, since it yields more powerful graphs.
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
 
-CLASS_DIAGRAMS         = NO
+CLASS_DIAGRAMS         = YES
 
-# You can define message sequence charts within doxygen comments using the \msc 
-# command. Doxygen will then run the mscgen tool (see 
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
-# the mscgen tool resides. If left empty the tool is assumed to be found in the 
-# default search path.
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
 
-MSCGEN_PATH            = 
+DIA_PATH               =
 
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
 
 HIDE_UNDOC_RELATIONS   = YES
 
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, 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)
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# 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.
 
 HAVE_DOT               = NO
 
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is 
-# allowed to run in parallel. When set to 0 (the default) doxygen will 
-# base this on the number of processors available in the system. You can set it 
-# explicitly to a value larger than 0 to get control over the balance 
-# between CPU load and processing speed.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_NUM_THREADS        = 0
 
-# By default doxygen will use the Helvetica font for all dot files that 
-# doxygen generates. When you want a differently looking font you can specify 
-# the font name using DOT_FONTNAME. You need to make sure dot is able to find 
-# the font, which can be done by putting it in a standard location or by setting 
-# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the 
-# directory containing the font.
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTNAME           = FreeSans
+DOT_FONTNAME           = Helvetica
 
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
-# The default size is 10pt.
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTSIZE           = 10
 
-# By default doxygen will tell dot to use the Helvetica font. 
-# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to 
-# set the path where dot can find it.
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTPATH           = 
+DOT_FONTPATH           =
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = YES
 
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for groups, showing the direct groups dependencies
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GROUP_GRAPHS           = YES
 
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LOOK               = NO
 
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside 
-# the class node. If there are many fields or methods and many nodes the 
-# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS 
-# threshold limits the number of items for each type to make the size more 
-# manageable. Set this to 0 for no limit. Note that the threshold may be 
-# exceeded by 50% before the limit is enforced.
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# 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 UML_LOOK is set to YES.
 
 UML_LIMIT_NUM_FIELDS   = 10
 
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
+# 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.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 TEMPLATE_RELATIONS     = NO
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDE_GRAPH          = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
-# doxygen will generate a call dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable call graphs 
-# for selected functions only using the \callgraph command.
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALL_GRAPH             = NO
 
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
-# doxygen will generate a caller dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable caller 
-# graphs for selected functions only using the \callergraph command.
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALLER_GRAPH           = NO
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graphical hierarchy of all classes instead of a textual one.
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES 
-# then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include 
-# relations between the files in the directories.
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = YES
 
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are svg, png, jpg, or gif. 
-# If left blank png will be used. 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).
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# 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,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_IMAGE_FORMAT       = png
 
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to 
-# enable generation of interactive SVG images that allow zooming and panning. 
-# Note that this requires a modern browser other than Internet Explorer. 
-# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you 
-# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files 
-# visible. Older versions of IE do not have SVG support.
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INTERACTIVE_SVG        = NO
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_PATH               = 
+DOT_PATH               =
 
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
 
-DOTFILE_DIRS           = 
+DOTFILE_DIRS           =
 
-# The MSCFILE_DIRS tag can be used to specify one or more directories that 
-# contain msc files that are included in the documentation (see the 
-# \mscfile command).
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
 
-MSCFILE_DIRS           = 
+MSCFILE_DIRS           =
 
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
-# nodes that will be shown in the graph. If the number of nodes in a graph 
-# becomes larger than this value, doxygen will truncate the graph, which is 
-# visualized by representing a node as a red box. Note that doxygen if the 
-# number of direct children of the root node in a graph is already larger than 
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_GRAPH_MAX_NODES    = 50
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that the size of a graph can be further restricted by 
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
-MAX_DOT_GRAPH_DEPTH    = 1000
+MAX_DOT_GRAPH_DEPTH    = 0
 
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, because dot on Windows does not 
-# seem to support this out of the box. Warning: Depending on the platform used, 
-# enabling this option may lead to badly anti-aliased labels on the edges of 
-# a graph (i.e. they become hard to read).
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_TRANSPARENT        = NO
 
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
-# files in one run (i.e. multiple -o and -T options on the command line). This 
-# makes dot run faster, but since only newer versions of dot (>1.8.10) 
-# support this, this feature is disabled by default.
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_MULTI_TARGETS      = NO
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
+# 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.
 
 DOT_CLEANUP            = YES
diff --git a/doc/Fileformats.md b/doc/Fileformats.md
index 118d798f2..50d2d5e69 100644
--- a/doc/Fileformats.md
+++ b/doc/Fileformats.md
@@ -12,7 +12,6 @@ __Importers__:
 - ASE
 - ASK
 - B3D
-- [BLEND](https://en.wikipedia.org/wiki/.blend_(file_format))
 - [BVH](https://en.wikipedia.org/wiki/Biovision_Hierarchy)
 - CSM
 - COB
@@ -29,6 +28,7 @@ __Importers__:
   + KHR_texture_transform ( 5.1 under test )
 - HMB
 - IFC-STEP
+- IQM
 - IRR / IRRMESH
 - [LWO](https://en.wikipedia.org/wiki/LightWave_3D)
 - LWS
@@ -60,12 +60,16 @@ __Importers__:
 - [STL](https://en.wikipedia.org/wiki/STL_(file_format))
 - TER
 - UC
+- [USD](https://en.wikipedia.org/wiki/Universal_Scene_Description)
 - VTA
 - X
 - [X3D](https://en.wikipedia.org/wiki/X3D)
 - XGL
 - ZGL
 
+Note: support for [BLEND](https://en.wikipedia.org/wiki/.blend_(file_format)) is deprecated.
+It is too time-consuming to maintain an undocumented format which contains so much more than we need.
+
 Additionally, some formats are supported by dependency on non-free code or external SDKs (not built by default):
 
 - [C4D](https://en.wikipedia.org/wiki/Cinema_4D) (https://github.com/assimp/assimp/wiki/Cinema4D-&-Melange) IMporting geometry + node hierarchy are currently supported
diff --git a/doc/dox.h b/doc/dox.h
index 1d5f59aa4..2fb127a2b 100644
--- a/doc/dox.h
+++ b/doc/dox.h
@@ -1545,7 +1545,7 @@ Don't trust the input data! Check all offsets!
 Mixed stuff for internal use by loaders, mostly documented (most of them are already included by <i>AssimpPCH.h</i>):
 <ul>
 <li><b>ByteSwapper</b> (<i>ByteSwapper.h</i>) - manual byte swapping stuff for binary loaders.</li>
-<li><b>StreamReader</b> (<i>StreamReader.h</i>) - safe, endianess-correct, binary reading.</li>
+<li><b>StreamReader</b> (<i>StreamReader.h</i>) - safe, endianness-correct, binary reading.</li>
 <li><b>IrrXML</b> (<i>irrXMLWrapper.h</i>)  - for XML-parsing (SAX.</li>
 <li><b>CommentRemover</b> (<i>RemoveComments.h</i>) - remove single-line and multi-line comments from a text file.</li>
 <li>fast_atof, strtoul10, strtoul16, SkipSpaceAndLineEnd, SkipToNextToken .. large family of low-level
diff --git a/fuzz/assimp_fuzzer.cc b/fuzz/assimp_fuzzer.cc
index e347f59cb..e3d1b5051 100644
--- a/fuzz/assimp_fuzzer.cc
+++ b/fuzz/assimp_fuzzer.cc
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2023, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -47,12 +47,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Assimp;
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize) {
-    aiLogStream stream = aiGetPredefinedLogStream(aiDefaultLogStream_STDOUT,NULL);
+#ifdef _DEBUG
+    aiLogStream stream = aiGetPredefinedLogStream(aiDefaultLogStream_STDOUT, nullptr);
     aiAttachLogStream(&stream);
+#endif
 
     Importer importer;
-    const aiScene *sc = importer.ReadFileFromMemory(data, dataSize,
-        aiProcessPreset_TargetRealtime_Quality, nullptr );
+    unsigned int flags = aiProcessPreset_TargetRealtime_Quality | aiProcess_ValidateDataStructure;
+    const aiScene *sc = importer.ReadFileFromMemory(data, dataSize, flags, nullptr);
 
     if (sc == nullptr) {
         return 0;
@@ -60,8 +62,10 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize) {
 
     Exporter exporter;
     exporter.ExportToBlob(sc, "fbx");
-    
+
+#ifdef _DEBUG
     aiDetachLogStream(&stream);
+#endif
 
     return 0;
 }
diff --git a/include/assimp/Base64.hpp b/include/assimp/Base64.hpp
index 10288713c..2c26932ae 100644
--- a/include/assimp/Base64.hpp
+++ b/include/assimp/Base64.hpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/BaseImporter.h b/include/assimp/BaseImporter.h
index f9df32b32..45cb527ea 100644
--- a/include/assimp/BaseImporter.h
+++ b/include/assimp/BaseImporter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -95,7 +95,7 @@ public:
     BaseImporter() AI_NO_EXCEPT;
 
     /** Destructor, private as well */
-    virtual ~BaseImporter();
+    virtual ~BaseImporter() = default;
 
     // -------------------------------------------------------------------
     /** Returns whether the class can handle the format of the given file.
@@ -277,7 +277,8 @@ public: // static utilities
             const std::string &pFile,
             const char *ext0,
             const char *ext1 = nullptr,
-            const char *ext2 = nullptr);
+            const char *ext2 = nullptr,
+            const char *ext3 = nullptr);
 
     // -------------------------------------------------------------------
     /** @brief Check whether a file has one of the passed file extensions
diff --git a/include/assimp/Bitmap.h b/include/assimp/Bitmap.h
index 2678b5f64..815c964a2 100644
--- a/include/assimp/Bitmap.h
+++ b/include/assimp/Bitmap.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/BlobIOSystem.h b/include/assimp/BlobIOSystem.h
index 7e8d46a53..4f554fdfd 100644
--- a/include/assimp/BlobIOSystem.h
+++ b/include/assimp/BlobIOSystem.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/ByteSwapper.h b/include/assimp/ByteSwapper.h
index 488f7a51d..bb15ea43a 100644
--- a/include/assimp/ByteSwapper.h
+++ b/include/assimp/ByteSwapper.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -58,7 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <cstdlib>
 #endif
 
-namespace Assimp    {
+namespace Assimp {
 // --------------------------------------------------------------------------------------
 /** Defines some useful byte order swap routines.
  *
@@ -66,10 +65,10 @@ namespace Assimp    {
  * and vice versa. Direct use of this class is DEPRECATED. Use #StreamReader instead. */
 // --------------------------------------------------------------------------------------
 class ByteSwap {
-    ByteSwap() AI_NO_EXCEPT {}
+    ByteSwap() AI_NO_EXCEPT = default;
+    ~ByteSwap() = default;
 
 public:
-
     // ----------------------------------------------------------------------
     /** Swap two bytes of data
      *  @param[inout] _szOut A void* to save the reintcasts for the caller. */
@@ -89,8 +88,7 @@ public:
     // ----------------------------------------------------------------------
     /** Swap four bytes of data
      *  @param[inout] _szOut A void* to save the reintcasts for the caller. */
-    static inline void Swap4(void* _szOut)
-    {
+    static inline void Swap4(void* _szOut) {
         ai_assert(_szOut);
 
 #if _MSC_VER >= 1400
@@ -263,7 +261,7 @@ struct ByteSwapper<T,false> {
 };
 
 // --------------------------------------------------------------------------------------------
-template <bool SwapEndianess, typename T, bool RuntimeSwitch>
+template <bool SwapEndianness, typename T, bool RuntimeSwitch>
 struct Getter {
     void operator() (T* inout, bool le) {
 #ifdef AI_BUILD_BIG_ENDIAN
@@ -278,12 +276,12 @@ struct Getter {
     }
 };
 
-template <bool SwapEndianess, typename T>
-struct Getter<SwapEndianess,T,false> {
+template <bool SwapEndianness, typename T>
+struct Getter<SwapEndianness,T,false> {
 
     void operator() (T* inout, bool /*le*/) {
         // static branch
-        ByteSwapper<T,(SwapEndianess && sizeof(T)>1)> () (inout);
+        ByteSwapper<T,(SwapEndianness && sizeof(T)>1)> () (inout);
     }
 };
 } // end Intern
diff --git a/include/assimp/ColladaMetaData.h b/include/assimp/ColladaMetaData.h
index 52eb3c508..451c82899 100644
--- a/include/assimp/ColladaMetaData.h
+++ b/include/assimp/ColladaMetaData.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/CreateAnimMesh.h b/include/assimp/CreateAnimMesh.h
index e5211f504..5a258a300 100644
--- a/include/assimp/CreateAnimMesh.h
+++ b/include/assimp/CreateAnimMesh.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/DefaultIOStream.h b/include/assimp/DefaultIOStream.h
index 67cba3c5c..cbc1cb405 100644
--- a/include/assimp/DefaultIOStream.h
+++ b/include/assimp/DefaultIOStream.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/DefaultIOSystem.h b/include/assimp/DefaultIOSystem.h
index 8545e75cf..5b50b10a4 100644
--- a/include/assimp/DefaultIOSystem.h
+++ b/include/assimp/DefaultIOSystem.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/IOSystem.hpp>
 
-namespace Assimp    {
+namespace Assimp {
 
 // ---------------------------------------------------------------------------
 /** Default implementation of IOSystem using the standard C file functions */
diff --git a/include/assimp/DefaultLogger.hpp b/include/assimp/DefaultLogger.hpp
index 723097ff2..ef8ad2c5a 100644
--- a/include/assimp/DefaultLogger.hpp
+++ b/include/assimp/DefaultLogger.hpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -56,6 +56,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "NullLogger.hpp"
 #include <vector>
 
+#ifndef ASSIMP_BUILD_SINGLETHREADED
+#include <mutex>
+#include <thread>
+#endif
+
 namespace Assimp {
 // ------------------------------------------------------------------------------------
 class IOStream;
@@ -103,6 +108,9 @@ public:
      *  your needs. If the provided message formatting is OK for you,
      *  it's much easier to use #create() and to attach your own custom
      *  output streams to it.
+     *  Since set is intended to be used for custom loggers, the user is
+     *  responsible for instantiation and destruction (new / delete).
+     *  Before deletion of the custom logger, set(nullptr); must be called.
      *  @param logger Pass NULL to setup a default NullLogger*/
     static void set(Logger *logger);
 
@@ -120,8 +128,8 @@ public:
     static bool isNullLogger();
 
     // ----------------------------------------------------------------------
-    /** @brief  Kills the current singleton logger and replaces it with a
-     *  #NullLogger instance. */
+    /** @brief  Kills and deletes the current singleton logger and replaces
+     *  it with a #NullLogger instance. */
     static void kill();
 
     // ----------------------------------------------------------------------
@@ -181,6 +189,10 @@ private:
     //! Attached streams
     StreamArray m_StreamArray;
 
+#ifndef ASSIMP_BUILD_SINGLETHREADED
+    std::mutex m_arrayMutex;
+#endif
+
     bool noRepeatMsg;
     char lastMsg[MAX_LOG_MESSAGE_LENGTH * 2];
     size_t lastLen;
diff --git a/include/assimp/Exceptional.h b/include/assimp/Exceptional.h
index ec3d38c5a..d0f851a60 100644
--- a/include/assimp/Exceptional.h
+++ b/include/assimp/Exceptional.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/include/assimp/Exporter.hpp b/include/assimp/Exporter.hpp
index 09a459442..ae1eb89cc 100644
--- a/include/assimp/Exporter.hpp
+++ b/include/assimp/Exporter.hpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/GenericProperty.h b/include/assimp/GenericProperty.h
index 073d53312..537fc05f0 100644
--- a/include/assimp/GenericProperty.h
+++ b/include/assimp/GenericProperty.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/GltfMaterial.h b/include/assimp/GltfMaterial.h
index 86ca8897c..7522bb4a1 100644
--- a/include/assimp/GltfMaterial.h
+++ b/include/assimp/GltfMaterial.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/material.h>
 
-#define AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_METALLICROUGHNESS_TEXTURE aiTextureType_UNKNOWN, 0
+#define AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_METALLICROUGHNESS_TEXTURE aiTextureType_GLTF_METALLIC_ROUGHNESS, 0
 #define AI_MATKEY_GLTF_ALPHAMODE "$mat.gltf.alphaMode", 0, 0
 #define AI_MATKEY_GLTF_ALPHACUTOFF "$mat.gltf.alphaCutoff", 0, 0
 
diff --git a/include/assimp/Hash.h b/include/assimp/Hash.h
index cf889362c..71ed9aa53 100644
--- a/include/assimp/Hash.h
+++ b/include/assimp/Hash.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/IOStream.hpp b/include/assimp/IOStream.hpp
index 12beb0dbb..f9c9969a3 100644
--- a/include/assimp/IOStream.hpp
+++ b/include/assimp/IOStream.hpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -73,14 +73,14 @@ class ASSIMP_API IOStream
 {
 protected:
     /** Constructor protected, use IOSystem::Open() to create an instance. */
-    IOStream() AI_NO_EXCEPT;
+    IOStream() AI_NO_EXCEPT = default;
 
 public:
     // -------------------------------------------------------------------
     /** @brief Destructor. Deleting the object closes the underlying file,
      * alternatively you may use IOSystem::Close() to release the file.
      */
-    virtual ~IOStream();
+    virtual ~IOStream() = default;
 
     // -------------------------------------------------------------------
     /** @brief Read from the file
@@ -126,15 +126,6 @@ public:
     virtual void Flush() = 0;
 }; //! class IOStream
 
-// ----------------------------------------------------------------------------------
-AI_FORCE_INLINE
-IOStream::IOStream() AI_NO_EXCEPT = default;
-
-// ----------------------------------------------------------------------------------
-AI_FORCE_INLINE
-IOStream::~IOStream() = default;
-// ----------------------------------------------------------------------------------
-
 } //!namespace Assimp
 
 #endif //!!AI_IOSTREAM_H_INC
diff --git a/include/assimp/IOStreamBuffer.h b/include/assimp/IOStreamBuffer.h
index 47db35a95..29b7cf317 100644
--- a/include/assimp/IOStreamBuffer.h
+++ b/include/assimp/IOStreamBuffer.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -66,7 +66,7 @@ public:
     IOStreamBuffer(size_t cache = 4096 * 4096);
 
     /// @brief  The class destructor.
-    ~IOStreamBuffer();
+    ~IOStreamBuffer() = default;
 
     /// @brief  Will open the cached access for a given stream.
     /// @param  stream      The stream to cache.
@@ -140,9 +140,6 @@ AI_FORCE_INLINE IOStreamBuffer<T>::IOStreamBuffer(size_t cache) :
     std::fill(m_cache.begin(), m_cache.end(), '\n');
 }
 
-template <class T>
-AI_FORCE_INLINE IOStreamBuffer<T>::~IOStreamBuffer() = default;
-
 template <class T>
 AI_FORCE_INLINE bool IOStreamBuffer<T>::open(IOStream *stream) {
     //  file still opened!
@@ -295,15 +292,13 @@ AI_FORCE_INLINE bool IOStreamBuffer<T>::getNextLine(std::vector<T> &buffer) {
 
     if (IsLineEnd(m_cache[m_cachePos])) {
         // skip line end
-        while (m_cache[m_cachePos] != '\n') {
+        do {
             ++m_cachePos;
-        }
-        ++m_cachePos;
-        if (isEndOfCache(m_cachePos, m_cacheSize)) {
-            if (!readNextBlock()) {
+            if (isEndOfCache(m_cachePos, m_cacheSize) && !readNextBlock()) {
                 return false;
             }
         }
+        while (m_cache[m_cachePos] != '\n');
     }
 
     size_t i(0);
@@ -323,7 +318,10 @@ AI_FORCE_INLINE bool IOStreamBuffer<T>::getNextLine(std::vector<T> &buffer) {
         }
     }
     buffer[i] = '\n';
-    while (m_cachePos < m_cacheSize && (m_cache[m_cachePos] == '\r' || m_cache[m_cachePos] == '\n')) {
+    if (m_cachePos < m_cacheSize && (m_cache[m_cachePos] == '\r')) {
+        ++m_cachePos;
+    }
+    if (m_cachePos < m_cacheSize && (m_cache[m_cachePos] == '\n')) {
         ++m_cachePos;
     }
 
diff --git a/include/assimp/IOSystem.hpp b/include/assimp/IOSystem.hpp
index 30f48b81c..a7083d5df 100644
--- a/include/assimp/IOSystem.hpp
+++ b/include/assimp/IOSystem.hpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -71,7 +71,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <vector>
 
-namespace Assimp    {
+namespace Assimp {
 
 class IOStream;
 
@@ -97,7 +97,7 @@ public:
      *  Create an instance of your derived class and assign it to an
      *  #Assimp::Importer instance by calling Importer::SetIOHandler().
      */
-    IOSystem() AI_NO_EXCEPT;
+    IOSystem() AI_NO_EXCEPT = default;
 
     // -------------------------------------------------------------------
     /** @brief Virtual destructor.
@@ -105,7 +105,7 @@ public:
      *  It is safe to be called from within DLL Assimp, we're constructed
      *  on Assimp's heap.
      */
-    virtual ~IOSystem();
+    virtual ~IOSystem() = default;
 
     // -------------------------------------------------------------------
     /** @brief For backward compatibility
@@ -236,12 +236,6 @@ private:
     std::vector<std::string> m_pathStack;
 };
 
-// ----------------------------------------------------------------------------
-AI_FORCE_INLINE IOSystem::IOSystem() AI_NO_EXCEPT = default;
-
-// ----------------------------------------------------------------------------
-AI_FORCE_INLINE IOSystem::~IOSystem() = default;
-
 // ----------------------------------------------------------------------------
 // For compatibility, the interface of some functions taking a std::string was
 // changed to const char* to avoid crashes between binary incompatible STL
diff --git a/include/assimp/Importer.hpp b/include/assimp/Importer.hpp
index 418643f1f..adac6b23c 100644
--- a/include/assimp/Importer.hpp
+++ b/include/assimp/Importer.hpp
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -110,6 +108,10 @@ namespace Assimp {
 * allocations and may take some time, so it's better to reuse them as often as
 * possible.
 *
+* If you want to let assimp deal with OutOfMemory-exception make sure that
+* ASSIMP_CATCH_GLOBAL_EXCEPTIONS is set.
+* If this is not the case you need to catch the exception by yourself.
+*
 * If you need the Importer to do custom file handling to access the files,
 * implement IOSystem and IOStream and supply an instance of your custom
 * IOSystem implementation by calling SetIOHandler() before calling ReadFile().
diff --git a/include/assimp/LineSplitter.h b/include/assimp/LineSplitter.h
index 379821f03..2747d813d 100644
--- a/include/assimp/LineSplitter.h
+++ b/include/assimp/LineSplitter.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -86,7 +86,7 @@ public:
     */
     LineSplitter(StreamReaderLE& stream, bool skip_empty_lines = true, bool trim = true);
 
-    ~LineSplitter();
+    ~LineSplitter() = default;
 
     // -----------------------------------------
     /** pseudo-iterator increment */
@@ -110,6 +110,8 @@ public:
 
     std::string operator* () const;
 
+    const char *getEnd() const;
+
     // -----------------------------------------
     /** boolean context */
     operator bool() const;
@@ -139,23 +141,25 @@ public:
 private:
     line_idx mIdx;
     std::string mCur;
+    const char *mEnd;
     StreamReaderLE& mStream;
     bool mSwallow, mSkip_empty_lines, mTrim;
 };
 
 AI_FORCE_INLINE LineSplitter::LineSplitter(StreamReaderLE& stream, bool skip_empty_lines, bool trim ) :
         mIdx(0),
+        mCur(),
+        mEnd(nullptr),
         mStream(stream),
         mSwallow(),
         mSkip_empty_lines(skip_empty_lines),
         mTrim(trim) {
     mCur.reserve(1024);
+    mEnd = mCur.c_str() + 1024;
     operator++();
     mIdx = 0;
 }
 
-AI_FORCE_INLINE LineSplitter::~LineSplitter() = default;
-
 AI_FORCE_INLINE LineSplitter& LineSplitter::operator++() {
     if (mSwallow) {
         mSwallow = false;
@@ -203,14 +207,14 @@ AI_FORCE_INLINE LineSplitter &LineSplitter::operator++(int) {
 AI_FORCE_INLINE const char *LineSplitter::operator[] (size_t idx) const {
     const char* s = operator->()->c_str();
 
-    SkipSpaces(&s);
+    SkipSpaces(&s, mEnd);
     for (size_t i = 0; i < idx; ++i) {
         for (; !IsSpace(*s); ++s) {
             if (IsLineEnd(*s)) {
                 throw std::range_error("Token index out of range, EOL reached");
             }
         }
-        SkipSpaces(&s);
+        SkipSpaces(&s, mEnd);
     }
     return s;
 }
@@ -219,7 +223,7 @@ template <size_t N>
 AI_FORCE_INLINE void LineSplitter::get_tokens(const char* (&tokens)[N]) const {
     const char* s = operator->()->c_str();
 
-    SkipSpaces(&s);
+    SkipSpaces(&s, mEnd);
     for (size_t i = 0; i < N; ++i) {
         if (IsLineEnd(*s)) {
             throw std::range_error("Token count out of range, EOL reached");
@@ -227,7 +231,7 @@ AI_FORCE_INLINE void LineSplitter::get_tokens(const char* (&tokens)[N]) const {
         tokens[i] = s;
 
         for (; *s && !IsSpace(*s); ++s);
-        SkipSpaces(&s);
+        SkipSpaces(&s, mEnd);
     }
 }
 
@@ -239,6 +243,10 @@ AI_FORCE_INLINE std::string LineSplitter::operator* () const {
     return mCur;
 }
 
+AI_FORCE_INLINE const char* LineSplitter::getEnd() const {
+    return mEnd;
+}
+
 AI_FORCE_INLINE LineSplitter::operator bool() const {
     return mStream.GetRemainingSize() > 0;
 }
diff --git a/include/assimp/LogAux.h b/include/assimp/LogAux.h
index a8cb8f24c..d52c79b0e 100644
--- a/include/assimp/LogAux.h
+++ b/include/assimp/LogAux.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/LogStream.hpp b/include/assimp/LogStream.hpp
index 3b17b200a..87b3b6fd4 100644
--- a/include/assimp/LogStream.hpp
+++ b/include/assimp/LogStream.hpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/Logger.hpp b/include/assimp/Logger.hpp
index e8df64dd8..425ca1cc3 100644
--- a/include/assimp/Logger.hpp
+++ b/include/assimp/Logger.hpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/MathFunctions.h b/include/assimp/MathFunctions.h
index f2a7ccdf6..da5820e98 100644
--- a/include/assimp/MathFunctions.h
+++ b/include/assimp/MathFunctions.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/MemoryIOWrapper.h b/include/assimp/MemoryIOWrapper.h
index 4023f7529..4ecb1fd42 100644
--- a/include/assimp/MemoryIOWrapper.h
+++ b/include/assimp/MemoryIOWrapper.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -55,7 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <stdint.h>
 
-namespace Assimp    {
+namespace Assimp {
 
 #define AI_MEMORYIO_MAGIC_FILENAME "$$$___magic___$$$"
 #define AI_MEMORYIO_MAGIC_FILENAME_LENGTH 17
diff --git a/include/assimp/NullLogger.hpp b/include/assimp/NullLogger.hpp
index 1b594ea28..21b1430ce 100644
--- a/include/assimp/NullLogger.hpp
+++ b/include/assimp/NullLogger.hpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/ObjMaterial.h b/include/assimp/ObjMaterial.h
index 9c511916a..7fb1efe26 100644
--- a/include/assimp/ObjMaterial.h
+++ b/include/assimp/ObjMaterial.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/ParsingUtils.h b/include/assimp/ParsingUtils.h
index 7e7fb161c..26fb03e70 100644
--- a/include/assimp/ParsingUtils.h
+++ b/include/assimp/ParsingUtils.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -102,8 +102,8 @@ AI_FORCE_INLINE bool IsSpaceOrNewLine(char_t in) {
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE bool SkipSpaces(const char_t *in, const char_t **out) {
-    while (*in == (char_t)' ' || *in == (char_t)'\t') {
+AI_FORCE_INLINE bool SkipSpaces(const char_t *in, const char_t **out, const char_t *end) {
+    while ((*in == (char_t)' ' || *in == (char_t)'\t') && in != end) {
         ++in;
     }
     *out = in;
@@ -112,19 +112,19 @@ AI_FORCE_INLINE bool SkipSpaces(const char_t *in, const char_t **out) {
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE bool SkipSpaces(const char_t **inout) {
-    return SkipSpaces<char_t>(*inout, inout);
+AI_FORCE_INLINE bool SkipSpaces(const char_t **inout, const char_t *end) {
+    return SkipSpaces<char_t>(*inout, inout, end);
 }
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE bool SkipLine(const char_t *in, const char_t **out) {
-    while (*in != (char_t)'\r' && *in != (char_t)'\n' && *in != (char_t)'\0') {
+AI_FORCE_INLINE bool SkipLine(const char_t *in, const char_t **out, const char_t *end) {
+    while ((*in != (char_t)'\r' && *in != (char_t)'\n' && *in != (char_t)'\0') && *in != (char_t)'#' && in != end) {
         ++in;
     }
 
     // files are opened in binary mode. Ergo there are both NL and CR
-    while (*in == (char_t)'\r' || *in == (char_t)'\n') {
+    while ((*in == (char_t)'\r' || *in == (char_t)'\n') && in != end) {
         ++in;
     }
     *out = in;
@@ -133,14 +133,14 @@ AI_FORCE_INLINE bool SkipLine(const char_t *in, const char_t **out) {
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE bool SkipLine(const char_t **inout) {
-    return SkipLine<char_t>(*inout, inout);
+AI_FORCE_INLINE bool SkipLine(const char_t **inout, const char_t *end) {
+    return SkipLine<char_t>(*inout, inout, end);
 }
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE bool SkipSpacesAndLineEnd(const char_t *in, const char_t **out) {
-    while (*in == (char_t)' ' || *in == (char_t)'\t' || *in == (char_t)'\r' || *in == (char_t)'\n') {
+AI_FORCE_INLINE bool SkipSpacesAndLineEnd(const char_t *in, const char_t **out, const char_t  *end) {
+    while ((*in == (char_t)' ' || *in == (char_t)'\t' || *in == (char_t)'\r' || *in == (char_t)'\n') && in != end) {
         ++in;
     }
     *out = in;
@@ -149,8 +149,8 @@ AI_FORCE_INLINE bool SkipSpacesAndLineEnd(const char_t *in, const char_t **out)
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE bool SkipSpacesAndLineEnd(const char_t **inout) {
-    return SkipSpacesAndLineEnd<char_t>(*inout, inout);
+AI_FORCE_INLINE bool SkipSpacesAndLineEnd(const char_t **inout, const char_t *end) {
+    return SkipSpacesAndLineEnd<char_t>(*inout, inout, end);
 }
 
 // ---------------------------------------------------------------------------------
@@ -161,13 +161,13 @@ AI_FORCE_INLINE bool GetNextLine(const char_t *&buffer, char_t out[BufferSize])
     }
 
     char *_out = out;
-    char *const end = _out + BufferSize;
+    char *const end = _out + BufferSize - 1;
     while (!IsLineEnd(*buffer) && _out < end) {
         *_out++ = *buffer++;
     }
     *_out = (char_t)'\0';
 
-    while (IsLineEnd(*buffer) && '\0' != *buffer) {
+    while (IsLineEnd(*buffer) && '\0' != *buffer && buffer != end) {
         ++buffer;
     }
 
@@ -210,16 +210,16 @@ AI_FORCE_INLINE bool TokenMatchI(const char *&in, const char *token, unsigned in
 }
 
 // ---------------------------------------------------------------------------------
-AI_FORCE_INLINE void SkipToken(const char *&in) {
-    SkipSpaces(&in);
+AI_FORCE_INLINE void SkipToken(const char *&in, const char *end) {
+    SkipSpaces(&in, end);
     while (!IsSpaceOrNewLine(*in)) {
         ++in;
     }
 }
 
 // ---------------------------------------------------------------------------------
-AI_FORCE_INLINE std::string GetNextToken(const char *&in) {
-    SkipSpacesAndLineEnd(&in);
+AI_FORCE_INLINE std::string GetNextToken(const char *&in, const char *end) {
+    SkipSpacesAndLineEnd(&in, end);
     const char *cur = in;
     while (!IsSpaceOrNewLine(*in)) {
         ++in;
diff --git a/include/assimp/Profiler.h b/include/assimp/Profiler.h
index 3b9263b40..2b8fe960f 100644
--- a/include/assimp/Profiler.h
+++ b/include/assimp/Profiler.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/ProgressHandler.hpp b/include/assimp/ProgressHandler.hpp
index 93d881659..f354fc65e 100644
--- a/include/assimp/ProgressHandler.hpp
+++ b/include/assimp/ProgressHandler.hpp
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/RemoveComments.h b/include/assimp/RemoveComments.h
index c2defff63..c5e34ef39 100644
--- a/include/assimp/RemoveComments.h
+++ b/include/assimp/RemoveComments.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/defs.h>
 
-namespace Assimp    {
+namespace Assimp {
 
 // ---------------------------------------------------------------------------
 /** \brief Helper class to remove single and multi line comments from a file
diff --git a/include/assimp/SGSpatialSort.h b/include/assimp/SGSpatialSort.h
index 96feefabb..5f6d9a5c8 100644
--- a/include/assimp/SGSpatialSort.h
+++ b/include/assimp/SGSpatialSort.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -54,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include <stdint.h>
 
-namespace Assimp    {
+namespace Assimp {
 
 // ----------------------------------------------------------------------------------
 /** Specialized version of SpatialSort to support smoothing groups
@@ -63,10 +62,8 @@ namespace Assimp    {
  *  implementation to handle all details of its file format correctly.
  */
 // ----------------------------------------------------------------------------------
-class ASSIMP_API SGSpatialSort
-{
+class ASSIMP_API SGSpatialSort {
 public:
-
     SGSpatialSort();
 
     // -------------------------------------------------------------------
@@ -90,7 +87,7 @@ public:
     void Prepare();
 
     /** Destructor */
-    ~SGSpatialSort();
+    ~SGSpatialSort() = default;
 
     // -------------------------------------------------------------------
     /** Returns an iterator for all positions close to the given position.
diff --git a/include/assimp/SceneCombiner.h b/include/assimp/SceneCombiner.h
index d6096900c..cb3b83829 100644
--- a/include/assimp/SceneCombiner.h
+++ b/include/assimp/SceneCombiner.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -190,12 +189,11 @@ struct SceneHelper {
  * and loaders (ie. LWS).
  */
 class ASSIMP_API SceneCombiner {
+public:
     // class cannot be instanced
     SceneCombiner() = delete;
-
     ~SceneCombiner() = delete;
 
-public:
     // -------------------------------------------------------------------
     /** Merges two or more scenes.
      *
@@ -275,8 +273,8 @@ public:
     /** Builds a list of uniquely named bones in a mesh list
      *
      *  @param asBones Receives the output list
-     *  @param it First mesh to be processed
-     *  @param end Last mesh to be processed
+     *  @param it      First mesh to be processed
+     *  @param end     Last mesh to be processed
      */
     static void BuildUniqueBoneList(std::list<BoneWithHash> &asBones,
             std::vector<aiMesh *>::const_iterator it,
@@ -285,9 +283,9 @@ public:
     // -------------------------------------------------------------------
     /** Add a name prefix to all nodes in a scene.
      *
-     *  @param Current node. This function is called recursively.
+     *  @param node   Current node. This function is called recursively.
      *  @param prefix Prefix to be added to all nodes
-     *  @param len STring length
+     *  @param len    String length
      */
     static void AddNodePrefixes(aiNode *node, const char *prefix,
             unsigned int len);
@@ -295,7 +293,7 @@ public:
     // -------------------------------------------------------------------
     /** Add an offset to all mesh indices in a node graph
      *
-     *  @param Current node. This function is called recursively.
+     *  @param node   Current node. This function is called recursively.
      *  @param offset Offset to be added to all mesh indices
      */
     static void OffsetNodeMeshIndices(aiNode *node, unsigned int offset);
@@ -310,7 +308,7 @@ public:
      *    the master graph), a scene is attached to the root of the master
      *    graph (as an additional child node)
      *  @duplicates List of duplicates. If elem[n] == n the scene is not
-     *    a duplicate. Otherwise elem[n] links scene n to its first occurrence.
+     *    a duplicate. Otherwise, elem[n] links scene n to its first occurrence.
      */
     static void AttachToGraph(aiScene *master,
             std::vector<NodeAttachmentInfo> &srcList);
@@ -321,8 +319,9 @@ public:
     // -------------------------------------------------------------------
     /** Get a deep copy of a scene
      *
-     *  @param dest Receives a pointer to the destination scene
-     *  @param src Source scene - remains unmodified.
+     *  @param dest     Receives a pointer to the destination scene
+     *  @param source   Source scene - remains unmodified.
+     *  @param allocate true for allocation a new scene
      */
     static void CopyScene(aiScene **dest, const aiScene *source, bool allocate = true);
 
diff --git a/include/assimp/SkeletonMeshBuilder.h b/include/assimp/SkeletonMeshBuilder.h
index 2929aaa61..c78f4692c 100644
--- a/include/assimp/SkeletonMeshBuilder.h
+++ b/include/assimp/SkeletonMeshBuilder.h
@@ -4,7 +4,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/SmallVector.h b/include/assimp/SmallVector.h
index 60ad26411..62ead0399 100644
--- a/include/assimp/SmallVector.h
+++ b/include/assimp/SmallVector.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/SmoothingGroups.h b/include/assimp/SmoothingGroups.h
index 4625a2916..90ba117a5 100644
--- a/include/assimp/SmoothingGroups.h
+++ b/include/assimp/SmoothingGroups.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/SmoothingGroups.inl b/include/assimp/SmoothingGroups.inl
index d5fff5bf7..3a75d3aee 100644
--- a/include/assimp/SmoothingGroups.inl
+++ b/include/assimp/SmoothingGroups.inl
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/SpatialSort.h b/include/assimp/SpatialSort.h
index cd055450e..64d02d020 100644
--- a/include/assimp/SpatialSort.h
+++ b/include/assimp/SpatialSort.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -79,7 +78,7 @@ public:
             unsigned int pElementOffset);
 
     /** Destructor */
-    ~SpatialSort();
+    ~SpatialSort() = default;
 
     // ------------------------------------------------------------------------------------
     /** Sets the input data for the SpatialSort. This replaces existing data, if any.
diff --git a/include/assimp/StandardShapes.h b/include/assimp/StandardShapes.h
index 77880cf9e..c255a9dec 100644
--- a/include/assimp/StandardShapes.h
+++ b/include/assimp/StandardShapes.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -57,7 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct aiMesh;
 
-namespace Assimp    {
+namespace Assimp {
 
 // ---------------------------------------------------------------------------
 /** \brief Helper class to generate vertex buffers for standard geometric
diff --git a/include/assimp/StreamReader.h b/include/assimp/StreamReader.h
index 44b24a33b..2d1e6ba74 100644
--- a/include/assimp/StreamReader.h
+++ b/include/assimp/StreamReader.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -68,7 +68,7 @@ namespace Assimp {
  *
  *  XXX switch from unsigned int for size types to size_t? or ptrdiff_t?*/
 // --------------------------------------------------------------------------------------------
-template <bool SwapEndianess = false, bool RuntimeSwitch = false>
+template <bool SwapEndianness = false, bool RuntimeSwitch = false>
 class StreamReader {
 public:
     using diff = size_t;
@@ -84,7 +84,7 @@ public:
      *    reads from the current position to the end of the stream.
      *  @param le If @c RuntimeSwitch is true: specifies whether the
      *    stream is in little endian byte order. Otherwise the
-     *    endianness information is contained in the @c SwapEndianess
+     *    endianness information is contained in the @c SwapEndianness
      *    template parameter and this parameter is meaningless.  */
     StreamReader(std::shared_ptr<IOStream> stream, bool le = false) :
             mStream(stream),
@@ -291,7 +291,7 @@ public:
 
         T f;
         ::memcpy(&f, mCurrent, sizeof(T));
-        Intern::Getter<SwapEndianess, T, RuntimeSwitch>()(&f, mLe);
+        Intern::Getter<SwapEndianness, T, RuntimeSwitch>()(&f, mLe);
         mCurrent += sizeof(T);
 
         return f;
diff --git a/include/assimp/StreamWriter.h b/include/assimp/StreamWriter.h
index 50e28447c..31bcb9853 100644
--- a/include/assimp/StreamWriter.h
+++ b/include/assimp/StreamWriter.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -65,7 +65,7 @@ namespace Assimp {
  *  stream is to be determined at runtime.
  */
 // --------------------------------------------------------------------------------------------
-template <bool SwapEndianess = false, bool RuntimeSwitch = false>
+template <bool SwapEndianness = false, bool RuntimeSwitch = false>
 class StreamWriter {
     enum {
         INITIAL_CAPACITY = 1024
@@ -82,7 +82,7 @@ public:
           continues at the current position of the stream cursor.
      *  @param le If @c RuntimeSwitch is true: specifies whether the
      *    stream is in little endian byte order. Otherwise the
-     *    endianness information is defined by the @c SwapEndianess
+     *    endianness information is defined by the @c SwapEndianness
      *    template parameter and this parameter is meaningless.  */
     StreamWriter(std::shared_ptr<IOStream> stream, bool le = false)
         : stream(stream)
@@ -260,7 +260,7 @@ public:
     /** Generic write method. ByteSwap::Swap(T*) *must* be defined */
     template <typename T>
     void Put(T f)   {
-        Intern :: Getter<SwapEndianess,T,RuntimeSwitch>() (&f, le);
+        Intern :: Getter<SwapEndianness,T,RuntimeSwitch>() (&f, le);
 
         if (cursor + sizeof(T) >= buffer.size()) {
             buffer.resize(cursor + sizeof(T));
diff --git a/include/assimp/StringComparison.h b/include/assimp/StringComparison.h
index 0518d426d..77d1e112a 100644
--- a/include/assimp/StringComparison.h
+++ b/include/assimp/StringComparison.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -57,7 +56,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #pragma GCC system_header
 #endif
 
-#include <assimp/StringComparison.h>
 #include <assimp/ai_assert.h>
 #include <assimp/defs.h>
 
diff --git a/include/assimp/StringUtils.h b/include/assimp/StringUtils.h
index cd8726785..cc4997de3 100644
--- a/include/assimp/StringUtils.h
+++ b/include/assimp/StringUtils.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -57,9 +57,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <iomanip>
 
 #if defined(_MSC_VER) && !defined(__clang__)
-#define AI_SIZEFMT "%Iu"
+#  define AI_SIZEFMT "%Iu"
 #else
-#define AI_SIZEFMT "%zu"
+#  define AI_SIZEFMT "%zu"
 #endif
 
 // ---------------------------------------------------------------------------------
@@ -99,9 +99,9 @@ inline int ai_snprintf(char *outBuf, size_t size, const char *format, ...) {
 }
 
 #elif defined(__MINGW32__)
-#define ai_snprintf __mingw_snprintf
+#  define ai_snprintf __mingw_snprintf
 #else
-#define ai_snprintf snprintf
+#  define ai_snprintf snprintf
 #endif
 
 // ---------------------------------------------------------------------------------
@@ -185,6 +185,7 @@ AI_FORCE_INLINE std::string ai_rgba2hex(int r, int g, int b, int a, bool with_he
 // ---------------------------------------------------------------------------------
 /// @brief   Performs a trim from start (in place)
 /// @param  s   string to trim.
+// ---------------------------------------------------------------------------------
 AI_FORCE_INLINE void ai_trim_left(std::string &s) {
     s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) {
         return !std::isspace(ch);
@@ -195,7 +196,6 @@ AI_FORCE_INLINE void ai_trim_left(std::string &s) {
 /// @brief  Performs a trim from end (in place).
 /// @param  s   string to trim.
 // ---------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------
 AI_FORCE_INLINE void ai_trim_right(std::string &s) {
     s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char ch) {
         return !std::isspace(ch);
@@ -214,6 +214,10 @@ AI_FORCE_INLINE std::string ai_trim(std::string &s) {
     return out;
 }
 
+// ---------------------------------------------------------------------------------
+/// @brief Performs a to lower operation onto on single character.
+/// @param in  The character
+/// @return the character as lower-case.
 // ---------------------------------------------------------------------------------
 template <class char_t>
 AI_FORCE_INLINE char_t ai_tolower(char_t in) {
@@ -233,6 +237,10 @@ AI_FORCE_INLINE std::string ai_tolower(const std::string &in) {
     return out;
 }
 
+// ---------------------------------------------------------------------------------
+/// @brief Performs a to upper operation onto on single character.
+/// @param in  The character
+/// @return the character as upper-case.
 // ---------------------------------------------------------------------------------
 template <class char_t>
 AI_FORCE_INLINE char_t ai_toupper(char_t in) {
@@ -243,6 +251,7 @@ AI_FORCE_INLINE char_t ai_toupper(char_t in) {
 /// @brief  Performs a ToLower-operation and return the upper-case string.
 /// @param  in  The incoming string.
 /// @return The string as uppercase.
+// ---------------------------------------------------------------------------------
 AI_FORCE_INLINE std::string ai_str_toupper(const std::string &in) {
     std::string out(in);
     std::transform(out.begin(), out.end(), out.begin(), [](char c) { return ai_toupper(c); });
@@ -255,6 +264,7 @@ AI_FORCE_INLINE std::string ai_str_toupper(const std::string &in) {
 /// @param  in  The incoming string.
 /// @param  placeholder  Placeholder character, default is a question mark.
 /// @return The string, with all non-printable characters replaced.
+// ---------------------------------------------------------------------------------
 AI_FORCE_INLINE std::string ai_str_toprintable(const std::string &in, char placeholder = '?') {
     std::string out(in);
     std::transform(out.begin(), out.end(), out.begin(), [placeholder] (unsigned char c) {
@@ -271,9 +281,9 @@ AI_FORCE_INLINE std::string ai_str_toprintable(const std::string &in, char place
 /// @param  placeholder  Placeholder character, default is a question mark.
 /// @return The string, with all non-printable characters replaced. Will return an
 ///         empty string if in is null or len is <= 0.
+// ---------------------------------------------------------------------------------
 AI_FORCE_INLINE std::string ai_str_toprintable(const char *in, int len, char placeholder = '?') {
     return (in && len > 0) ? ai_str_toprintable(std::string(in, len), placeholder) : std::string();
 }
 
-
 #endif // INCLUDED_AI_STRINGUTILS_H
diff --git a/include/assimp/Subdivision.h b/include/assimp/Subdivision.h
index 114120368..b3ad2bd5f 100644
--- a/include/assimp/Subdivision.h
+++ b/include/assimp/Subdivision.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -53,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct aiMesh;
 
-namespace Assimp    {
+namespace Assimp {
 
 // ------------------------------------------------------------------------------
 /** Helper class to evaluate subdivision surfaces. Different algorithms
diff --git a/include/assimp/TinyFormatter.h b/include/assimp/TinyFormatter.h
index df2a32eca..ae72ee37b 100644
--- a/include/assimp/TinyFormatter.h
+++ b/include/assimp/TinyFormatter.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/Vertex.h b/include/assimp/Vertex.h
index 3fc974504..b7cf0192f 100644
--- a/include/assimp/Vertex.h
+++ b/include/assimp/Vertex.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -61,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <functional>
 
-namespace Assimp    {
+namespace Assimp {
 
     ///////////////////////////////////////////////////////////////////////////
     // std::plus-family operates on operands with identical types - we need to
@@ -112,6 +111,7 @@ struct Vertex {
     aiColor4D colors[AI_MAX_NUMBER_OF_COLOR_SETS];
 
     Vertex() = default;
+    ~Vertex() = default;
 
     // ----------------------------------------------------------------------------
     /** Extract a particular vertex from a mesh and interleave all components */
@@ -183,6 +183,29 @@ struct Vertex {
         return *this;
     }
 
+    bool operator < (const Vertex & o) const {
+        if (position < o.position) return true;
+        if (position != o.position) return false;
+
+        if (normal < o.normal) return true;
+        if (normal != o.normal) return false;
+
+        for (uint32_t i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; i ++) {
+          if (texcoords[i] < o.texcoords[i]) return true;
+          if (texcoords[i] != o.texcoords[i]) return false;
+        }
+
+        // note that tangent/bitangent are not checked since they are optional
+
+        for (uint32_t i = 0; i < AI_MAX_NUMBER_OF_COLOR_SETS; i ++) {
+          if (colors[i] < o.colors[i]) return true;
+          if (colors[i] != o.colors[i]) return false;
+        }
+
+        // if reached this point, they are equal
+        return false;
+    }
+
     // ----------------------------------------------------------------------------
     /// Convert back to non-interleaved storage
     void SortBack(aiMesh* out, unsigned int idx) const {
@@ -231,7 +254,8 @@ private:
 
     // ----------------------------------------------------------------------------
     /// This time binary arithmetic of v0 with a floating-point number
-    template <template <typename, typename, typename> class op> static Vertex BinaryOp(const Vertex& v0, ai_real f) {
+    template <template <typename, typename, typename> class op>
+    static Vertex BinaryOp(const Vertex& v0, ai_real f) {
         // this is a heavy task for the compiler to optimize ... *pray*
 
         Vertex res;
@@ -244,14 +268,15 @@ private:
             res.texcoords[i] = op<aiVector3D,ai_real,aiVector3D>()(v0.texcoords[i],f);
         }
         for (unsigned int i = 0; i < AI_MAX_NUMBER_OF_COLOR_SETS; ++i) {
-            res.colors[i] = op<aiColor4D,ai_real,aiColor4D>()(v0.colors[i],f);
+            res.colors[i] = op<aiColor4D,float, aiColor4D>()(v0.colors[i],f);
         }
         return res;
     }
 
     // ----------------------------------------------------------------------------
     /** This time binary arithmetic of v0 with a floating-point number */
-    template <template <typename, typename, typename> class op> static Vertex BinaryOp(ai_real f, const Vertex& v0) {
+    template <template <typename, typename, typename> class op>
+    static Vertex BinaryOp(ai_real f, const Vertex& v0) {
         // this is a heavy task for the compiler to optimize ... *pray*
 
         Vertex res;
@@ -264,7 +289,7 @@ private:
             res.texcoords[i] = op<ai_real,aiVector3D,aiVector3D>()(f,v0.texcoords[i]);
         }
         for (unsigned int i = 0; i < AI_MAX_NUMBER_OF_COLOR_SETS; ++i) {
-            res.colors[i] = op<ai_real,aiColor4D,aiColor4D>()(f,v0.colors[i]);
+            res.colors[i] = op<float, aiColor4D,aiColor4D>()(f,v0.colors[i]);
         }
         return res;
     }
diff --git a/include/assimp/XMLTools.h b/include/assimp/XMLTools.h
index b2766f19b..6c6d78573 100644
--- a/include/assimp/XMLTools.h
+++ b/include/assimp/XMLTools.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/XmlParser.h b/include/assimp/XmlParser.h
index 4ab42ba2a..ac047cb98 100644
--- a/include/assimp/XmlParser.h
+++ b/include/assimp/XmlParser.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -43,12 +43,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define INCLUDED_AI_IRRXML_WRAPPER
 
 #include <assimp/ai_assert.h>
+#include <assimp/StringUtils.h>
 #include <assimp/DefaultLogger.hpp>
 
 #include "BaseImporter.h"
 #include "IOStream.hpp"
 
 #include <pugixml.hpp>
+#include <istream>
 #include <utility>
 #include <vector>
 
@@ -127,6 +129,11 @@ public:
     /// @return true, if the parsing was successful, false if not.
     bool parse(IOStream *stream);
 
+    /// @brief  Will parse an xml-file from a stringstream.
+    /// @param[in] str      The input istream (note: not "const" to match pugixml param)
+    /// @return true, if the parsing was successful, false if not.
+    bool parse(std::istream &inStream);
+
     /// @brief  Will return true if a root node is there.
     /// @return true in case of an existing root.
     bool hasRoot() const;
@@ -210,21 +217,27 @@ public:
     /// @return true, if the value can be read out.
     static inline bool getValueAsString(XmlNode &node, std::string &text);
 
+    /// @brief Will try to get the value of the node as a real.
+    /// @param[in]  node   The node to search in.
+    /// @param[out] v      The value as a ai_real.
+    /// @return true, if the value can be read out.
+    static inline bool getValueAsReal(XmlNode &node, ai_real &v);
+
     /// @brief Will try to get the value of the node as a float.
     /// @param[in] node     The node to search in.
-    /// @param[out] text    The value as a float.
+    /// @param[out]v        The value as a float.
     /// @return true, if the value can be read out.
-    static inline bool getValueAsFloat(XmlNode &node, ai_real &v);
+    static inline bool getValueAsFloat(XmlNode &node, float &v);
 
     /// @brief Will try to get the value of the node as an integer.
-    /// @param[in] node     The node to search in.
-    /// @param[out] text    The value as a int.
+    /// @param[in]  node    The node to search in.
+    /// @param[out] i       The value as a int.
     /// @return true, if the value can be read out.
     static inline bool getValueAsInt(XmlNode &node, int &v);
 
     /// @brief Will try to get the value of the node as an bool.
-    /// @param[in] node     The node to search in.
-    /// @param[out] text    The value as a bool.
+    /// @param[in]  node    The node to search in.
+    /// @param[out] v       The value as a bool.
     /// @return true, if the value can be read out.
     static inline bool getValueAsBool(XmlNode &node, bool &v);
 
@@ -304,7 +317,23 @@ bool TXmlParser<TNodeType>::parse(IOStream *stream) {
     mDoc = new pugi::xml_document();
     // load_string assumes native encoding (aka always utf-8 per build options)
     //pugi::xml_parse_result parse_result = mDoc->load_string(&mData[0], pugi::parse_full);
-     pugi::xml_parse_result parse_result = mDoc->load_buffer(&mData[0], mData.size(), pugi::parse_full);
+    pugi::xml_parse_result parse_result = mDoc->load_buffer(&mData[0], mData.size(), pugi::parse_full);
+    if (parse_result.status == pugi::status_ok) {
+        return true;
+    }
+
+    ASSIMP_LOG_DEBUG("Error while parse xml.", std::string(parse_result.description()), " @ ", parse_result.offset);
+
+    return false;
+}
+
+template <class TNodeType>
+bool TXmlParser<TNodeType>::parse(std::istream &inStream) {
+    if (hasRoot()) {
+        clear();
+    }
+    mDoc = new pugi::xml_document();
+    pugi::xml_parse_result parse_result = mDoc->load(inStream);
     if (parse_result.status == pugi::status_ok) {
         return true;
     }
@@ -447,12 +476,25 @@ inline bool TXmlParser<TNodeType>::getValueAsString(XmlNode &node, std::string &
     }
 
     text = node.text().as_string();
+    text = ai_trim(text);
 
     return true;
 }
 
 template <class TNodeType>
-inline bool TXmlParser<TNodeType>::getValueAsFloat(XmlNode &node, ai_real &v) {
+inline bool TXmlParser<TNodeType>::getValueAsReal(XmlNode& node, ai_real& v) {
+    if (node.empty()) {
+        return false;
+    }
+
+    v = node.text().as_float();
+
+    return true;
+}
+
+
+template <class TNodeType>
+inline bool TXmlParser<TNodeType>::getValueAsFloat(XmlNode &node, float &v) {
     if (node.empty()) {
         return false;
     }
diff --git a/include/assimp/ZipArchiveIOSystem.h b/include/assimp/ZipArchiveIOSystem.h
index 9f3a4783b..430e3203d 100644
--- a/include/assimp/ZipArchiveIOSystem.h
+++ b/include/assimp/ZipArchiveIOSystem.h
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -55,6 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/IOStream.hpp>
 #include <assimp/IOSystem.hpp>
+#include <zlib.h>
 
 namespace Assimp {
 
@@ -63,7 +62,7 @@ public:
     //! Open a Zip using the proffered IOSystem
     ZipArchiveIOSystem(IOSystem* pIOHandler, const char *pFilename, const char* pMode = "r");
     ZipArchiveIOSystem(IOSystem* pIOHandler, const std::string& rFilename, const char* pMode = "r");
-    virtual ~ZipArchiveIOSystem() override;
+    ~ZipArchiveIOSystem() override;
     bool Exists(const char* pFilename) const override;
     char getOsSeparator() const override;
     IOStream* Open(const char* pFilename, const char* pMode = "rb") override;
diff --git a/include/assimp/aabb.h b/include/assimp/aabb.h
index b38aa1697..1ff494a66 100644
--- a/include/assimp/aabb.h
+++ b/include/assimp/aabb.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -59,18 +59,12 @@ struct aiAABB {
 
 #ifdef __cplusplus
     /// @brief The default class constructor.
-    aiAABB() :
-            mMin(), mMax() {
-        // empty
-    }
+    aiAABB() = default;
 
     /// @brief The class constructor with the minimum and maximum.
     /// @param min  The minimum dimension.
     /// @param max  The maximum dimension.
-    aiAABB(const aiVector3D &min, const aiVector3D &max) :
-            mMin(min), mMax(max) {
-        // empty
-    }
+    aiAABB(const aiVector3D &min, const aiVector3D &max) : mMin(min), mMax(max) {}
 
     ///	@brief  The class destructor.
     ~aiAABB() = default;
diff --git a/include/assimp/ai_assert.h b/include/assimp/ai_assert.h
index e49a482dd..164861646 100644
--- a/include/assimp/ai_assert.h
+++ b/include/assimp/ai_assert.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/anim.h b/include/assimp/anim.h
index 49f0d5014..797748fb1 100644
--- a/include/assimp/anim.h
+++ b/include/assimp/anim.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -59,6 +59,28 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 extern "C" {
 #endif
 
+// ---------------------------------------------------------------------------
+/**
+ */
+enum aiAnimInterpolation {
+    /** */
+    aiAnimInterpolation_Step,
+
+    /** */
+    aiAnimInterpolation_Linear,
+
+    /** */
+    aiAnimInterpolation_Spherical_Linear,
+
+    /** */
+    aiAnimInterpolation_Cubic_Spline,
+
+/** */
+#ifndef SWIG
+    _aiAnimInterpolation_Force32Bit = INT_MAX
+#endif
+};
+
 // ---------------------------------------------------------------------------
 /** A time-value pair specifying a certain 3D vector for the given time. */
 struct aiVectorKey {
@@ -68,21 +90,18 @@ struct aiVectorKey {
     /** The value of this key */
     C_STRUCT aiVector3D mValue;
 
+     /** The interpolation setting of this key */
+    C_ENUM aiAnimInterpolation mInterpolation;
+
 #ifdef __cplusplus
 
     /// @brief  The default constructor.
     aiVectorKey() AI_NO_EXCEPT
-            : mTime(0.0),
-              mValue() {
-        // empty
-    }
+            : mTime(0.0), mValue(), mInterpolation(aiAnimInterpolation_Linear) {}
 
     /// @brief  Construction from a given time and key value.
-
     aiVectorKey(double time, const aiVector3D &value) :
-            mTime(time), mValue(value) {
-        // empty
-    }
+            mTime(time), mValue(value), mInterpolation(aiAnimInterpolation_Linear){}
 
     typedef aiVector3D elem_type;
 
@@ -90,6 +109,7 @@ struct aiVectorKey {
     bool operator==(const aiVectorKey &rhs) const {
         return rhs.mValue == this->mValue;
     }
+
     bool operator!=(const aiVectorKey &rhs) const {
         return rhs.mValue != this->mValue;
     }
@@ -115,16 +135,16 @@ struct aiQuatKey {
     /** The value of this key */
     C_STRUCT aiQuaternion mValue;
 
+    /** The interpolation setting of this key */
+    C_ENUM aiAnimInterpolation mInterpolation;
+
 #ifdef __cplusplus
     aiQuatKey() AI_NO_EXCEPT
-            : mTime(0.0),
-              mValue() {
-        // empty
-    }
+            : mTime(0.0), mValue(), mInterpolation(aiAnimInterpolation_Linear) {}
 
     /** Construction from a given time and key value */
     aiQuatKey(double time, const aiQuaternion &value) :
-            mTime(time), mValue(value) {}
+            mTime(time), mValue(value), mInterpolation(aiAnimInterpolation_Linear) {}
 
     typedef aiQuaternion elem_type;
 
diff --git a/include/assimp/camera.h b/include/assimp/camera.h
index 09255fa05..b3580794e 100644
--- a/include/assimp/camera.h
+++ b/include/assimp/camera.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/cexport.h b/include/assimp/cexport.h
index a45ece39b..1d559f239 100644
--- a/include/assimp/cexport.h
+++ b/include/assimp/cexport.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/cfileio.h b/include/assimp/cfileio.h
index fc1b95ad1..671b70ce0 100644
--- a/include/assimp/cfileio.h
+++ b/include/assimp/cfileio.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/cimport.h b/include/assimp/cimport.h
index 935ed18bd..f296a98d8 100644
--- a/include/assimp/cimport.h
+++ b/include/assimp/cimport.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -58,6 +58,7 @@ extern "C" {
 #endif
 
 struct aiScene;
+struct aiTexture;
 struct aiFileIO;
 
 typedef void (*aiLogStreamCallback)(const char * /* message */, char * /* user */);
@@ -169,10 +170,11 @@ ASSIMP_API const C_STRUCT aiScene *aiImportFileExWithProperties(
 // --------------------------------------------------------------------------------
 /** Reads the given file from a given memory buffer,
  *
- * If the call succeeds, the contents of the file are returned as a pointer to an
- * aiScene object. The returned data is intended to be read-only, the importer keeps
- * ownership of the data and will destroy it upon destruction. If the import fails,
- * NULL is returned.
+ * If the call succeeds, the imported data is returned in an aiScene structure.
+ * The data is intended to be read-only, it stays property of the ASSIMP
+ * library and will be stable until aiReleaseImport() is called. After you're
+ * done with it, call aiReleaseImport() to free the resources associated with
+ * this file. If the import fails, NULL is returned.
  * A human-readable error description can be retrieved by calling aiGetErrorString().
  * @param pBuffer Pointer to the file data
  * @param pLength Length of pBuffer, in bytes
@@ -373,6 +375,13 @@ ASSIMP_API void aiGetMemoryRequirements(
         const C_STRUCT aiScene *pIn,
         C_STRUCT aiMemoryInfo *in);
 
+// --------------------------------------------------------------------------------
+/** Returns an embedded texture, or nullptr.
+ * @param pIn Input asset.
+ * @param filename Texture path extracted from aiGetMaterialString.
+ */
+ASSIMP_API const C_STRUCT aiTexture *aiGetEmbeddedTexture(const C_STRUCT aiScene *pIn, const char *filename);
+
 // --------------------------------------------------------------------------------
 /** Create an empty property store. Property stores are used to collect import
  *  settings.
@@ -644,14 +653,14 @@ ASSIMP_API void aiVector2DivideByVector(
 /** Get the length of a 2D vector.
  *  @return v Vector to evaluate
  */
-ASSIMP_API float aiVector2Length(
+ASSIMP_API ai_real aiVector2Length(
         const C_STRUCT aiVector2D *v);
 
 // --------------------------------------------------------------------------------
 /** Get the squared length of a 2D vector.
  *  @return v Vector to evaluate
  */
-ASSIMP_API float aiVector2SquareLength(
+ASSIMP_API ai_real aiVector2SquareLength(
         const C_STRUCT aiVector2D *v);
 
 // --------------------------------------------------------------------------------
@@ -667,7 +676,7 @@ ASSIMP_API void aiVector2Negate(
  *  @param b Second vector
  *  @return The dot product of vectors
  */
-ASSIMP_API float aiVector2DotProduct(
+ASSIMP_API ai_real aiVector2DotProduct(
         const C_STRUCT aiVector2D *a,
         const C_STRUCT aiVector2D *b);
 
@@ -774,14 +783,14 @@ ASSIMP_API void aiVector3DivideByVector(
 /** Get the length of a 3D vector.
  *  @return v Vector to evaluate
  */
-ASSIMP_API float aiVector3Length(
+ASSIMP_API ai_real aiVector3Length(
         const C_STRUCT aiVector3D *v);
 
 // --------------------------------------------------------------------------------
 /** Get the squared length of a 3D vector.
  *  @return v Vector to evaluate
  */
-ASSIMP_API float aiVector3SquareLength(
+ASSIMP_API ai_real aiVector3SquareLength(
         const C_STRUCT aiVector3D *v);
 
 // --------------------------------------------------------------------------------
@@ -797,7 +806,7 @@ ASSIMP_API void aiVector3Negate(
  *  @param b Second vector
  *  @return The dot product of vectors
  */
-ASSIMP_API float aiVector3DotProduct(
+ASSIMP_API ai_real aiVector3DotProduct(
         const C_STRUCT aiVector3D *a,
         const C_STRUCT aiVector3D *b);
 
@@ -889,7 +898,7 @@ ASSIMP_API void aiMatrix3Inverse(
 /** Get the determinant of a 3x3 matrix.
  *  @param mat Matrix to get the determinant from
  */
-ASSIMP_API float aiMatrix3Determinant(
+ASSIMP_API ai_real aiMatrix3Determinant(
         const C_STRUCT aiMatrix3x3 *mat);
 
 // --------------------------------------------------------------------------------
@@ -999,7 +1008,7 @@ ASSIMP_API void aiMatrix4Inverse(
  *  @param mat Matrix to get the determinant from
  *  @return The determinant of the matrix
  */
-ASSIMP_API float aiMatrix4Determinant(
+ASSIMP_API ai_real aiMatrix4Determinant(
         const C_STRUCT aiMatrix4x4 *mat);
 
 // --------------------------------------------------------------------------------
diff --git a/include/assimp/color4.h b/include/assimp/color4.h
index e1e354939..dbadcf33b 100644
--- a/include/assimp/color4.h
+++ b/include/assimp/color4.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -88,12 +88,12 @@ public:
     TReal r, g, b, a;
 };  // !struct aiColor4D
 
-typedef aiColor4t<ai_real> aiColor4D;
+typedef aiColor4t<float> aiColor4D;
 
 #else
 
 struct aiColor4D {
-    ai_real r, g, b, a;
+    float r, g, b, a;
 };
 
 #endif // __cplusplus
diff --git a/include/assimp/color4.inl b/include/assimp/color4.inl
index aed3de6f1..b1a6c6e9e 100644
--- a/include/assimp/color4.inl
+++ b/include/assimp/color4.inl
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/commonMetaData.h b/include/assimp/commonMetaData.h
index ccded585b..0f9286cff 100644
--- a/include/assimp/commonMetaData.h
+++ b/include/assimp/commonMetaData.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/config.h.in b/include/assimp/config.h.in
index 40abec490..f20580b4b 100644
--- a/include/assimp/config.h.in
+++ b/include/assimp/config.h.in
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -225,6 +225,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_CONFIG_PP_PTV_ROOT_TRANSFORMATION    \
     "PP_PTV_ROOT_TRANSFORMATION"
 
+// ---------------------------------------------------------------------------
+/** @brief Set epsilon to check the identity of the matrix 4x4.
+ *
+ * This is used by aiMatrix4x4t<TReal>::IsIdentity(const TReal epsilon).
+ * @note The default value is 10e-3f for backward compatibility of legacy code.
+ * Property type: Float.
+ */
+#define AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON \
+    "CHECK_IDENTITY_MATRIX_EPSILON"
+
+// default value for AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON
+#if (!defined AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON_DEFAULT)
+#   define AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON_DEFAULT 10e-3f
+#endif
+
 // ---------------------------------------------------------------------------
 /** @brief Configures the #aiProcess_FindDegenerates step to
  *  remove degenerated primitives from the import - immediately.
@@ -661,6 +676,19 @@ enum aiComponent
 #define AI_CONFIG_FBX_CONVERT_TO_M \
     "AI_CONFIG_FBX_CONVERT_TO_M"
 
+// ---------------------------------------------------------------------------
+/** @brief  Set whether the FBX importer shall ignore the provided axis configuration
+ *
+ * If this property is set to true, the axis directions provided in the FBX file
+ * will be ignored and the file will be loaded as is.
+ *
+ * Set to true for Assimp 5.3.x and earlier behavior
+ * Equivalent to AI_CONFIG_IMPORT_COLLADA_IGNORE_UP_DIRECTION
+ * Property type: Bool. Default value: false.
+ */
+#define AI_CONFIG_IMPORT_FBX_IGNORE_UP_DIRECTION \
+    "AI_CONFIG_IMPORT_FBX_IGNORE_UP_DIRECTION"
+
 // ---------------------------------------------------------------------------
 /** @brief  Will enable the skeleton struct to store bone data.
  *
@@ -709,6 +737,12 @@ enum aiComponent
  */
 #define AI_CONFIG_IMPORT_MDL_HL1_READ_ANIMATION_EVENTS "IMPORT_MDL_HL1_READ_ANIMATION_EVENTS"
 
+// ---------------------------------------------------------------------------
+/** @brief Set whether you want to convert the HS1 coordinate system in a special way.
+ * The default value is true (S1)
+ * Property type: bool
+ */
+#define AI_CONFIG_IMPORT_MDL_HL1_TRANSFORM_COORD_SYSTEM "TRANSFORM COORDSYSTEM FOR HS! MODELS"
 // ---------------------------------------------------------------------------
 /** @brief Set whether the MDL (HL1) importer will read blend controllers.
  * \note This property requires AI_CONFIG_IMPORT_MDL_HL1_READ_ANIMATIONS to be set to true.
@@ -1098,6 +1132,16 @@ enum aiComponent
 #define AI_CONFIG_EXPORT_GLTF_UNLIMITED_SKINNING_BONES_PER_VERTEX \
         "USE_UNLIMITED_BONES_PER VERTEX"
 
+/** @brief Specifies whether to write the value referenced to opacity in TransparencyFactor of each material. 
+ *
+ * When this flag is not defined, the TransparencyFactor value of each meterial is 1.0.
+ * By enabling this flag, the value is 1.0 - opacity;
+
+ * Property type: Bool. Default value: false.
+ */
+#define AI_CONFIG_EXPORT_FBX_TRANSPARENCY_FACTOR_REFER_TO_OPACITY \
+        "EXPORT_FBX_TRANSPARENCY_FACTOR_REFER_TO_OPACITY"
+
 /**
  * @brief Specifies the blob name, assimp uses for exporting.
  * 
diff --git a/include/assimp/defs.h b/include/assimp/defs.h
index e1aaafd44..2f98d0211 100644
--- a/include/assimp/defs.h
+++ b/include/assimp/defs.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -49,14 +49,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_DEFINES_H_INC
 
 #ifdef __GNUC__
-#pragma GCC system_header
+#  pragma GCC system_header
 #endif
 
 #include <assimp/config.h>
 
 //////////////////////////////////////////////////////////////////////////
-/* Define ASSIMP_BUILD_NO_XX_IMPORTER to disable a specific
- * file format loader. The loader is be excluded from the
+/**
+ * @brief Define ASSIMP_BUILD_NO_XX_IMPORTER to disable a specific file format loader.
+ *
+ * The loader is be excluded from the
  * build in this case. 'XX' stands for the most common file
  * extension of the file format. E.g.:
  * ASSIMP_BUILD_NO_X_IMPORTER disables the X loader.
@@ -76,34 +78,33 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //////////////////////////////////////////////////////////////////////////
 
 #ifndef ASSIMP_BUILD_NO_COMPRESSED_X
-#define ASSIMP_BUILD_NEED_Z_INFLATE
+#  define ASSIMP_BUILD_NEED_Z_INFLATE
 #endif
 
 #ifndef ASSIMP_BUILD_NO_COMPRESSED_BLEND
-#define ASSIMP_BUILD_NEED_Z_INFLATE
+#  define ASSIMP_BUILD_NEED_Z_INFLATE
 #endif
 
 #ifndef ASSIMP_BUILD_NO_COMPRESSED_IFC
-#define ASSIMP_BUILD_NEED_Z_INFLATE
-#define ASSIMP_BUILD_NEED_UNZIP
+#  define ASSIMP_BUILD_NEED_Z_INFLATE
+#  define ASSIMP_BUILD_NEED_UNZIP
 #endif
 
 #ifndef ASSIMP_BUILD_NO_Q3BSP_IMPORTER
-#define ASSIMP_BUILD_NEED_Z_INFLATE
-#define ASSIMP_BUILD_NEED_UNZIP
+#  define ASSIMP_BUILD_NEED_Z_INFLATE
+#  define ASSIMP_BUILD_NEED_UNZIP
 #endif
 
-// We need those constants, workaround for any platforms where nobody defined them yet
+/**
+ * @brief We need those constants, workaround for any platforms where nobody defined them yet.
+ */
 #if (!defined SIZE_MAX)
-#define SIZE_MAX (~((size_t)0))
+#  define SIZE_MAX (~((size_t)0))
 #endif
 
-/*#if (!defined UINT_MAX)
-#define UINT_MAX (~((unsigned int)0))
-#endif*/
-
 //////////////////////////////////////////////////////////////////////////
-/* Define ASSIMP_BUILD_NO_XX_PROCESS to disable a specific
+/** @brief Define ASSIMP_BUILD_NO_XX_PROCESS to disable a specific
+ *
  * post processing step. This is the current list of process names ('XX'):
  * CALCTANGENTS
  * JOINVERTICES
@@ -134,46 +135,53 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * OPTIMIZEGRAPH
  * GENENTITYMESHES
  * FIXTEXTUREPATHS
- * GENBOUNDINGBOXES */
-//////////////////////////////////////////////////////////////////////////
+ * GENBOUNDINGBOXES
+ */
 
+//////////////////////////////////////////////////////////////////////////
+/** @brief Define 'ASSIMP_BUILD_DLL_EXPORT' to build a DLL of the library
+ *
+ * Define 'ASSIMP_DLL' before including Assimp to link to ASSIMP in
+ * an external DLL under Windows. Default is static linkage.
+ */
+//////////////////////////////////////////////////////////////////////////
 #ifdef _WIN32
-#undef ASSIMP_API
-//////////////////////////////////////////////////////////////////////////
-/* Define 'ASSIMP_BUILD_DLL_EXPORT' to build a DLL of the library */
-//////////////////////////////////////////////////////////////////////////
-#ifdef ASSIMP_BUILD_DLL_EXPORT
-#define ASSIMP_API __declspec(dllexport)
-#define ASSIMP_API_WINONLY __declspec(dllexport)
-
-//////////////////////////////////////////////////////////////////////////
-/* Define 'ASSIMP_DLL' before including Assimp to link to ASSIMP in
-     * an external DLL under Windows. Default is static linkage. */
-//////////////////////////////////////////////////////////////////////////
-#elif (defined ASSIMP_DLL)
-#define ASSIMP_API __declspec(dllimport)
-#define ASSIMP_API_WINONLY __declspec(dllimport)
+#  undef ASSIMP_API
+#  ifdef ASSIMP_BUILD_DLL_EXPORT
+#    define ASSIMP_API __declspec(dllexport)
+#    define ASSIMP_API_WINONLY __declspec(dllexport)
+#  elif (defined ASSIMP_DLL)
+#    define ASSIMP_API __declspec(dllimport)
+#    define ASSIMP_API_WINONLY __declspec(dllimport)
+#  else
+#    define ASSIMP_API
+#    define ASSIMP_API_WINONLY
+#  endif
 #else
-#define ASSIMP_API
-#define ASSIMP_API_WINONLY
-#endif
-#elif defined(SWIG)
-/* Do nothing, the relevant defines are all in AssimpSwigPort.i */
-#else
-#define ASSIMP_API __attribute__((visibility("default")))
-#define ASSIMP_API_WINONLY
+#  define ASSIMP_API __attribute__((visibility("default")))
+#  define ASSIMP_API_WINONLY
 #endif // _WIN32
 
+/**
+ * @brief Helper macros
+ *
+ * @def   AI_FORCE_INLINE
+ * @brief Force the compiler to inline a function, if possible
+ *
+ * @def   AI_WONT_RETURN
+ * @brief Tells the compiler that a function never returns.
+ *
+ * Used in code analysis to skip dead paths (e.g. after an assertion evaluated to false).
+ */
 #ifdef _MSC_VER
-    #pragma warning(disable : 4521 4512 4714 4127 4351 4510)
+    #pragma warning(disable : 4521 4512 4714 4127 4510)
+    #if _MSC_VER < 1900
+        #pragma warning(disable : 4351)
+    #endif
     #ifdef ASSIMP_BUILD_DLL_EXPORT
         #pragma warning(disable : 4251)
     #endif
-    /* Force the compiler to inline a function, if possible */
     #define AI_FORCE_INLINE inline
-
-    /* Tells the compiler that a function never returns. Used in code analysis
-    * to skip dead paths (e.g. after an assertion evaluated to false). */
     #define AI_WONT_RETURN __declspec(noreturn)
 #elif defined(SWIG)
   /* Do nothing, the relevant defines are all in AssimpSwigPort.i */
@@ -196,15 +204,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifdef __cplusplus
 /* No explicit 'struct' and 'enum' tags for C++, this keeps showing up
- * in doxydocs.
- */
+ * in doxydocs. */
 #define C_STRUCT
 #define C_ENUM
 #else
 //////////////////////////////////////////////////////////////////////////
 /* To build the documentation, make sure ASSIMP_DOXYGEN_BUILD
-     * is defined by Doxygen's preprocessor. The corresponding
-     * entries in the DOXYFILE are: */
+ * is defined by Doxygen's preprocessor. The corresponding
+ * entries in the DOXYFILE are: */
 //////////////////////////////////////////////////////////////////////////
 #if 0
     ENABLE_PREPROCESSING   = YES
@@ -224,34 +231,36 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      * to typedef all structs/enums. */
 //////////////////////////////////////////////////////////////////////////
 #if (defined ASSIMP_DOXYGEN_BUILD)
-#define C_STRUCT
-#define C_ENUM
+#  define C_STRUCT
+#  define C_ENUM
 #else
-#define C_STRUCT struct
-#define C_ENUM enum
+#  define C_STRUCT struct
+#  define C_ENUM enum
 #endif
 #endif
 
 #if (defined(__BORLANDC__) || defined(__BCPLUSPLUS__))
-#error Currently, Borland is unsupported. Feel free to port Assimp.
+#  error Currently, Borland is unsupported. Feel free to port Assimp.
 #endif
 
 //////////////////////////////////////////////////////////////////////////
-/* Define ASSIMP_BUILD_SINGLETHREADED to compile assimp
-     * without threading support. The library doesn't utilize
-     * threads then and is itself not threadsafe. */
+/**
+ * Define ASSIMP_BUILD_SINGLETHREADED to compile assimp
+ * without threading support. The library doesn't utilize
+ * threads then and is itself not threadsafe.
+ */
 //////////////////////////////////////////////////////////////////////////
 #ifndef ASSIMP_BUILD_SINGLETHREADED
-#define ASSIMP_BUILD_SINGLETHREADED
+#  define ASSIMP_BUILD_SINGLETHREADED
 #endif
 
 #if defined(_DEBUG) || !defined(NDEBUG)
-#define ASSIMP_BUILD_DEBUG
+#  define ASSIMP_BUILD_DEBUG
 #endif
 
 //////////////////////////////////////////////////////////////////////////
 /* Define ASSIMP_DOUBLE_PRECISION to compile assimp
-     * with double precision support (64-bit). */
+ * with double precision support (64-bit). */
 //////////////////////////////////////////////////////////////////////////
 
 #ifdef ASSIMP_DOUBLE_PRECISION
@@ -292,55 +301,74 @@ typedef unsigned int ai_uint;
 #ifdef __cplusplus
 constexpr ai_real ai_epsilon = (ai_real) 1e-6;
 #else
-#define ai_epsilon ((ai_real)1e-6)
-#endif
-
-/* Support for big-endian builds */
-#if defined(__BYTE_ORDER__)
-#if (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
-#if !defined(__BIG_ENDIAN__)
-#define __BIG_ENDIAN__
-#endif
-#else /* little endian */
-#if defined(__BIG_ENDIAN__)
-#undef __BIG_ENDIAN__
-#endif
-#endif
-#endif
-#if defined(__BIG_ENDIAN__)
-#define AI_BUILD_BIG_ENDIAN
+#  define ai_epsilon ((ai_real)1e-6)
 #endif
 
 /**
- *  To avoid running out of memory
+ * @brief Support for big-endian builds
+ *
+ * This will check which byte ordering is used on the target architecture.
+ */
+#if defined(__BYTE_ORDER__)
+#  if (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
+#    if !defined(__BIG_ENDIAN__)
+#      define __BIG_ENDIAN__
+#    endif
+#  else /* little endian */
+#    if defined(__BIG_ENDIAN__)
+#      undef __BIG_ENDIAN__
+#    endif
+#  endif
+#endif
+#if defined(__BIG_ENDIAN__)
+#  define AI_BUILD_BIG_ENDIAN
+#endif
+
+/**
+ *  @brief To avoid running out of memory
+ *
  *  This can be adjusted for specific use cases
  *  It's NOT a total limit, just a limit for individual allocations
  */
 #define AI_MAX_ALLOC(type) ((256U * 1024 * 1024) / sizeof(type))
 
 #ifndef _MSC_VER
-#if __cplusplus >= 201103L // C++11
-#define AI_NO_EXCEPT noexcept
+#  if __cplusplus >= 201103L // C++11
+#    define AI_NO_EXCEPT noexcept
+#  else
+#    define AI_NO_EXCEPT
+#  endif
 #else
-#define AI_NO_EXCEPT
-#endif
-#else
-#if (_MSC_VER >= 1915)
-#define AI_NO_EXCEPT noexcept
-#else
-#define AI_NO_EXCEPT
-#endif
+#  if (_MSC_VER >= 1915)
+#    define AI_NO_EXCEPT noexcept
+#  else
+#    define AI_NO_EXCEPT
+#  endif
 #endif // _MSC_VER
 
 /**
- *  Helper macro to set a pointer to NULL in debug builds
+ *  @brief Helper macro to set a pointer to NULL in debug builds
  */
 #if (defined ASSIMP_BUILD_DEBUG)
-#define AI_DEBUG_INVALIDATE_PTR(x) x = NULL;
+#  define AI_DEBUG_INVALIDATE_PTR(x) x = NULL;
 #else
-#define AI_DEBUG_INVALIDATE_PTR(x)
+#  define AI_DEBUG_INVALIDATE_PTR(x)
 #endif
 
 #define AI_COUNT_OF(X) (sizeof(X) / sizeof((X)[0]))
 
-#endif // !! AI_DEFINES_H_INC
\ No newline at end of file
+/**
+ * @brief Will mark functions or classes as deprecated.
+ *
+ * Deprecation means that we will remove this function, class or methods in the next m
+ */
+#if defined(__GNUC__) || defined(__clang__)
+#  define AI_DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER)
+#  define AI_DEPRECATED __declspec(deprecated)
+#else
+#  pragma message("WARNING: You need to implement DEPRECATED for this compiler")
+#  define AI_DEPRECATED
+#endif
+
+#endif // !! AI_DEFINES_H_INC
diff --git a/include/assimp/fast_atof.h b/include/assimp/fast_atof.h
index f2d179d60..0e8339643 100644
--- a/include/assimp/fast_atof.h
+++ b/include/assimp/fast_atof.h
@@ -150,7 +150,7 @@ inline uint8_t HexOctetToDecimal(const char* in) {
 // ------------------------------------------------------------------------------------
 // signed variant of strtoul10
 // ------------------------------------------------------------------------------------
-inline int strtol10( const char* in, const char** out=0) {
+inline int strtol10( const char* in, const char** out = 0) {
     bool inv = (*in=='-');
     if ( inv || *in == '+' ) {
         ++in;
@@ -158,7 +158,7 @@ inline int strtol10( const char* in, const char** out=0) {
 
     int value = strtoul10(in,out);
     if (inv) {
-        if (value < INT_MAX) {
+        if (value < INT_MAX && value > INT_MIN) {
             value = -value;
         } else {
             ASSIMP_LOG_WARN( "Converting the string \"", in, "\" into an inverted value resulted in overflow." );
diff --git a/include/assimp/importerdesc.h b/include/assimp/importerdesc.h
index d08bd1781..8d60ca96b 100644
--- a/include/assimp/importerdesc.h
+++ b/include/assimp/importerdesc.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/light.h b/include/assimp/light.h
index 3331997a9..f6183472c 100644
--- a/include/assimp/light.h
+++ b/include/assimp/light.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/material.h b/include/assimp/material.h
index 80551e53d..9d10347cc 100644
--- a/include/assimp/material.h
+++ b/include/assimp/material.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -292,6 +292,14 @@ enum aiTextureType {
     aiTextureType_DIFFUSE_ROUGHNESS = 16,
     aiTextureType_AMBIENT_OCCLUSION = 17,
 
+    /** Unknown texture
+     *
+     *  A texture reference that does not match any of the definitions
+     *  above is considered to be 'unknown'. It is still imported,
+     *  but is excluded from any further post-processing.
+    */
+    aiTextureType_UNKNOWN = 18,
+
     /** PBR Material Modifiers
     * Some modern renderers have further PBR modifiers that may be overlaid
     * on top of the 'base' PBR materials for additional realism.
@@ -318,23 +326,45 @@ enum aiTextureType {
     */
     aiTextureType_TRANSMISSION = 21,
 
-    /** Unknown texture
-     *
-     *  A texture reference that does not match any of the definitions
-     *  above is considered to be 'unknown'. It is still imported,
-     *  but is excluded from any further post-processing.
-    */
-    aiTextureType_UNKNOWN = 18,
+    /**
+     * Maya material declarations
+     */
+    aiTextureType_MAYA_BASE = 22,
+    aiTextureType_MAYA_SPECULAR = 23,
+    aiTextureType_MAYA_SPECULAR_COLOR = 24,
+    aiTextureType_MAYA_SPECULAR_ROUGHNESS = 25,
+
+    /** Anisotropy
+    * Simulates a surface with directional properties
+     */
+    aiTextureType_ANISOTROPY = 26,
+
+    /**
+     * gltf material declarations
+     * Refs: https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#metallic-roughness-material
+     *           "textures for metalness and roughness properties are packed together in a single
+     *           texture called metallicRoughnessTexture. Its green channel contains roughness
+     *           values and its blue channel contains metalness values..."
+     *       https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#_material_pbrmetallicroughness_metallicroughnesstexture
+     *           "The metalness values are sampled from the B channel. The roughness values are
+     *           sampled from the G channel..."
+     */
+    aiTextureType_GLTF_METALLIC_ROUGHNESS = 27,
 
 #ifndef SWIG
     _aiTextureType_Force32Bit = INT_MAX
 #endif
 };
 
-#define AI_TEXTURE_TYPE_MAX aiTextureType_TRANSMISSION
+#define AI_TEXTURE_TYPE_MAX aiTextureType_GLTF_METALLIC_ROUGHNESS
 
 // -------------------------------------------------------------------------------
-// Get a string for a given aiTextureType
+/**
+ * @brief  Get a string for a given aiTextureType
+ *
+ * @param  in  The texture type
+ * @return The description string for the texture type.
+ */
 ASSIMP_API const char *aiTextureTypeToString(enum aiTextureType in);
 
 // ---------------------------------------------------------------------------
@@ -425,7 +455,8 @@ enum aiShadingMode {
 };
 
 // ---------------------------------------------------------------------------
-/** @brief Defines some mixed flags for a particular texture.
+/**
+ *  @brief Defines some mixed flags for a particular texture.
  *
  *  Usually you'll instruct your cg artists how textures have to look like ...
  *  and how they will be processed in your application. However, if you use
@@ -464,7 +495,8 @@ enum aiTextureFlags {
 };
 
 // ---------------------------------------------------------------------------
-/** @brief Defines alpha-blend flags.
+/**
+ *  @brief Defines alpha-blend flags.
  *
  *  If you're familiar with OpenGL or D3D, these flags aren't new to you.
  *  They define *how* the final color value of a pixel is computed, basing
@@ -508,7 +540,8 @@ enum aiBlendMode {
 #include "./Compiler/pushpack1.h"
 
 // ---------------------------------------------------------------------------
-/** @brief Defines how an UV channel is transformed.
+/**
+ *  @brief Defines how an UV channel is transformed.
  *
  *  This is just a helper structure for the #AI_MATKEY_UVTRANSFORM key.
  *  See its documentation for more details.
@@ -552,8 +585,8 @@ struct aiUVTransform {
 
 //! @cond AI_DOX_INCLUDE_INTERNAL
 // ---------------------------------------------------------------------------
-/** @brief A very primitive RTTI system for the contents of material
- *  properties.
+/**
+ *  @brief A very primitive RTTI system for the contents of material properties.
  */
 enum aiPropertyTypeInfo {
     /** Array of single-precision (32 Bit) floats
@@ -685,7 +718,7 @@ struct aiMaterialProperty {
 *  Material data is stored using a key-value structure. A single key-value
 *  pair is called a 'material property'. C++ users should use the provided
 *  member functions of aiMaterial to process material properties, C users
-*  have to stick with the aiMaterialGetXXX family of unbound functions.
+*  have to stick with the aiGetMaterialXXX family of unbound functions.
 *  The library defines a set of standard keys (AI_MATKEY_XXX).
 */
 #ifdef __cplusplus
@@ -698,7 +731,14 @@ struct aiMaterial
 #ifdef __cplusplus
 
 public:
+    /**
+     * @brief  The class constructor.
+     */
     aiMaterial();
+
+    /**
+     * @brief The class destructor.
+     */
     ~aiMaterial();
 
     // -------------------------------------------------------------------
@@ -1016,7 +1056,7 @@ extern "C" {
 // Clearcoat
 // ---------
 // Clearcoat layer intensity. 0.0 = none (disabled)
-#define AI_MATKEY_CLEARCOAT_FACTOR "$mat.clearcoat.factor", 0, 0
+#define AI_MATKEY_CLEARCOAT_FACTOR           "$mat.clearcoat.factor", 0, 0
 #define AI_MATKEY_CLEARCOAT_ROUGHNESS_FACTOR "$mat.clearcoat.roughnessFactor", 0, 0
 #define AI_MATKEY_CLEARCOAT_TEXTURE aiTextureType_CLEARCOAT, 0
 #define AI_MATKEY_CLEARCOAT_ROUGHNESS_TEXTURE aiTextureType_CLEARCOAT, 1
@@ -1046,23 +1086,28 @@ extern "C" {
 
 // Emissive
 // --------
-#define AI_MATKEY_USE_EMISSIVE_MAP "$mat.useEmissiveMap", 0, 0
+#define AI_MATKEY_USE_EMISSIVE_MAP   "$mat.useEmissiveMap", 0, 0
 #define AI_MATKEY_EMISSIVE_INTENSITY "$mat.emissiveIntensity", 0, 0
-#define AI_MATKEY_USE_AO_MAP "$mat.useAOMap", 0, 0
+#define AI_MATKEY_USE_AO_MAP         "$mat.useAOMap", 0, 0
+
+// Anisotropy
+// ----------
+#define AI_MATKEY_ANISOTROPY_ROTATION "$mat.anisotropyRotation", 0, 0
+#define AI_MATKEY_ANISOTROPY_TEXTURE aiTextureType_ANISOTROPY, 0
 
 // ---------------------------------------------------------------------------
 // Pure key names for all texture-related properties
 //! @cond MATS_DOC_FULL
-#define _AI_MATKEY_TEXTURE_BASE "$tex.file"
-#define _AI_MATKEY_UVWSRC_BASE "$tex.uvwsrc"
-#define _AI_MATKEY_TEXOP_BASE "$tex.op"
-#define _AI_MATKEY_MAPPING_BASE "$tex.mapping"
-#define _AI_MATKEY_TEXBLEND_BASE "$tex.blend"
+#define _AI_MATKEY_TEXTURE_BASE       "$tex.file"
+#define _AI_MATKEY_UVWSRC_BASE        "$tex.uvwsrc"
+#define _AI_MATKEY_TEXOP_BASE         "$tex.op"
+#define _AI_MATKEY_MAPPING_BASE       "$tex.mapping"
+#define _AI_MATKEY_TEXBLEND_BASE      "$tex.blend"
 #define _AI_MATKEY_MAPPINGMODE_U_BASE "$tex.mapmodeu"
 #define _AI_MATKEY_MAPPINGMODE_V_BASE "$tex.mapmodev"
-#define _AI_MATKEY_TEXMAP_AXIS_BASE "$tex.mapaxis"
-#define _AI_MATKEY_UVTRANSFORM_BASE "$tex.uvtrafo"
-#define _AI_MATKEY_TEXFLAGS_BASE "$tex.flags"
+#define _AI_MATKEY_TEXMAP_AXIS_BASE   "$tex.mapaxis"
+#define _AI_MATKEY_UVTRANSFORM_BASE   "$tex.uvtrafo"
+#define _AI_MATKEY_TEXFLAGS_BASE      "$tex.flags"
 //! @endcond
 
 // ---------------------------------------------------------------------------
@@ -1534,12 +1579,12 @@ ASSIMP_API C_ENUM aiReturn aiGetMaterialFloatArray(
 * @return Specifies whether the key has been found. If not, the output
 *   float remains unmodified.*/
 // ---------------------------------------------------------------------------
-inline aiReturn aiGetMaterialFloat(const C_STRUCT aiMaterial *pMat,
+static inline aiReturn aiGetMaterialFloat(const C_STRUCT aiMaterial *pMat,
         const char *pKey,
         unsigned int type,
         unsigned int index,
         ai_real *pOut) {
-    return aiGetMaterialFloatArray(pMat, pKey, type, index, pOut, (unsigned int *)0x0);
+    return aiGetMaterialFloatArray(pMat, pKey, type, index, pOut, NULL);
 }
 
 // ---------------------------------------------------------------------------
@@ -1559,12 +1604,12 @@ ASSIMP_API C_ENUM aiReturn aiGetMaterialIntegerArray(const C_STRUCT aiMaterial *
  *
  * See the sample for aiGetMaterialFloat for more information.*/
 // ---------------------------------------------------------------------------
-inline aiReturn aiGetMaterialInteger(const C_STRUCT aiMaterial *pMat,
+static inline aiReturn aiGetMaterialInteger(const C_STRUCT aiMaterial *pMat,
         const char *pKey,
         unsigned int type,
         unsigned int index,
         int *pOut) {
-    return aiGetMaterialIntegerArray(pMat, pKey, type, index, pOut, (unsigned int *)0x0);
+    return aiGetMaterialIntegerArray(pMat, pKey, type, index, pOut, NULL);
 }
 
 // ---------------------------------------------------------------------------
diff --git a/include/assimp/material.inl b/include/assimp/material.inl
index b7222f9c7..45f0cecd0 100644
--- a/include/assimp/material.inl
+++ b/include/assimp/material.inl
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -136,9 +136,7 @@ AI_FORCE_INLINE aiReturn aiMaterial::Get(const char* pKey,unsigned int type,
 // Specialisation for a single bool.
 // Casts floating point and integer to bool
 template <>
-AI_FORCE_INLINE
-        aiReturn
-        aiMaterial::Get(const char *pKey, unsigned int type,
+AI_FORCE_INLINE aiReturn aiMaterial::Get(const char *pKey, unsigned int type,
                 unsigned int idx, bool &pOut) const {
     const aiMaterialProperty *prop;
     const aiReturn ret = ::aiGetMaterialProperty(this, pKey, type, idx,
@@ -193,7 +191,7 @@ AI_FORCE_INLINE aiReturn aiMaterial::Get(const char* pKey,unsigned int type,
 }
 // ---------------------------------------------------------------------------
 AI_FORCE_INLINE aiReturn aiMaterial::Get(const char* pKey,unsigned int type,
-        unsigned int idx,ai_real& pOut) const {
+        unsigned int idx, ai_real& pOut) const {
     return aiGetMaterialFloat(this,pKey,type,idx,&pOut);
 }
 // ---------------------------------------------------------------------------
@@ -312,7 +310,6 @@ AI_FORCE_INLINE aiReturn aiMaterial::AddProperty(const int* pInput,
         pKey,type,index,aiPTI_Integer);
 }
 
-
 // ---------------------------------------------------------------------------
 // The template specializations below are for backwards compatibility.
 // The recommended way to add material properties is using the non-template
diff --git a/include/assimp/matrix3x3.h b/include/assimp/matrix3x3.h
index 74382e263..cd0a51c39 100644
--- a/include/assimp/matrix3x3.h
+++ b/include/assimp/matrix3x3.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/matrix3x3.inl b/include/assimp/matrix3x3.inl
index 99d9197e3..5219a4e38 100644
--- a/include/assimp/matrix3x3.inl
+++ b/include/assimp/matrix3x3.inl
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/matrix4x4.h b/include/assimp/matrix4x4.h
index 67e0e356e..8ec16b926 100644
--- a/include/assimp/matrix4x4.h
+++ b/include/assimp/matrix4x4.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
@@ -53,6 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/vector3.h>
 #include <assimp/defs.h>
+#include <assimp/config.h>
 
 #ifdef __cplusplus
 
@@ -72,11 +73,14 @@ template<typename TReal> class aiQuaterniont;
 template<typename TReal>
 class aiMatrix4x4t {
 public:
-
-    /** set to identity */
+    /**
+     * @brief Set to identity
+     * */
     aiMatrix4x4t() AI_NO_EXCEPT;
 
-    /** construction from single values */
+    /**
+     * @brief Construction from single values
+     * */
     aiMatrix4x4t (  TReal _a1, TReal _a2, TReal _a3, TReal _a4,
                     TReal _b1, TReal _b2, TReal _b3, TReal _b4,
                     TReal _c1, TReal _c2, TReal _c3, TReal _c4,
@@ -92,18 +96,18 @@ public:
      * @param position The position for the x,y,z axes
      */
     aiMatrix4x4t(const aiVector3t<TReal>& scaling, const aiQuaterniont<TReal>& rotation,
-        const aiVector3t<TReal>& position);
+          const aiVector3t<TReal>& position);
 
     // array access operators
-	/** @fn TReal* operator[] (unsigned int p_iIndex)
-	 *  @param [in] p_iIndex - index of the row.
-	 *  @return pointer to pointed row.
-	 */
-    TReal* operator[]       (unsigned int p_iIndex);
+    /** @fn TReal* operator[] (unsigned int p_iIndex)
+     *  @param [in] p_iIndex - index of the row.
+     *  @return pointer to pointed row.
+     */
+      TReal* operator[] (unsigned int p_iIndex);
 
-	/** @fn const TReal* operator[] (unsigned int p_iIndex) const
-	 *  @overload TReal* operator[] (unsigned int p_iIndex)
-	 */
+    /** @fn const TReal* operator[] (unsigned int p_iIndex) const
+     *  @overload TReal* operator[] (unsigned int p_iIndex)
+     */
     const TReal* operator[] (unsigned int p_iIndex) const;
 
     // comparison operators
@@ -131,51 +135,57 @@ public:
      *  Beware, use (f != f) to check whether a TReal f is qnan.
      */
     aiMatrix4x4t& Inverse();
-    TReal Determinant() const;
 
+    // -------------------------------------------------------------------
+    /**
+     * @brief Inverts the matrix if it is invertible.
+     */
+    TReal Determinant() const;
 
     // -------------------------------------------------------------------
     /** @brief Returns true of the matrix is the identity matrix.
+     *  @param epsilon Value of epsilon. Default value is 10e-3 for backward
+     *  compatibility with legacy code.
+     *  @return Returns true of the matrix is the identity matrix.
      *  The check is performed against a not so small epsilon.
      */
-    inline bool IsIdentity() const;
+    inline bool IsIdentity(const TReal
+            epsilon = AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON_DEFAULT) const;
 
     // -------------------------------------------------------------------
     /** @brief Decompose a trafo matrix into its original components
-     *  @param scaling Receives the output scaling for the x,y,z axes
-     *  @param rotation Receives the output rotation as a hamilton
-     *   quaternion
+     *  @param scaling  Receives the output scaling for the x,y,z axes
+     *  @param rotation Receives the output rotation as a hamilton quaternion
      *  @param position Receives the output position for the x,y,z axes
      */
     void Decompose (aiVector3t<TReal>& scaling, aiQuaterniont<TReal>& rotation,
         aiVector3t<TReal>& position) const;
 
-	// -------------------------------------------------------------------
-	/** @fn void Decompose(aiVector3t<TReal>& pScaling, aiVector3t<TReal>& pRotation, aiVector3t<TReal>& pPosition) const
+    // -------------------------------------------------------------------
+    /**
      *  @brief Decompose a trafo matrix into its original components.
-     * Thx to good FAQ at http://www.gamedev.ru/code/articles/faq_matrix_quat
-     *  @param [out] pScaling - Receives the output scaling for the x,y,z axes.
+     *  Thx to good FAQ at http://www.gamedev.ru/code/articles/faq_matrix_quat
+     *  @param [out] pScaling  - Receives the output scaling for the x,y,z axes.
      *  @param [out] pRotation - Receives the output rotation as a Euler angles.
      *  @param [out] pPosition - Receives the output position for the x,y,z axes.
      */
     void Decompose(aiVector3t<TReal>& pScaling, aiVector3t<TReal>& pRotation, aiVector3t<TReal>& pPosition) const;
 
-	// -------------------------------------------------------------------
-	/** @fn void Decompose(aiVector3t<TReal>& pScaling, aiVector3t<TReal>& pRotationAxis, TReal& pRotationAngle, aiVector3t<TReal>& pPosition) const
+    // -------------------------------------------------------------------
+    /**
      *  @brief Decompose a trafo matrix into its original components
-	 * Thx to good FAQ at http://www.gamedev.ru/code/articles/faq_matrix_quat
-     *  @param [out] pScaling - Receives the output scaling for the x,y,z axes.
-     *  @param [out] pRotationAxis - Receives the output rotation axis.
-	 *  @param [out] pRotationAngle - Receives the output rotation angle for @ref pRotationAxis.
-     *  @param [out] pPosition - Receives the output position for the x,y,z axes.
+     * Thx to good FAQ at http://www.gamedev.ru/code/articles/faq_matrix_quat
+     *  @param [out] pScaling       - Receives the output scaling for the x,y,z axes.
+     *  @param [out] pRotationAxis  - Receives the output rotation axis.
+     *  @param [out] pRotationAngle - Receives the output rotation angle for @ref pRotationAxis.
+     *  @param [out] pPosition      - Receives the output position for the x,y,z axes.
      */
     void Decompose(aiVector3t<TReal>& pScaling, aiVector3t<TReal>& pRotationAxis, TReal& pRotationAngle, aiVector3t<TReal>& pPosition) const;
 
     // -------------------------------------------------------------------
     /** @brief Decompose a trafo matrix with no scaling into its
      *    original components
-     *  @param rotation Receives the output rotation as a hamilton
-     *    quaternion
+     *  @param rotation Receives the output rotation as a hamilton quaternion
      *  @param position Receives the output position for the x,y,z axes
      */
     void DecomposeNoScaling (aiQuaterniont<TReal>& rotation,
@@ -192,7 +202,7 @@ public:
 
     // -------------------------------------------------------------------
     /** @brief Returns a rotation matrix for a rotation around the x axis
-     *  @param a Rotation angle, in radians
+     *  @param a   Rotation angle, in radians
      *  @param out Receives the output matrix
      *  @return Reference to the output matrix
      */
@@ -200,7 +210,7 @@ public:
 
     // -------------------------------------------------------------------
     /** @brief Returns a rotation matrix for a rotation around the y axis
-     *  @param a Rotation angle, in radians
+     *  @param a   Rotation angle, in radians
      *  @param out Receives the output matrix
      *  @return Reference to the output matrix
      */
diff --git a/include/assimp/matrix4x4.inl b/include/assimp/matrix4x4.inl
index 54d176d18..f036a4fdd 100644
--- a/include/assimp/matrix4x4.inl
+++ b/include/assimp/matrix4x4.inl
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -242,7 +242,7 @@ aiMatrix4x4t<TReal>& aiMatrix4x4t<TReal>::Inverse() {
     const TReal det = Determinant();
     if(det == static_cast<TReal>(0.0))
     {
-        // Matrix not invertible. Setting all elements to nan is not really
+        // Matrix is not invertible. Setting all elements to nan is not really
         // correct in a mathematical sense but it is easy to debug for the
         // programmer.
         const TReal nan = std::numeric_limits<TReal>::quiet_NaN();
@@ -545,10 +545,7 @@ aiMatrix4x4t<TReal>& aiMatrix4x4t<TReal>::FromEulerAnglesXYZ(TReal x, TReal y, T
 // ----------------------------------------------------------------------------------------
 template <typename TReal>
 AI_FORCE_INLINE
-bool aiMatrix4x4t<TReal>::IsIdentity() const {
-    // Use a small epsilon to solve floating-point inaccuracies
-    const static TReal epsilon = 10e-3f;
-
+bool aiMatrix4x4t<TReal>::IsIdentity(const TReal epsilon) const {
     return (a2 <= epsilon && a2 >= -epsilon &&
             a3 <= epsilon && a3 >= -epsilon &&
             a4 <= epsilon && a4 >= -epsilon &&
@@ -657,7 +654,7 @@ aiMatrix4x4t<TReal>& aiMatrix4x4t<TReal>::Scaling( const aiVector3t<TReal>& v, a
 /** A function for creating a rotation matrix that rotates a vector called
  * "from" into another vector called "to".
  * Input : from[3], to[3] which both must be *normalized* non-zero vectors
- * Output: mtx[3][3] -- a 3x3 matrix in colum-major form
+ * Output: mtx[3][3] -- a 3x3 matrix in column-major form
  * Authors: Tomas Möller, John Hughes
  *          "Efficiently Building a Matrix to Rotate One Vector to Another"
  *          Journal of Graphics Tools, 4(4):1-4, 1999
diff --git a/include/assimp/mesh.h b/include/assimp/mesh.h
index cca293a00..588092dd0 100644
--- a/include/assimp/mesh.h
+++ b/include/assimp/mesh.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2023, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #pragma GCC system_header
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #pragma warning(disable : 4351)
 #endif // _MSC_VER
 
@@ -660,7 +660,7 @@ struct aiMesh {
 
     /**
      * @brief Vertex positions.
-     * 
+     *
      * This array is always present in a mesh. The array is
      * mNumVertices in size.
      */
@@ -668,7 +668,7 @@ struct aiMesh {
 
     /**
      * @brief Vertex normals.
-     * 
+     *
      * The array contains normalized vectors, nullptr if not present.
      * The array is mNumVertices in size. Normals are undefined for
      * point and line primitives. A mesh consisting of points and
@@ -692,7 +692,7 @@ struct aiMesh {
 
     /**
      * @brief Vertex tangents.
-     * 
+     *
      * The tangent of a vertex points in the direction of the positive
      * X texture axis. The array contains normalized vectors, nullptr if
      * not present. The array is mNumVertices in size. A mesh consisting
@@ -708,7 +708,7 @@ struct aiMesh {
 
     /**
      * @brief Vertex bitangents.
-     * 
+     *
      * The bitangent of a vertex points in the direction of the positive
      * Y texture axis. The array contains normalized vectors, nullptr if not
      * present. The array is mNumVertices in size.
@@ -719,7 +719,7 @@ struct aiMesh {
 
     /**
      * @brief Vertex color sets.
-     * 
+     *
      * A mesh may contain 0 to #AI_MAX_NUMBER_OF_COLOR_SETS vertex
      * colors per vertex. nullptr if not present. Each array is
      * mNumVertices in size if present.
@@ -728,15 +728,16 @@ struct aiMesh {
 
     /**
      * @brief Vertex texture coordinates, also known as UV channels.
-     * 
-     * A mesh may contain 0 to AI_MAX_NUMBER_OF_TEXTURECOORDS per
-     * vertex. nullptr if not present. The array is mNumVertices in size.
+     *
+     * A mesh may contain 0 to AI_MAX_NUMBER_OF_TEXTURECOORDS channels per
+     * vertex. Used and unused (nullptr) channels may go in any order.
+     * The array is mNumVertices in size.
      */
     C_STRUCT aiVector3D *mTextureCoords[AI_MAX_NUMBER_OF_TEXTURECOORDS];
 
     /**
      * @brief Specifies the number of components for a given UV channel.
-     * 
+     *
      * Up to three channels are supported (UVW, for accessing volume
      * or cube maps). If the value is 2 for a given channel n, the
      * component p.z of mTextureCoords[n][p] is set to 0.0f.
@@ -747,7 +748,7 @@ struct aiMesh {
 
     /**
      * @brief The faces the mesh is constructed from.
-     * 
+     *
      * Each face refers to a number of vertices by their indices.
      * This array is always present in a mesh, its size is given
      *  in mNumFaces. If the #AI_SCENE_FLAGS_NON_VERBOSE_FORMAT
@@ -762,7 +763,7 @@ struct aiMesh {
 
     /**
      * @brief The bones of this mesh.
-     * 
+     *
      * A bone consists of a name by which it can be found in the
      * frame hierarchy and a set of vertex weights.
      */
@@ -770,7 +771,7 @@ struct aiMesh {
 
     /**
      * @brief The material used by this mesh.
-     * 
+     *
      * A mesh uses only a single material. If an imported model uses
      * multiple materials, the import splits up the mesh. Use this value
      * as index into the scene's material list.
@@ -917,7 +918,7 @@ struct aiMesh {
     }
 
     //! @brief Check whether the mesh contains tangent and bitangent vectors.
-    //! 
+    //!
     //! It is not possible that it contains tangents and no bitangents
     //! (or the other way round). The existence of one of them
     //! implies that the second is there, too.
@@ -933,7 +934,7 @@ struct aiMesh {
         if (index >= AI_MAX_NUMBER_OF_COLOR_SETS) {
             return false;
         }
-        return mColors[index] != nullptr && mNumVertices > 0;        
+        return mColors[index] != nullptr && mNumVertices > 0;
     }
 
     //! @brief Check whether the mesh contains a texture coordinate set
@@ -950,8 +951,10 @@ struct aiMesh {
     //! @return the number of stored uv-channels.
     unsigned int GetNumUVChannels() const {
         unsigned int n(0);
-        while (n < AI_MAX_NUMBER_OF_TEXTURECOORDS && mTextureCoords[n]) {
-            ++n;
+        for (unsigned i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; i++) {
+            if (mTextureCoords[i]) {
+                ++n;
+            }
         }
 
         return n;
diff --git a/include/assimp/metadata.h b/include/assimp/metadata.h
index c766d0ae2..ac3f8d4e7 100644
--- a/include/assimp/metadata.h
+++ b/include/assimp/metadata.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -113,19 +113,19 @@ struct aiMetadata;
   */
 // -------------------------------------------------------------------------------
 
-inline aiMetadataType GetAiType(bool) {
+inline aiMetadataType GetAiType(const bool &) {
     return AI_BOOL;
 }
 inline aiMetadataType GetAiType(int32_t) {
     return AI_INT32;
 }
-inline aiMetadataType GetAiType(uint64_t) {
+inline aiMetadataType GetAiType(const uint64_t &) {
     return AI_UINT64;
 }
-inline aiMetadataType GetAiType(float) {
+inline aiMetadataType GetAiType(const float &) {
     return AI_FLOAT;
 }
-inline aiMetadataType GetAiType(double) {
+inline aiMetadataType GetAiType(const double &) {
     return AI_DOUBLE;
 }
 inline aiMetadataType GetAiType(const aiString &) {
@@ -137,10 +137,10 @@ inline aiMetadataType GetAiType(const aiVector3D &) {
 inline aiMetadataType GetAiType(const aiMetadata &) {
     return AI_AIMETADATA;
 }
-inline aiMetadataType GetAiType(int64_t) {
+inline aiMetadataType GetAiType(const int64_t &) {
     return AI_INT64;
 }
-inline aiMetadataType GetAiType(uint32_t) {
+inline aiMetadataType GetAiType(const uint32_t &) {
     return AI_UINT32;
 }
 
diff --git a/include/assimp/module.modulemap b/include/assimp/module.modulemap
new file mode 100644
index 000000000..b29725bfc
--- /dev/null
+++ b/include/assimp/module.modulemap
@@ -0,0 +1,33 @@
+// Export headers for Swift (iOS)
+module libassimp {
+    header "ColladaMetaData.h"
+    header "GltfMaterial.h"
+    header "ObjMaterial.h"
+    header "anim.h"
+    header "camera.h"
+    header "cexport.h"
+    header "cfileio.h"
+    header "cimport.h"
+    header "color4.h"
+    header "commonMetaData.h"
+    header "config.h"
+    header "defs.h"
+    header "importerdesc.h"
+    header "light.h"
+    header "material.h"
+    header "matrix3x3.h"
+    header "matrix4x4.h"
+    header "mesh.h"
+    header "metadata.h"
+    header "pbrmaterial.h"
+    header "postprocess.h"
+    header "quaternion.h"
+    header "revision.h"
+    header "scene.h"
+    header "texture.h"
+    header "types.h"
+    header "vector2.h"
+    header "vector3.h"
+    header "version.h"
+    export *
+}
diff --git a/include/assimp/pbrmaterial.h b/include/assimp/pbrmaterial.h
index 3bdf151a3..a732a82ec 100644
--- a/include/assimp/pbrmaterial.h
+++ b/include/assimp/pbrmaterial.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/port/AndroidJNI/BundledAssetIOSystem.h b/include/assimp/port/AndroidJNI/BundledAssetIOSystem.h
index bc1ce7878..c6adae60e 100644
--- a/include/assimp/port/AndroidJNI/BundledAssetIOSystem.h
+++ b/include/assimp/port/AndroidJNI/BundledAssetIOSystem.h
@@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/DefaultIOSystem.h>
 #include <assimp/IOStream.hpp>
 
-namespace Assimp        {
+namespace Assimp {
 
 class BundledAssetIOSystem : public Assimp::DefaultIOSystem {
 
diff --git a/include/assimp/postprocess.h b/include/assimp/postprocess.h
index a905a8be0..6783daafd 100644
--- a/include/assimp/postprocess.h
+++ b/include/assimp/postprocess.h
@@ -2,8 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -379,7 +378,7 @@ enum aiPostProcessSteps
      *     point primitives to separate meshes.
      *   </li>
      *   <li>Set the <tt>#AI_CONFIG_PP_SBP_REMOVE</tt> importer property to
-     *       @code aiPrimitiveType_POINTS | aiPrimitiveType_LINES
+     *       @code aiPrimitiveType_POINT | aiPrimitiveType_LINE
      *       @endcode to cause SortByPType to reject point
      *       and line meshes from the scene.
      *   </li>
@@ -506,7 +505,7 @@ enum aiPostProcessSteps
      *
      * <b>Output UV coordinate system:</b>
      * @code
-     * 0y|0y ---------- 1x|0y
+     * 0x|0y ---------- 1x|0y
      * |                 |
      * |                 |
      * |                 |
diff --git a/include/assimp/qnan.h b/include/assimp/qnan.h
index c64cabaad..f5977e46c 100644
--- a/include/assimp/qnan.h
+++ b/include/assimp/qnan.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/include/assimp/quaternion.h b/include/assimp/quaternion.h
index 7ab3ad6f8..11dda2267 100644
--- a/include/assimp/quaternion.h
+++ b/include/assimp/quaternion.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -45,14 +45,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_QUATERNION_H_INC
 #define AI_QUATERNION_H_INC
 
+#include <assimp/defs.h>
+
 #ifdef __cplusplus
 
 #ifdef __GNUC__
 #   pragma GCC system_header
 #endif
 
-#include <assimp/defs.h>
-
 // Forward declarations
 template <typename TReal> class aiVector3t;
 template <typename TReal> class aiMatrix3x3t;
diff --git a/include/assimp/quaternion.inl b/include/assimp/quaternion.inl
index 2cb24653c..a83034f61 100644
--- a/include/assimp/quaternion.inl
+++ b/include/assimp/quaternion.inl
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/revision.h.in b/include/assimp/revision.h.in
similarity index 100%
rename from revision.h.in
rename to include/assimp/revision.h.in
diff --git a/include/assimp/scene.h b/include/assimp/scene.h
index 1b830a5b0..ed7eb3859 100644
--- a/include/assimp/scene.h
+++ b/include/assimp/scene.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -141,27 +141,57 @@ struct ASSIMP_API aiNode {
     /** Destructor */
     ~aiNode();
 
-    /** Searches for a node with a specific name, beginning at this
+    /**
+     *  @brief Searches for a node with a specific name, beginning at this
      *  nodes. Normally you will call this method on the root node
      *  of the scene.
      *
      *  @param name Name to search for
      *  @return nullptr or a valid Node if the search was successful.
      */
-    inline
-    const aiNode* FindNode(const aiString& name) const {
+    inline const aiNode* FindNode(const aiString& name) const {
         return FindNode(name.data);
     }
 
-    inline
-    aiNode* FindNode(const aiString& name) {
+    inline aiNode* FindNode(const aiString& name) {
         return FindNode(name.data);
     }
 
+    /**
+     * @brief Will search for a node described by its name.
+     * @param[in] name  The name for the node to look for.
+     * @return Pointer showing to the node or nullptr if not found.
+     */
     const aiNode* FindNode(const char* name) const;
-
     aiNode* FindNode(const char* name);
 
+    // ------------------------------------------------------------------------------------------------
+    // Helper to find the node associated with a bone in the scene
+    const aiNode *findBoneNode(const aiBone *bone) const {
+        if (bone == nullptr) {
+            return nullptr;
+        }
+
+        if (mName == bone->mName) {
+            return this;
+        }
+
+        for (unsigned int i = 0; i < mNumChildren; ++i) {
+            aiNode *aChild = mChildren[i];
+            if (aChild == nullptr) {
+                continue;
+            }
+
+            const aiNode *foundFromChild = nullptr;
+            foundFromChild = aChild->findBoneNode(bone);
+            if (foundFromChild) {
+                return foundFromChild;
+            }
+        }
+
+        return nullptr;
+    }
+
     /**
      * @brief   Will add new children.
      * @param   numChildren  Number of children to add.
@@ -240,8 +270,7 @@ struct ASSIMP_API aiNode {
  *  delete a given scene on your own.
  */
 // -------------------------------------------------------------------------------
-struct aiScene
-{
+struct ASSIMP_API aiScene {
     /** Any combination of the AI_SCENE_FLAGS_XXX flags. By default
     * this value is 0, no flags are set. Most applications will
     * want to reject all scenes with the AI_SCENE_FLAGS_INCOMPLETE
@@ -355,10 +384,10 @@ struct aiScene
 #ifdef __cplusplus
 
     //! Default constructor - set everything to 0/nullptr
-    ASSIMP_API aiScene();
+    aiScene();
 
     //! Destructor
-    ASSIMP_API ~aiScene();
+    ~aiScene();
 
     //! Check whether the scene contains meshes
     //! Unless no special scene flags are set this will always be true.
@@ -392,15 +421,17 @@ struct aiScene
         return mAnimations != nullptr && mNumAnimations > 0;
     }
 
-    bool hasSkeletons() const {
+    //! Check whether the scene contains skeletons
+    inline bool HasSkeletons() const {
         return mSkeletons != nullptr && mNumSkeletons > 0;
     }
 
     //! Returns a short filename from a full path
     static const char* GetShortFilename(const char* filename) {
         const char* lastSlash = strrchr(filename, '/');
-        if (lastSlash == nullptr) {
-            lastSlash = strrchr(filename, '\\');
+        const char* lastBackSlash = strrchr(filename, '\\');
+        if (lastSlash < lastBackSlash) {
+            lastSlash = lastBackSlash;
         }
         const char* shortFilename = lastSlash != nullptr ? lastSlash + 1 : filename;
         return shortFilename;
@@ -438,6 +469,33 @@ struct aiScene
         }
         return std::make_pair(nullptr, -1);
     }
+
+    /**
+     * @brief Will try to locate a bone described by its name.
+     *
+     * @param name  The name to look for.
+     * @return The bone as a pointer.
+     */
+    inline aiBone *findBone(const aiString &name) const {
+        for (size_t m = 0; m < mNumMeshes; m++) {
+            aiMesh *mesh = mMeshes[m];
+            if (mesh == nullptr) {
+                continue;
+            }
+
+            for (size_t b = 0; b < mesh->mNumBones; b++) {
+                aiBone *bone = mesh->mBones[b];
+                if (bone == nullptr) {
+                    continue;
+                }
+                if (name == bone->mName) {
+                    return bone;
+                }
+            }
+        }
+        return nullptr;
+    }
+
 #endif // __cplusplus
 
     /**  Internal data, do not touch */
diff --git a/include/assimp/texture.h b/include/assimp/texture.h
index 576fa7711..312ad98d9 100644
--- a/include/assimp/texture.h
+++ b/include/assimp/texture.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -169,7 +169,8 @@ struct aiTexture {
     /** Data of the texture.
      *
      * Points to an array of mWidth * mHeight aiTexel's.
-     * The format of the texture data is always ARGB8888 to
+     * The format of the texture data shall always be ARGB8888 if the texture-hint of the type is empty.
+     * If the hint is not empty you can interpret the format by looking into this hint.
      * make the implementation for user of the library as easy
      * as possible. If mHeight = 0 this is a pointer to a memory
      * buffer of size mWidth containing the compressed texture
diff --git a/include/assimp/types.h b/include/assimp/types.h
index 42aa0f9eb..261b98d33 100644
--- a/include/assimp/types.h
+++ b/include/assimp/types.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -118,9 +118,9 @@ extern "C" {
 
 /** Maximum dimension for strings, ASSIMP strings are zero terminated. */
 #ifdef __cplusplus
-static const size_t MAXLEN = 1024;
+static constexpr size_t AI_MAXLEN = 1024;
 #else
-#define MAXLEN 1024
+#define AI_MAXLEN 1024
 #endif
 
 // ----------------------------------------------------------------------------------
@@ -165,9 +165,9 @@ struct aiRay {
 struct aiColor3D {
 #ifdef __cplusplus
     aiColor3D() AI_NO_EXCEPT : r(0.0f), g(0.0f), b(0.0f) {}
-    aiColor3D(ai_real _r, ai_real _g, ai_real _b) :
+    aiColor3D(float _r, float _g, float _b) :
             r(_r), g(_g), b(_b) {}
-    explicit aiColor3D(ai_real _r) :
+    explicit aiColor3D(float _r) :
             r(_r), g(_r), b(_r) {}
     aiColor3D(const aiColor3D &o) :
             r(o.r), g(o.g), b(o.b) {}
@@ -214,12 +214,12 @@ struct aiColor3D {
     }
 
     /** Access a specific color component */
-    ai_real operator[](unsigned int i) const {
+    float operator[](unsigned int i) const {
         return *(&r + i);
     }
 
     /** Access a specific color component */
-    ai_real &operator[](unsigned int i) {
+    float &operator[](unsigned int i) {
         if (0 == i) {
             return r;
         } else if (1 == i) {
@@ -232,18 +232,19 @@ struct aiColor3D {
 
     /** Check whether a color is black */
     bool IsBlack() const {
-        static const ai_real epsilon = ai_real(10e-3);
+        static const float epsilon = float(10e-3);
         return std::fabs(r) < epsilon && std::fabs(g) < epsilon && std::fabs(b) < epsilon;
     }
 
 #endif // !__cplusplus
 
     //! Red, green and blue color values
-    ai_real r, g, b;
+    float r, g, b;
 }; // !struct aiColor3D
 
 // ----------------------------------------------------------------------------------
-/** Represents an UTF-8 string, zero byte terminated.
+/**
+ * @brief Represents an UTF-8 string, zero byte terminated.
  *
  *  The character set of an aiString is explicitly defined to be UTF-8. This Unicode
  *  transformation was chosen in the belief that most strings in 3d files are limited
@@ -260,42 +261,40 @@ struct aiColor3D {
  *  UTF-8 strings to their working character set (i.e. MBCS, WideChar).
  *
  *  We use this representation instead of std::string to be C-compatible. The
- *  (binary) length of such a string is limited to MAXLEN characters (including the
+ *  (binary) length of such a string is limited to AI_MAXLEN characters (including the
  *  the terminating zero).
-*/
+ */
 struct aiString {
 #ifdef __cplusplus
     /** Default constructor, the string is set to have zero length */
-    aiString() AI_NO_EXCEPT
-            : length(0) {
-        data[0] = '\0';
-
+    aiString() AI_NO_EXCEPT :
+            length(0), data{'\0'} {
 #ifdef ASSIMP_BUILD_DEBUG
         // Debug build: overwrite the string on its full length with ESC (27)
-        memset(data + 1, 27, MAXLEN - 1);
+        memset(data + 1, 27, AI_MAXLEN - 1);
 #endif
     }
 
     /** Copy constructor */
     aiString(const aiString &rOther) :
-            length(rOther.length) {
+            length(rOther.length), data{'\0'} {
         // Crop the string to the maximum length
-        length = length >= MAXLEN ? MAXLEN - 1 : length;
+        length = length >= AI_MAXLEN ? AI_MAXLEN - 1 : length;
         memcpy(data, rOther.data, length);
         data[length] = '\0';
     }
 
     /** Constructor from std::string */
     explicit aiString(const std::string &pString) :
-            length((ai_uint32)pString.length()) {
-        length = length >= MAXLEN ? MAXLEN - 1 : length;
+            length((ai_uint32)pString.length()), data{'\0'} {
+        length = length >= AI_MAXLEN ? AI_MAXLEN - 1 : length;
         memcpy(data, pString.c_str(), length);
         data[length] = '\0';
     }
 
     /** Copy a std::string to the aiString */
     void Set(const std::string &pString) {
-        if (pString.length() > MAXLEN - 1) {
+        if (pString.length() > AI_MAXLEN - 1) {
             return;
         }
         length = (ai_uint32)pString.length();
@@ -304,12 +303,21 @@ struct aiString {
     }
 
     /** Copy a const char* to the aiString */
-    void Set(const char *sz) {
-        ai_int32 len = (ai_uint32)::strlen(sz);
-        if (len > (ai_int32)MAXLEN - 1) {
-            len = (ai_int32) MAXLEN - 1;
+    void Set(const char *sz, size_t maxlen) {
+        if (sz == nullptr) {
+            return;
         }
-        length = len;
+        size_t len = 0;
+        for (size_t i=0; i<maxlen; ++i) {
+            if (sz[i] == '\0') {
+                break;
+            }
+            ++len;
+        }
+        if (len > AI_MAXLEN - 1) {
+            len = AI_MAXLEN - 1;
+        }
+        length = static_cast<uint32_t>(len);
         memcpy(data, sz, len);
         data[len] = 0;
     }
@@ -321,8 +329,8 @@ struct aiString {
         }
 
         length = rOther.length;
-        if (length >(MAXLEN - 1)) {
-            length = (ai_int32) MAXLEN - 1;
+        if (length > (AI_MAXLEN - 1)) {
+            length = static_cast<ai_int32>(AI_MAXLEN - 1);
         }
 
         memcpy(data, rOther.data, length);
@@ -344,21 +352,24 @@ struct aiString {
 
     /** Comparison operator */
     bool operator==(const aiString &other) const {
-        return (length == other.length && 0 == memcmp(data, other.data, length));
+        if (length == other.length) {
+            return memcmp(data, other.data, length) == 0;
+        }
+        return false;
     }
 
     /** Inverse comparison operator */
     bool operator!=(const aiString &other) const {
-        return (length != other.length || 0 != memcmp(data, other.data, length));
+        return !(*this == other);
     }
 
     /** Append a string to the string */
     void Append(const char *app) {
-        const ai_uint32 len = (ai_uint32)::strlen(app);
+        const ai_uint32 len = static_cast<ai_uint32>(::strlen(app));
         if (!len) {
             return;
         }
-        if (length + len >= MAXLEN) {
+        if (length + len >= AI_MAXLEN) {
             return;
         }
 
@@ -373,7 +384,7 @@ struct aiString {
 
 #ifdef ASSIMP_BUILD_DEBUG
         // Debug build: overwrite the string on its full length with ESC (27)
-        memset(data + 1, 27, MAXLEN - 1);
+        memset(data + 1, 27, AI_MAXLEN - 1);
 #endif
     }
 
@@ -382,6 +393,14 @@ struct aiString {
         return data;
     }
 
+    /**
+     * @brief  Will return true, if the string is empty.
+     * @return true if the string is empty, false if not
+     */
+    bool Empty() const {
+        return length == 0;
+    }
+
 #endif // !__cplusplus
 
     /** Binary length of the string excluding the terminal 0. This is NOT the
@@ -389,8 +408,8 @@ struct aiString {
      *  the number of bytes from the beginning of the string to its end.*/
     ai_uint32 length;
 
-    /** String buffer. Size limit is MAXLEN */
-    char data[MAXLEN];
+    /** String buffer. Size limit is AI_MAXLEN */
+    char data[AI_MAXLEN];
 }; // !struct aiString
 
 // ----------------------------------------------------------------------------------
@@ -523,6 +542,23 @@ struct aiMemoryInfo {
     unsigned int total;
 }; // !struct aiMemoryInfo
 
+/**
+ *  @brief  Type to store a in-memory data buffer.
+ */
+struct aiBuffer {
+    const char *data; ///< Begin poiner
+    const char *end;  ///< End pointer
+
+#ifdef __cplusplus
+    /// @brief  The class constructor.
+    aiBuffer() :
+            data(nullptr), end(nullptr) {}
+
+    /// @brief  The class destructor.
+    ~aiBuffer() = default;
+#endif //!  __cplusplus
+};
+
 #ifdef __cplusplus
 }
 #endif //!  __cplusplus
diff --git a/include/assimp/vector2.h b/include/assimp/vector2.h
index f06e9441d..cdb035e2f 100644
--- a/include/assimp/vector2.h
+++ b/include/assimp/vector2.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/vector2.inl b/include/assimp/vector2.inl
index 245eb3190..3ef76952f 100644
--- a/include/assimp/vector2.inl
+++ b/include/assimp/vector2.inl
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/vector3.h b/include/assimp/vector3.h
index eb940e7f9..4920b2241 100644
--- a/include/assimp/vector3.h
+++ b/include/assimp/vector3.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/vector3.inl b/include/assimp/vector3.inl
index 28ca2be07..8dd114f3c 100644
--- a/include/assimp/vector3.inl
+++ b/include/assimp/vector3.inl
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/include/assimp/version.h b/include/assimp/version.h
index 812be551c..5e6e07cbd 100644
--- a/include/assimp/version.h
+++ b/include/assimp/version.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2023, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/packaging/windows-innosetup/script_x64.iss b/packaging/windows-innosetup/script_x64.iss
index 3ac5600b5..fb7803a48 100644
--- a/packaging/windows-innosetup/script_x64.iss
+++ b/packaging/windows-innosetup/script_x64.iss
@@ -2,19 +2,19 @@
 
 [Setup]
 AppName=Open Asset Import Library - SDK
-AppVerName=Open Asset Import Library - SDK (v5.3.0)
+AppVerName=Open Asset Import Library - SDK (v5.4.3)
 DefaultDirName={pf}\Assimp
 DefaultGroupName=Assimp
 UninstallDisplayIcon={app}\bin\x64\assimp.exe
 OutputDir=out
 AppCopyright=Assimp Development Team
 SetupIconFile=..\..\tools\shared\assimp_tools_icon.ico
-WizardImageFile=compiler:WizModernImage-IS.BMP
-WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP
+WizardImageFile=..\..\tools\shared\assimp_tools_icon.bmp
+WizardSmallImageFile=..\..\tools\shared\assimp_tools_icon.bmp
 LicenseFile=License.rtf
-OutputBaseFileName=assimp-sdk-5.2.6-setup
-VersionInfoVersion=5.3.0.0
-VersionInfoTextVersion=5.3.0
+OutputBaseFileName=assimp-sdk-5.4.3-setup
+VersionInfoVersion=5.4.3.0
+VersionInfoTextVersion=5.4.3
 VersionInfoCompany=Assimp Development Team
 ArchitecturesInstallIn64BitMode=x64
 
@@ -49,14 +49,14 @@ Source: "WEB"; DestDir: "{app}"
 Source: "..\..\scripts\*"; DestDir: "{app}\scripts"; Flags: recursesubdirs
 
 ; x64 binaries
-Source: "..\..\bin\release\assimp-vc141-mt.dll";  DestDir: "{app}\bin\x64"
+Source: "..\..\bin\release\assimp-vc143-mt.dll";  DestDir: "{app}\bin\x64"
 Source: "..\..\bin\release\assimp_viewer.exe";    DestDir: "{app}\bin\x64"; Components: tools
 Source: "C:\Windows\SysWOW64\D3DCompiler_42.dll"; DestDir: "{app}\bin\x64"; DestName: "D3DCompiler_42.dll"; Components: tools
 Source: "C:\Windows\SysWOW64\D3DX9_42.dll";       DestDir: "{app}\bin\x64"; DestName: "D3DX9_42.dll"; Components: tools
 Source: "..\..\bin\release\assimp.exe";           DestDir: "{app}\bin\x64"; Components: tools
 
 ; Import libraries
-Source: "..\..\lib\release\assimp-vc141-mt.lib"; DestDir: "{app}\lib\x64"
+Source: "..\..\lib\release\assimp-vc143-mt.lib"; DestDir: "{app}\lib\x64"
 
 ; Samples
 Source: "..\..\samples\*"; DestDir: "{app}\samples"; Flags: recursesubdirs; Components: samples
diff --git a/packaging/windows-innosetup/script_x86.iss b/packaging/windows-innosetup/script_x86.iss
index 9bfe371cc..389fefb44 100644
--- a/packaging/windows-innosetup/script_x86.iss
+++ b/packaging/windows-innosetup/script_x86.iss
@@ -2,19 +2,19 @@
 
 [Setup]
 AppName=Open Asset Import Library - SDK
-AppVerName=Open Asset Import Library - SDK (v5.3.0)
+AppVerName=Open Asset Import Library - SDK (v5.4.3)
 DefaultDirName={pf}\Assimp
 DefaultGroupName=Assimp
 UninstallDisplayIcon={app}\bin\x86\assimp.exe
 OutputDir=out
 AppCopyright=Assimp Development Team
 SetupIconFile=..\..\tools\shared\assimp_tools_icon.ico
-WizardImageFile=compiler:WizModernImage-IS.BMP
-WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP
+WizardImageFile=..\..\tools\shared\assimp_tools_icon.bmp
+WizardSmallImageFile=..\..\tools\shared\assimp_tools_icon.bmp
 LicenseFile=License.rtf
-OutputBaseFileName=assimp-sdk-5.2.6-setup
-VersionInfoVersion=5.3.0.
-VersionInfoTextVersion=5.3.0
+OutputBaseFileName=assimp-sdk-5.4.3-setup
+VersionInfoVersion=5.4.3.
+VersionInfoTextVersion=5.4.3
 VersionInfoCompany=Assimp Development Team
 ;ArchitecturesInstallIn64BitMode=x64
 
@@ -43,13 +43,13 @@ Source: "vc_redist.x86.exe"; DestDir: "{app}\stub\"; Check: not IsWin64
 ; Common stuff
 Source: "..\..\CREDITS"; DestDir: "{app}"
 Source: "..\..\LICENSE"; DestDir: "{app}"
-Source: "..\..\README"; DestDir: "{app}"
+Source: "..\..\Readme.md"; DestDir: "{app}"
 Source: "WEB"; DestDir: "{app}"
 
 Source: "..\..\scripts\*"; DestDir: "{app}\scripts"; Flags: recursesubdirs
 
 ; x86 binaries
-Source: "..\..\bin\release\assimp-vc141-mt.dll";      DestDir: "{app}\bin\x86"
+Source: "..\..\bin\release\assimp-vc143-mt.dll";      DestDir: "{app}\bin\x86"
 Source: "..\..\bin\release\assimp_viewer.exe";        DestDir: "{app}\bin\x86"; Components: tools
 Source: "C:\Windows\SysWOW64\D3DCompiler_42.dll";     DestDir: "{app}\bin\x86"; Components: tools
 Source: "C:\Windows\SysWOW64\D3DX9_42.dll";           DestDir: "{app}\bin\x86"; Components: tools
@@ -57,7 +57,7 @@ Source: "..\..\bin\release\assimp.exe";               DestDir: "{app}\bin\x86";
 
 
 ; Import libraries
-Source: "..\..\lib\release\assimp-vc141-mt.lib"; DestDir: "{app}\lib\x86"
+Source: "..\..\lib\release\assimp-vc143-mt.lib"; DestDir: "{app}\lib\x86"
 
 ; Samples
 Source: "..\..\samples\*"; DestDir: "{app}\samples"; Flags: recursesubdirs; Components: samples
diff --git a/packaging/windows-mkzip/bin_readme.txt b/packaging/windows-mkzip/bin_readme.txt
deleted file mode 100644
index f4402d6bf..000000000
--- a/packaging/windows-mkzip/bin_readme.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-
-------------------------------------------------------------------------------------
-Open Asset Import Library (Assimp) Tools/Binaries for Windows
-Release Notes
-------------------------------------------------------------------------------------
-
-
-Known Bugs & Limitations
-========================
-
-Viewer
-
-- For files more than one embedded texture, only the first is loaded.
-- Normals appear flipped from time to time when either of the normals-related menu items was hit.
-- Alpha-sorting is implemented, but still causes artifacts when models are moved quickly.
-- Several important texture file formats (such as GIF) are not supported.
-- HUD is blurred on the right side. ATI/AMD hardware only.
-
-Troubleshooting
-===============
-
-1. Missing d3dx9_42.dll?
-Install the latest DirectX runtime or grab the file from somewhere (that's evil but mostly fine).
-
-2. Application configuration not correct / missing msv*** DLLs?
-(Re)install Microsoft Visual C++ 2005 SP1 Redistributable (x86 or x64, depending on your system)
-
-3. Crashes immediately
-You CPU lacks SSE2 support. Build Assimp from scratch to suit your CPU, sorry.
diff --git a/packaging/windows-mkzip/mkfinal.bat b/packaging/windows-mkzip/mkfinal.bat
deleted file mode 100644
index b626514c0..000000000
--- a/packaging/windows-mkzip/mkfinal.bat
+++ /dev/null
@@ -1,169 +0,0 @@
-
-rem -----------------------------------------------------
-rem Batch file to build zipped redist packages
-rem Two different packages are built:
-rem
-rem assimp--<revision>-bin.zip
-rem    Binaries for x86 and x64
-rem    Command line reference
-rem
-rem assimp--<revision>-sdk.zip
-rem    Binaries for x86 and x64, Debug & Release
-rem    Libs for DLL build, x86 & 64, Debug & Release
-rem    Full SVN checkout exluding mkutil & port        
-rem
-rem
-rem PREREQUISITES:
-rem   -7za.exe (7zip standalone) 
-rem    Download from http://www.7-zip.org/download.html
-rem
-rem   -svnversion.exe (Subversion revision getter)
-rem    Download any command line SVN package
-rem
-rem   -doxygen.exe (Doxygen client)
-rem    Download from www.doxygen.com
-rem
-rem   -svn client
-rem
-rem NOTES:
-rem   ./bin must not have any local modifications
-rem
-rem -----------------------------------------------------
-
-@echo off
-color 4e
-cls
-
-rem -----------------------------------------------------
-rem  Setup file revision for build
-rem -----------------------------------------------------
-call mkrev.bat
-
-rem -----------------------------------------------------
-rem Build output file names
-rem -----------------------------------------------------
-
-cd ..\..\bin
-svnversion > tmpfile.txt
-SET /p REVISIONBASE= < tmpfile.txt
-DEL /q tmpfile.txt
-cd ..\packaging\windows-mkzip
-
-SET VERSIONBASE=2.0.%REVISIONBASE%
-
-SET OUT_SDK=assimp--%VERSIONBASE%-sdk
-SET OUT_BIN=assimp--%VERSIONBASE%-bin
-
-SET BINCFG_x86=release-dll_win32
-SET BINCFG_x64=release-dll_x64
-
-SET BINCFG_x86_DEBUG=debug-dll_win32
-SET BINCFG_x64_DEBUG=debug-dll_x64
-
-rem -----------------------------------------------------
-rem Delete previous output directories
-rem -----------------------------------------------------
-RD /S /q final\
-
-rem -----------------------------------------------------
-rem Create output directories
-rem -----------------------------------------------------
-
-mkdir final\%OUT_BIN%\x86
-mkdir final\%OUT_BIN%\x64
-
-rem -----------------------------------------------------
-rem Copy all executables to 'final-bin'
-rem -----------------------------------------------------
-
-copy /Y ..\..\bin\assimpview_%BINCFG_x86%\assimp_view.exe "final\%OUT_BIN%\x86\assimp_view.exe"
-copy /Y ..\..\bin\assimpview_%BINCFG_x64%\assimp_view.exe "final\%OUT_BIN%\x64\assimp_view.exe"
-
-copy /Y ..\..\bin\assimpcmd_%BINCFG_x86%\assimp.exe "final\%OUT_BIN%\x86\assimp.exe"
-copy /Y ..\..\bin\assimpcmd_%BINCFG_x64%\assimp.exe "final\%OUT_BIN%\x64\assimp.exe"
-
-copy /Y ..\..\bin\assimp_%BINCFG_x86%\Assimp32.dll    "final\%OUT_BIN%\x86\Assimp32.dll"
-copy /Y ..\..\bin\assimp_%BINCFG_x64%\Assimp64.dll    "final\%OUT_BIN%\x64\Assimp64.dll"
-
-copy ..\..\LICENSE final\%OUT_BIN%\LICENSE
-copy ..\..\CREDITS final\%OUT_BIN%\CREDITS
-copy bin_readme.txt final\%OUT_BIN%\README
-copy bin_readme.txt final\%OUT_BIN%\README
-
-copy ..\..\doc\AssimpCmdDoc_Html\AssimpCmdDoc.chm  final\%OUT_BIN%\CommandLine.chm
-
-rem -----------------------------------------------------
-rem Do a clean export of the repository and build SDK
-rem
-rem We take the current revision and remove some stuff
-rem that is nto yet ready to be published.
-rem -----------------------------------------------------
-
-svn export .\..\..\  .\final\%OUT_SDK%
-
-mkdir final\%OUT_SDK%\doc\assimp_html
-mkdir final\%OUT_SDK%\doc\assimpcmd_html
-copy .\..\..\doc\AssimpDoc_Html\* final\%OUT_SDK%\doc\assimp_html
-copy .\..\..\doc\AssimpCmdDoc_Html\* final\%OUT_SDK%\doc\assimpcmd_html
-del final\%OUT_SDK%\doc\assimpcmd_html\AssimpCmdDoc.chm
-del final\%OUT_SDK%\doc\assimp_html\AssimpDoc.chm
-
-rem Copy doc to a suitable place
-move final\%OUT_SDK%\doc\AssimpDoc_Html\AssimpDoc.chm final\%OUT_SDK%\Documentation.chm
-move final\%OUT_SDK%\doc\AssimpCmdDoc_Html\AssimpCmdDoc.chm final\%OUT_SDK%\CommandLine.chm
-
-rem Cleanup ./doc folder
-del /q final\%OUT_SDK%\doc\Preamble.txt 
-RD  /s /q final\%OUT_SDK%\doc\AssimpDoc_Html
-RD  /s /q final\%OUT_SDK%\doc\AssimpCmdDoc_Html
-
-rem Insert 'dummy' files into empty folders
-echo. > final\%OUT_SDK%\lib\dummy
-echo. > final\%OUT_SDK%\obj\dummy
-
-
-RD  /s /q final\%OUT_SDK%\port\swig
-
-rem Also, repackaging is not a must-have feature
-RD  /s /q final\%OUT_SDK%\packaging
-
-rem Copy prebuilt libs
-mkdir "final\%OUT_SDK%\lib\assimp_%BINCFG_x86%"
-mkdir "final\%OUT_SDK%\lib\assimp_%BINCFG_x64%"
-mkdir "final\%OUT_SDK%\lib\assimp_%BINCFG_x86_DEBUG%"
-mkdir "final\%OUT_SDK%\lib\assimp_%BINCFG_x64_DEBUG%"
-
-copy /Y ..\..\lib\assimp_%BINCFG_x86%\assimp.lib    "final\%OUT_SDK%\lib\assimp_%BINCFG_x86%"
-copy /Y ..\..\lib\assimp_%BINCFG_x64%\assimp.lib    "final\%OUT_SDK%\lib\assimp_%BINCFG_x64%\"
-copy /Y ..\..\lib\assimp_%BINCFG_x86_DEBUG%\assimp.lib    "final\%OUT_SDK%\lib\assimp_%BINCFG_x86_DEBUG%\"
-copy /Y ..\..\lib\assimp_%BINCFG_x64_DEBUG%\assimp.lib    "final\%OUT_SDK%\lib\assimp_%BINCFG_x64_DEBUG%\"
-
-rem Copy prebuilt DLLs
-mkdir "final\%OUT_SDK%\bin\assimp_%BINCFG_x86%"
-mkdir "final\%OUT_SDK%\bin\assimp_%BINCFG_x64%"
-mkdir "final\%OUT_SDK%\bin\assimp_%BINCFG_x86_DEBUG%"
-mkdir "final\%OUT_SDK%\bin\assimp_%BINCFG_x64_DEBUG%"
-
-
-copy /Y ..\..\bin\assimp_%BINCFG_x86%\Assimp32.dll    "final\%OUT_SDK%\bin\assimp_%BINCFG_x86%\"
-copy /Y ..\..\bin\assimp_%BINCFG_x64%\Assimp64.dll    "final\%OUT_SDK%\bin\assimp_%BINCFG_x64%\"
-copy /Y ..\..\bin\assimp_%BINCFG_x86_DEBUG%\Assimp32d.dll    "final\%OUT_SDK%\bin\assimp_%BINCFG_x86_DEBUG%\"
-copy /Y ..\..\bin\assimp_%BINCFG_x64_DEBUG%\Assimp64d.dll    "final\%OUT_SDK%\bin\assimp_%BINCFG_x64_DEBUG%\"
-
-
-rem -----------------------------------------------------
-rem Make final-bin.zip and final-sdk.zip
-rem -----------------------------------------------------
-
-IF NOT EXIST 7za.exe	(
-	cls
-	echo You need to have 7zip standalone installed to
-	echo build ZIP archives. Download: http://www.7-zip.org/download.html
-	pause
-) else (
-7za.exe a -tzip "final\%OUT_BIN%.zip" ".\final\%OUT_BIN%"
-7za.exe a -tzip "final\%OUT_SDK%.zip" ".\final\%OUT_SDK%"
-)
-
-rem OK. We should have the release packages now.
-
diff --git a/packaging/windows-mkzip/mkrev.bat b/packaging/windows-mkzip/mkrev.bat
deleted file mode 100644
index 9d8eec120..000000000
--- a/packaging/windows-mkzip/mkrev.bat
+++ /dev/null
@@ -1,27 +0,0 @@
-@echo off
-
-rem -----------------------------------------------------
-rem Tiny batch script to build the input file revision.h
-rem revision.h contains the revision number of the wc.
-rem It is included by assimp.rc.
-rem -----------------------------------------------------
-
-rem This is not very elegant, but it works.
-rem ./bin shouldn't have any local modifications
-
-svnversion > tmpfile.txt
-set /p addtext= < tmpfile.txt
-del /q tmpfile.txt
-
-echo #define SVNRevision > tmpfile.txt
-
-if exist ..\..\revision.h del /q ..\..\revision.h
-for /f "delims=" %%l in (tmpfile.txt) Do (
-	for /f "delims=M:" %%r in ("%addtext%") Do (
-      		echo %%l %%r >> ..\..\revision.h
-	)
-)
-del /q tmpfile.txt
-
-
-
diff --git a/port/AssimpNET/Readme.md b/port/AssimpNET/Readme.md
index 814cab3e0..dc3be5882 100644
--- a/port/AssimpNET/Readme.md
+++ b/port/AssimpNET/Readme.md
@@ -1 +1 @@
-Please check the following git-repo for the source: https://github.com/kebby/assimp-net
+Please check the following git-repo for the source: https://bitbucket.org/Starnick/assimpnet/
diff --git a/port/PyAssimp/LICENSE b/port/PyAssimp/LICENSE
new file mode 100644
index 000000000..91cf88d72
--- /dev/null
+++ b/port/PyAssimp/LICENSE
@@ -0,0 +1,17 @@
+ISC License
+
+Copyright 2024, pyassimp contributors
+
+Permission to use, copy, modify, and/or distribute this software 
+for any purpose with or without fee is hereby granted, provided 
+that the above copyright notice and this permission notice appear 
+in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL 
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE 
+AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA 
+OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER 
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR 
+PERFORMANCE OF THIS SOFTWARE.
diff --git a/port/PyAssimp/pyassimp/helper.py b/port/PyAssimp/pyassimp/helper.py
index 7c14f6097..0ae7cbdff 100644
--- a/port/PyAssimp/pyassimp/helper.py
+++ b/port/PyAssimp/pyassimp/helper.py
@@ -5,13 +5,17 @@ Some fancy helper functions.
 """
 
 import os
+import platform
 import ctypes
 import operator
 
-from distutils.sysconfig import get_python_lib
 import re
 import sys
 
+have_distutils = sys.version_info[0] < 3 and sys.version_info[1] < 12
+if have_distutils:
+    from distutils.sysconfig import get_python_lib
+
 try: import numpy
 except ImportError: numpy = None
 
@@ -32,10 +36,14 @@ if os.name=='posix':
 
     if 'LD_LIBRARY_PATH' in os.environ:
         additional_dirs.extend([item for item in os.environ['LD_LIBRARY_PATH'].split(':') if item])
+    
+    if platform.system() == 'Darwin':
+        if 'DYLD_LIBRARY_PATH' in os.environ:
+            additional_dirs.extend([item for item in os.environ['DYLD_LIBRARY_PATH'].split(':') if item])
 
     # check if running from anaconda.
     anaconda_keywords = ("conda", "continuum")
-    if any(k in sys.version.lower() for k in anaconda_keywords):
+    if have_distutils and any(k in sys.version.lower() for k in anaconda_keywords):
       cur_path = get_python_lib()
       pattern = re.compile('.*\/lib\/')
       conda_lib = pattern.match(cur_path).group()
diff --git a/port/PyAssimp/pyassimp/postprocess.py b/port/PyAssimp/pyassimp/postprocess.py
index 0c55d6798..3c1ae976e 100644
--- a/port/PyAssimp/pyassimp/postprocess.py
+++ b/port/PyAssimp/pyassimp/postprocess.py
@@ -40,17 +40,7 @@ aiProcess_MakeLeftHanded = 0x4
 #
 # By default the imported mesh data might contain faces with more than 3
 # indices. For rendering you'll usually want all faces to be triangles. 
-# This post processing step splits up faces with more than 3 indices into 
-# triangles. Line and point primitives are #not# modified! If you want
-# 'triangles only' with no other kinds of primitives, try the following
-# solution:
-# <ul>
-# <li>Specify both #aiProcess_Triangulate and #aiProcess_SortByPType <li>
-# <li>Ignore all point and line meshes when you process assimp's output<li>
-# <ul>
-#
-aiProcess_Triangulate = 0x8
-
+# This post processing stepaiProcess_ForceGenNormals
 ## <hr>Removes some parts of the data structure (animations, materials, 
 #  light sources, cameras, textures, vertex components).
 #
@@ -232,6 +222,15 @@ aiProcess_RemoveRedundantMaterials = 0x1000
 #
 aiProcess_FixInfacingNormals = 0x2000
 
+## This step generically populates aiBone->mArmature and aiBone->mNode generically
+#  The point of these is it saves you later having to calculate these elements
+#  This is useful when handling rest information or skin information
+#  If you have multiple armatures on your models we strongly recommend enabling this
+#  Instead of writing your own multi-root, multi-armature lookups we have done the
+#  hard work for you :)
+
+aiProcess_PopulateArmatureData = 0x4000
+
 ## <hr>This step splits meshes with more than one primitive type in 
 #  homogeneous sub-meshes. 
 #
@@ -270,7 +269,7 @@ aiProcess_SortByPType = 0x8000
 #     point primitives to separate meshes.
 #   <li>
 #   <li>Set the <tt>AI_CONFIG_PP_SBP_REMOVE<tt> option to 
-#       @code aiPrimitiveType_POINTS | aiPrimitiveType_LINES
+#       @code aiPrimitiveType_POINT | aiPrimitiveType_LINE
 #       @endcode to cause SortByPType to reject point
 #       and line meshes from the scene.
 #   <li>
@@ -385,7 +384,7 @@ aiProcess_OptimizeGraph  = 0x400000
 #
 # <b>Output UV coordinate system:<b>
 # @code
-# 0y|0y ---------- 1x|0y 
+# 0x|0y ---------- 1x|0y 
 # |                 |
 # |                 |
 # |                 |
@@ -432,6 +431,46 @@ aiProcess_SplitByBoneCount  = 0x2000000
 #
 aiProcess_Debone  = 0x4000000
 
+## <hr>This step will perform a global scale of the model.
+#
+#  Some importers are providing a mechanism to define a scaling unit for the
+#  model. This post processing step can be used to do so. You need to get the
+#  global scaling from your importer settings like in FBX. Use the flag
+#  AI_CONFIG_GLOBAL_SCALE_FACTOR_KEY from the global property table to configure this.
+#
+#  Use <tt>#AI_CONFIG_GLOBAL_SCALE_FACTOR_KEY</tt> to setup the global scaling factor.
+#
+aiProcess_GlobalScale = 0x8000000
+
+## <hr>A postprocessing step to embed of textures.
+#
+#  This will remove external data dependencies for textures.
+#  If a texture's file does not exist at the specified path
+#  (due, for instance, to an absolute path generated on another system),
+#  it will check if a file with the same name exists at the root folder
+#  of the imported model. And if so, it uses that.
+#
+aiProcess_EmbedTextures  = 0x10000000
+
+##
+#
+aiProcess_ForceGenNormals = 0x20000000
+
+## <hr>Drops normals for all faces of all meshes.
+#
+#  This is ignored if no normals are present.
+#  Face normals are shared between all points of a single face,
+#  so a single point can have multiple normals, which
+#  forces the library to duplicate vertices in some cases.
+#  #aiProcess_JoinIdenticalVertices is *senseless* then.
+#  This process gives sense back to aiProcess_JoinIdenticalVertices
+#
+aiProcess_DropNormals = 0x40000000,
+
+##
+#
+aiProcess_GenBoundingBoxes = 0x80000000
+
 aiProcess_GenEntityMeshes = 0x100000
 aiProcess_OptimizeAnimations = 0x200000
 aiProcess_FixTexturePaths = 0x200000
diff --git a/port/PyAssimp/pyassimp/structs.py b/port/PyAssimp/pyassimp/structs.py
index 932998025..6288257f9 100644
--- a/port/PyAssimp/pyassimp/structs.py
+++ b/port/PyAssimp/pyassimp/structs.py
@@ -1,6 +1,6 @@
 #-*- coding: utf-8 -*-
 
-from ctypes import POINTER, c_void_p, c_uint, c_char, c_float, Structure, c_double, c_ubyte, c_size_t, c_uint32
+from ctypes import POINTER, c_void_p, c_uint, c_char, c_float, Structure, c_double, c_ubyte, c_size_t, c_uint32, c_int
 
 
 class Vector2D(Structure):
@@ -70,7 +70,7 @@ class String(Structure):
     See 'types.h' for details.
     """
 
-    MAXLEN = 1024
+    AI_MAXLEN = 1024
 
     _fields_ = [
             # Binary length of the string excluding the terminal 0. This is NOT the
@@ -78,8 +78,8 @@ class String(Structure):
             #  the number of bytes from the beginning of the string to its end.
             ("length", c_uint32),
 
-            # String buffer. Size limit is MAXLEN
-            ("data", c_char*MAXLEN),
+            # String buffer. Size limit is AI_MAXLEN
+            ("data", c_char*AI_MAXLEN),
         ]
 
 class MaterialPropertyString(Structure):
@@ -90,7 +90,7 @@ class MaterialPropertyString(Structure):
     material property (see MaterialSystem.cpp aiMaterial::AddProperty() for details).
     """
 
-    MAXLEN = 1024
+    AI_MAXLEN = 1024
 
     _fields_ = [
             # Binary length of the string excluding the terminal 0. This is NOT the
@@ -98,8 +98,8 @@ class MaterialPropertyString(Structure):
             #  the number of bytes from the beginning of the string to its end.
             ("length", c_uint32),
 
-            # String buffer. Size limit is MAXLEN
-            ("data", c_char*MAXLEN),
+            # String buffer. Size limit is AI_MAXLEN
+            ("data", c_char*AI_MAXLEN),
         ]
 
 class MemoryInfo(Structure):
@@ -555,6 +555,14 @@ class Bone(Structure):
             #  The maximum value for this member is
             #AI_MAX_BONE_WEIGHTS.
             ("mNumWeights", c_uint),
+            
+            # The bone armature node - used for skeleton conversion
+            # you must enable aiProcess_PopulateArmatureData to populate this
+            ("mArmature", POINTER(Node)),
+            
+            # The bone node in the scene - used for skeleton conversion
+            # you must enable aiProcess_PopulateArmatureData to populate this
+            ("mNode", POINTER(Node)),
 
             #  The vertices affected by this bone
             ("mWeights", POINTER(VertexWeight)),
@@ -765,6 +773,12 @@ class Mesh(Structure):
             # Method of morphing when animeshes are specified.
             ("mMethod", c_uint),
 
+            # The bounding box.
+            ("mAABB", 2 * Vector3D),
+
+            # Vertex UV stream names. Pointer to array of size AI_MAX_NUMBER_OF_TEXTURECOORDS
+            ("mTextureCoordsNames", POINTER(POINTER(String)))
+
         ]
 
 class Camera(Structure):
@@ -851,6 +865,9 @@ class QuatKey(Structure):
 
             # The value of this key
             ("mValue", Quaternion),
+
+            # The interpolation setting of this key
+            ("mInterpolation", c_uint32)
         ]
 
 class MeshMorphKey(Structure):
@@ -1004,6 +1021,54 @@ class Animation(Structure):
 
         ]
 
+class SkeletonBone(Structure):
+    """
+    See 'mesh.h' for details
+    """
+    _fields_ = [
+            # The parent bone index, is -1 one if this bone represents the root bone.
+            ("mParent", c_int),
+
+            # The number of weights
+            ("mNumnWeights", c_uint),
+
+            # The mesh index, which will get influenced by the weight
+            ("mMeshId", POINTER(Mesh)),
+
+            # The influence weights of this bone, by vertex index.
+            ("mWeights", POINTER(VertexWeight)),
+
+            #  Matrix that transforms from bone space to mesh space in bind pose.
+            #
+            #  This matrix describes the position of the mesh
+            #  in the local space of this bone when the skeleton was bound.
+            #  Thus it can be used directly to determine a desired vertex position,
+            #  given the world-space transform of the bone when animated,
+            #  and the position of the vertex in mesh space.
+            #
+            #  It is sometimes called an inverse-bind matrix,
+            #  or inverse bind pose matrix
+            ("mOffsetMatrix", Matrix4x4),
+
+            # Matrix that transforms the locale bone in bind pose.
+            ("mLocalMatrix", Matrix4x4)
+    ]
+
+class Skeleton(Structure):
+    """
+    See 'mesh.h' for details
+    """
+    _fields_ = [
+             # Name
+             ("mName", String),
+
+             # Number of bones
+             ("mNumBones", c_uint),
+
+             # Bones
+             ("mBones", POINTER(POINTER(SkeletonBone)))
+    ]
+
 class ExportDataBlob(Structure):
     """
     See 'cexport.h' for details.
@@ -1125,6 +1190,15 @@ class Scene(Structure):
             # can be used to store format-specific metadata as well.
             ("mMetadata", POINTER(Metadata)),
 
+            # The name of the scene itself
+            ("mName", String),
+
+            # Number of skeletons
+            ("mNumSkeletons", c_uint),
+
+            # Skeletons
+            ("mSkeletons", POINTER(POINTER(Skeleton))),
+
             # Internal data, do not touch
             ("mPrivate", POINTER(c_char)),
         ]
diff --git a/port/PyAssimp/scripts/3d_viewer.py b/port/PyAssimp/scripts/3d_viewer.py
index 08a62660b..3bf790e05 100755
--- a/port/PyAssimp/scripts/3d_viewer.py
+++ b/port/PyAssimp/scripts/3d_viewer.py
@@ -466,8 +466,8 @@ class PyAssimp3DViewer:
         try:
             self.set_shaders_v130()
             self.prepare_shaders()
-        except RuntimeError, message:
-            sys.stderr.write("%s\n" % message)
+        except RuntimeError as e:
+            sys.stderr.write("%s\n" % e.message)
             sys.stdout.write("Could not compile shaders in version 1.30, trying version 1.20\n")
 
         if not shader_compilation_succeeded:
diff --git a/port/dAssimp/assimp/postprocess.d b/port/dAssimp/assimp/postprocess.d
index 343bb36dd..0b2ecbf29 100644
--- a/port/dAssimp/assimp/postprocess.d
+++ b/port/dAssimp/assimp/postprocess.d
@@ -348,7 +348,7 @@ extern ( C ) {
        *   <li>Specify the <code>SortByPType</code> flag. This moves line and
        *      point primitives to separate meshes.</li>
        *   <li>Set the <code>AI_CONFIG_PP_SBP_REMOVE</codet> option to
-       *      <code>aiPrimitiveType_POINTS | aiPrimitiveType_LINES</code>
+       *      <code>aiPrimitiveType_POINT | aiPrimitiveType_LINE</code>
        *      to cause SortByPType to reject point and line meshes from the
        *      scene.</li>
        * </ul>
@@ -470,7 +470,7 @@ extern ( C ) {
        * material settings and bitangents accordingly.
        *
        * Output UV coordinate system:
-       * <pre> 0y|0y ---------- 1x|0y
+       * <pre> 0x|0y ---------- 1x|0y
        * |                 |
        * |                 |
        * |                 |
diff --git a/port/iOS/IPHONESIMULATOR_ARM64_TOOLCHAIN.cmake b/port/iOS/IPHONESIMULATOR_ARM64_TOOLCHAIN.cmake
new file mode 100644
index 000000000..afd14a894
--- /dev/null
+++ b/port/iOS/IPHONESIMULATOR_ARM64_TOOLCHAIN.cmake
@@ -0,0 +1,17 @@
+INCLUDE(CMakeForceCompiler)
+
+SET (CMAKE_CROSSCOMPILING   TRUE)
+SET (CMAKE_SYSTEM_NAME      "Darwin")
+SET (CMAKE_SYSTEM_PROCESSOR "arm64")
+SET (IOS TRUE)
+
+SET (IOS_SDK_DEVICE iPhoneSimulator)
+
+SET (SDKVER     "${IOS_SDK_VERSION}")
+SET (DEVROOT    "${XCODE_ROOT_DIR}/Platforms/${IOS_SDK_DEVICE}.platform/Developer")
+
+
+SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "${DEVROOT}")
+SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM  NEVER)
+SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY  ONLY)
+SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE  ONLY)
\ No newline at end of file
diff --git a/port/iOS/IPHONEOS_X86_64_TOOLCHAIN.cmake b/port/iOS/IPHONESIMULATOR_X86_64_TOOLCHAIN.cmake
similarity index 100%
rename from port/iOS/IPHONEOS_X86_64_TOOLCHAIN.cmake
rename to port/iOS/IPHONESIMULATOR_X86_64_TOOLCHAIN.cmake
diff --git a/port/iOS/README.md b/port/iOS/README.md
index ca5632a1f..7204694a9 100644
--- a/port/iOS/README.md
+++ b/port/iOS/README.md
@@ -1,7 +1,13 @@
 # assimp for iOS
 (deployment target 6.0+, 32/64bit)
 
-Builds assimp libraries for several iOS CPU architectures at once, and outputs a fat binary from the result.
+### Requirements 
+- cmake
+- pkg-config
+
+Note: all these packages can be installed with [brew](https://brew.sh)
+
+Builds assimp libraries for several iOS CPU architectures at once, and outputs a fat binary / XCFramework from the result.
 
 Run the **build.sh** script from the ```./port/iOS/``` directory. See **./build.sh --help** for information about command line options. 
 
@@ -15,11 +21,11 @@ shadeds-Mac:iOS arul$ ./build.sh --help
 Example:
 ```bash
 cd ./port/iOS/
-./build.sh --stdlib=libc++ --archs="armv7 arm64 i386"
+./build.sh --stdlib=libc++ --archs="arm64 x86_64" --no-fat --min-version="16.0"
 ```
 Supported architectures/devices:
 
-### Simulator
+### Simulator [CPU Architectures](https://docs.elementscompiler.com/Platforms/Cocoa/CpuArchitectures/)
 - i386
 - x86_64
  
diff --git a/port/iOS/build.sh b/port/iOS/build.sh
index 64e564848..200a5d3c1 100755
--- a/port/iOS/build.sh
+++ b/port/iOS/build.sh
@@ -31,9 +31,8 @@ TOOLCHAIN=$XCODE_ROOT_DIR/Toolchains/XcodeDefault.xctoolchain
 CMAKE_C_COMPILER=$(xcrun -find cc)
 CMAKE_CXX_COMPILER=$(xcrun -find c++)
 
-BUILD_ARCHS_DEVICE="arm64e arm64 armv7s armv7"
-BUILD_ARCHS_SIMULATOR="x86_64 i386"
-BUILD_ARCHS_ALL=($BUILD_ARCHS_DEVICE $BUILD_ARCHS_SIMULATOR)
+BUILD_ARCHS_DEVICE="arm64e arm64"
+BUILD_ARCHS_SIMULATOR="arm64-simulator x86_64-simulator"
 
 CPP_DEV_TARGET_LIST=(miphoneos-version-min mios-simulator-version-min)
 CPP_DEV_TARGET=
@@ -46,62 +45,85 @@ function join { local IFS="$1"; shift; echo "$*"; }
 
 build_arch()
 {
-    IOS_SDK_DEVICE=iPhoneOS
-    CPP_DEV_TARGET=${CPP_DEV_TARGET_LIST[0]}
-
-    if [[ "$BUILD_ARCHS_SIMULATOR" =~ "$1" ]]
-    then
+    ARCH=$1
+    if [[ "$ARCH" == *"-simulator" ]]; then
         echo '[!] Target SDK set to SIMULATOR.'
-        IOS_SDK_DEVICE=iPhoneSimulator
-        CPP_DEV_TARGET=${CPP_DEV_TARGET_LIST[1]}
+        IOS_SDK_DEVICE="iphonesimulator" # Use lowercase matching xcrun naming
+        BUILD_ARCH="${ARCH%-simulator}"  # Remove "-simulator" from architecture name
+        OUTPUT_FOLDER="$BUILD_DIR/ios-$ARCH"
+        MIN_VERSION_FLAG="-mios-simulator-version-min=$IOS_SDK_TARGET"
     else
         echo '[!] Target SDK set to DEVICE.'
+        IOS_SDK_DEVICE="iphoneos" # For device builds
+        BUILD_ARCH="$ARCH"
+        OUTPUT_FOLDER="$BUILD_DIR/ios-$ARCH"
+        MIN_VERSION_FLAG="-miphoneos-version-min=$IOS_SDK_TARGET"
     fi
 
     unset DEVROOT SDKROOT CFLAGS LDFLAGS CPPFLAGS CXXFLAGS CMAKE_CLI_INPUT
-           
-    export CC="$(xcrun -sdk iphoneos -find clang)"
+
+    # Use xcrun with the correct SDK to find clang
+    export CC="$(xcrun -sdk $IOS_SDK_DEVICE -find clang)"
     export CPP="$CC -E"
-    export DEVROOT=$XCODE_ROOT_DIR/Platforms/$IOS_SDK_DEVICE.platform/Developer
-    export SDKROOT=$DEVROOT/SDKs/$IOS_SDK_DEVICE$IOS_SDK_VERSION.sdk
-    export CFLAGS="-arch $1 -pipe -no-cpp-precomp -isysroot $SDKROOT -I$SDKROOT/usr/include/ -miphoneos-version-min=$IOS_SDK_TARGET"
-    if [[ "$BUILD_TYPE" =~ "Debug" ]]; then
-      export CFLAGS="$CFLAGS -Og"
+
+    # Derive correct platform directory names
+    # Note: iPhoneOS.platform and iPhoneSimulator.platform are used by Xcode internally.
+    if [[ "$IOS_SDK_DEVICE" == "iphonesimulator" ]]; then
+        PLATFORM_NAME="iPhoneSimulator"
     else
-	     export CFLAGS="$CFLAGS -O3"
+        PLATFORM_NAME="iPhoneOS"
     fi
-    export LDFLAGS="-arch $1 -isysroot $SDKROOT -L$SDKROOT/usr/lib/"
+
+    export DEVROOT="$XCODE_ROOT_DIR/Platforms/$PLATFORM_NAME.platform/Developer"
+    export SDKROOT="$DEVROOT/SDKs/$PLATFORM_NAME$IOS_SDK_VERSION.sdk"
+
+    # Set flags. For simulator builds, we use -mios-simulator-version-min; for device, -miphoneos-version-min.
+    export CFLAGS="-arch $BUILD_ARCH -pipe -no-cpp-precomp -isysroot $SDKROOT -I$SDKROOT/usr/include/ $MIN_VERSION_FLAG"
+    if [[ "$BUILD_TYPE" =~ "Debug" ]]; then
+        export CFLAGS="$CFLAGS -Og"
+    else
+        export CFLAGS="$CFLAGS -O3"
+    fi
+    export LDFLAGS="-arch $BUILD_ARCH -isysroot $SDKROOT -L$SDKROOT/usr/lib/"
     export CPPFLAGS="$CFLAGS"
     export CXXFLAGS="$CFLAGS -std=$CPP_STD"
 
-    rm CMakeCache.txt
-    
-    CMAKE_CLI_INPUT="-DCMAKE_C_COMPILER=$CMAKE_C_COMPILER -DCMAKE_CXX_COMPILER=$CMAKE_CXX_COMPILER -DCMAKE_TOOLCHAIN_FILE=./port/iOS/IPHONEOS_$(echo $1 | tr '[:lower:]' '[:upper:]')_TOOLCHAIN.cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS"
-    
+    rm -f CMakeCache.txt
+
+    # Construct the CMake toolchain file path
+    # Make sure these toolchain files differentiate between device and simulator builds properly.
+    TOOLCHAIN_FILE="./port/iOS/${PLATFORM_NAME}_$(echo "$BUILD_ARCH" | tr '[:lower:]' '[:upper:]')_TOOLCHAIN.cmake"
+
+    CMAKE_CLI_INPUT="-DCMAKE_C_COMPILER=$CMAKE_C_COMPILER -DCMAKE_CXX_COMPILER=$CMAKE_CXX_COMPILER \
+    -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN_FILE \
+    -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+    -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS \
+    -DASSIMP_BUILD_ZLIB=ON"
+
     echo "[!] Running CMake with -G 'Unix Makefiles' $CMAKE_CLI_INPUT"
-    
     cmake -G 'Unix Makefiles' ${CMAKE_CLI_INPUT}
 
-    echo "[!] Building $1 library"
-
+    echo "[!] Building $ARCH library"
     xcrun -run make clean
-    xcrun -run make assimp -j 8 -l    
-    
+    xcrun -run make assimp -j 8 -l
+
+    mkdir -p $OUTPUT_FOLDER
+
     if [[ "$BUILD_SHARED_LIBS" =~ "ON" ]]; then
-    	echo "[!] Moving built dynamic libraries into: $BUILD_DIR/$1/"
-    	mv ./lib/*.dylib  $BUILD_DIR/$1/
+        echo "[!] Moving built dynamic libraries into: $OUTPUT_FOLDER"
+        mv ./lib/*.dylib $OUTPUT_FOLDER/
     fi
-    
-    echo "[!] Moving built static libraries into: $BUILD_DIR/$1/"
-    mv ./lib/*.a $BUILD_DIR/$1/	   
+
+    echo "[!] Moving built static libraries into: $OUTPUT_FOLDER"
+    mv ./lib/*.a $OUTPUT_FOLDER/
 }
 
 echo "[!] $0 - assimp iOS build script"
 
 CPP_STD_LIB=${CPP_STD_LIB_LIST[0]}
 CPP_STD=${CPP_STD_LIST[0]}
-DEPLOY_ARCHS=${BUILD_ARCHS_ALL[*]}
 DEPLOY_FAT=1
+DEPLOY_XCFramework=1
 
 for i in "$@"; do
     case $i in
@@ -117,6 +139,11 @@ for i in "$@"; do
         DEPLOY_ARCHS=`echo $i | sed 's/[-a-zA-Z0-9]*=//'`
         echo "[!] Selecting architectures: $DEPLOY_ARCHS"
     ;;
+    --min-version=*)
+        MIN_IOS_VERSION=`echo $i | sed 's/[-a-zA-Z0-9]*=//'`
+        IOS_SDK_TARGET=$MIN_IOS_VERSION
+        echo "[!] Selecting minimum iOS version: $MIN_IOS_VERSION"
+    ;;
     --debug)
     	BUILD_TYPE=Debug        
         echo "[!] Selecting build type: Debug"
@@ -129,11 +156,17 @@ for i in "$@"; do
         DEPLOY_FAT=0
         echo "[!] Fat binary will not be created."
     ;;
+    --no-xcframework)
+        DEPLOY_XCFramework=0
+        echo "[!] XCFramework will not be created."
+    ;;
     -h|--help)
         echo " - don't build fat library (--no-fat)."
+        echo " - don't build XCFramework (--no-xcframework)."
         echo " - Include debug information and symbols, no compiler optimizations (--debug)."
         echo " - generate dynamic libraries rather than static ones (--shared-lib)."
         echo " - supported architectures (--archs):  $(echo $(join , ${BUILD_ARCHS_ALL[*]}) | sed 's/,/, /g')"
+        echo " - minimum iOS version (--min-version): 16.0"
         echo " - supported C++ STD libs (--stdlib): $(echo $(join , ${CPP_STD_LIB_LIST[*]}) | sed 's/,/, /g')"
         echo " - supported C++ standards (--std): $(echo $(join , ${CPP_STD_LIST[*]}) | sed 's/,/, /g')"
         exit
@@ -146,14 +179,15 @@ done
 cd ../../
 rm -rf $BUILD_DIR
 
-for ARCH_TARGET in $DEPLOY_ARCHS; do
-    echo "Creating folder: $BUILD_DIR/$ARCH_TARGET"
-    mkdir -p $BUILD_DIR/$ARCH_TARGET
-    echo "Building for arc: $ARCH_TARGET" 
-    build_arch $ARCH_TARGET
-    #rm ./lib/libassimp.a
+for ARCH in $BUILD_ARCHS_DEVICE; do
+    echo "Building for DEVICE arch: $ARCH"
+    build_arch $ARCH
 done
 
+for ARCH in $BUILD_ARCHS_SIMULATOR; do
+    echo "Building for SIMULATOR arch: $ARCH"
+    build_arch $ARCH
+done
 
 make_fat_static_or_shared_binary()
 {
@@ -196,3 +230,74 @@ if [[ "$DEPLOY_FAT" -eq 1 ]]; then
     
     echo "[!] Done! The fat binaries can be found at $BUILD_DIR"
 fi
+
+make_xcframework() {
+    LIB_NAME=$1
+    FRAMEWORK_PATH="$BUILD_DIR/$LIB_NAME.xcframework"
+
+    # Paths to device and simulator libraries
+    DEVICE_LIB_PATH="$BUILD_DIR/ios-arm64/libassimp.a"
+    ARM64_SIM_LIB_PATH="$BUILD_DIR/ios-arm64-simulator/libassimp.a"
+    X86_64_SIM_LIB_PATH="$BUILD_DIR/ios-x86_64-simulator/libassimp.a"
+    UNIVERSAL_SIM_LIB_PATH="$BUILD_DIR/ios-simulator/libassimp.a"
+
+    # Ensure we have a clean location for the universal simulator lib
+    mkdir -p "$BUILD_DIR/ios-simulator"
+
+    # Combine simulator libraries if both arm64 and x86_64 simulator slices are present
+    if [[ -f "$ARM64_SIM_LIB_PATH" && -f "$X86_64_SIM_LIB_PATH" ]]; then
+        echo "[+] Combining arm64 and x86_64 simulator libs into a universal simulator library..."
+        lipo -create "$ARM64_SIM_LIB_PATH" "$X86_64_SIM_LIB_PATH" -output "$UNIVERSAL_SIM_LIB_PATH" || {
+            echo "[ERROR] lipo failed to combine simulator libraries."
+            exit 1
+        }
+        SIM_LIB_PATH="$UNIVERSAL_SIM_LIB_PATH"
+    elif [[ -f "$ARM64_SIM_LIB_PATH" ]]; then
+        echo "[!] Only arm64 simulator library found. Using it as is."
+        SIM_LIB_PATH="$ARM64_SIM_LIB_PATH"
+    elif [[ -f "$X86_64_SIM_LIB_PATH" ]]; then
+        echo "[!] Only x86_64 simulator library found. Using it as is."
+        SIM_LIB_PATH="$X86_64_SIM_LIB_PATH"
+    else
+        SIM_LIB_PATH=""
+    fi
+
+    ARGS=""
+
+    # Device library
+    if [[ -f "$DEVICE_LIB_PATH" ]]; then
+        echo "[DEBUG] Adding library $DEVICE_LIB_PATH for device arm64"
+        ARGS="$ARGS -library $DEVICE_LIB_PATH -headers ./include"
+    else
+        echo "[WARNING] Device library not found: $DEVICE_LIB_PATH"
+    fi
+
+    # Simulator library (could be universal or a single-arch one)
+    if [[ -n "$SIM_LIB_PATH" && -f "$SIM_LIB_PATH" ]]; then
+        echo "[DEBUG] Adding library $SIM_LIB_PATH for simulator"
+        ARGS="$ARGS -library $SIM_LIB_PATH -headers ./include"
+    fi
+
+    if [[ -z "$ARGS" ]]; then
+        echo "[ERROR] No valid libraries found to create XCFramework."
+        exit 1
+    fi
+
+    # Create XCFramework
+    echo "[+] Creating XCFramework ..."
+    xcodebuild -create-xcframework $ARGS -output $FRAMEWORK_PATH
+
+    echo "[!] Done! The XCFramework can be found at $FRAMEWORK_PATH"
+}
+
+if [[ "$DEPLOY_XCFramework" -eq 1 ]]; then
+    echo '[+] Creating XCFramework ...'
+
+    if [[ "$BUILD_TYPE" =~ "Debug" ]]; then
+        make_xcframework 'libassimpd'
+    else
+        make_xcframework 'libassimp'
+    fi
+
+    echo "[!] Done! The XCFramework can be found at $BUILD_DIR"
+fi
\ No newline at end of file
diff --git a/port/jassimp/jassimp/src/jassimp/AiPostProcessSteps.java b/port/jassimp/jassimp/src/jassimp/AiPostProcessSteps.java
index 7bb617b2c..e863d32df 100644
--- a/port/jassimp/jassimp/src/jassimp/AiPostProcessSteps.java
+++ b/port/jassimp/jassimp/src/jassimp/AiPostProcessSteps.java
@@ -349,7 +349,7 @@ public enum AiPostProcessSteps {
      *   <li>Specify the #SortByPType flag. This moves line and point 
      *       primitives to separate meshes.
      *   <li>Set the <tt>AI_CONFIG_PP_SBP_REMOVE</tt> option to
-     *       <code>aiPrimitiveType_POINTS | aiPrimitiveType_LINES</code>
+     *       <code>aiPrimitiveType_POINT | aiPrimitiveType_LINE</code>
      *       to cause SortByPType to reject point and line meshes from the 
      *       scene.
      * </ul>
@@ -477,7 +477,7 @@ public enum AiPostProcessSteps {
      * 
      * <b>Output UV coordinate system:</b><br>
      * <code><pre>
-     * 0y|0y ---------- 1x|0y 
+     * 0x|0y ---------- 1x|0y 
      *   |                | 
      *   |                |
      *   |                | 
diff --git a/samples/README b/samples/README
index a9f44cec2..c8fccde40 100644
--- a/samples/README
+++ b/samples/README
@@ -12,16 +12,16 @@ use in various real-world environments. Workspaces to build the
 samples can be found in the respective directories. The VC workspaces
 copy the created executables to the ./bin directory.
 
-All GL-based samples depend on FreeGLUT, the image loading will be done 
+All GL-based samples depend on FreeGLUT, the image loading will be done
 by a header-only library. For convenience, these libraries are included
 in the repository in their respective Windows/x86 prebuilt versions.
-To build on linux, install freeglut using the package manager of your 
+To build on linux, install freeglut using the package manager of your
 choice. For instance on Ubuntu to install freeglut you can use the following
 command:
 
 > sudo apt install freeglut
 
-All samples will be placed at 
+All samples will be placed at
 
 Win32: <assimp_repo>/<config>/bin
 
@@ -45,7 +45,7 @@ SimpleOpenGL
 
 SimpleTexturedOpenGL
 
-  An extended OpenGL sample, featuring texturing using the DevIL 
+  An extended OpenGL sample, featuring texturing using the DevIL
   library. Based on SimpleOpenGL and the NeHe GL tutorial style.
 
   This is a Windows-only sample.
@@ -56,7 +56,7 @@ SimpleTexturedOpenGL
 
 SimpleAssimpViewX
 
-  A Mac OSX-based viewer app. This sample was kindly provided by drparallax. 
+  A Mac OSX-based viewer app. This sample was kindly provided by drparallax.
   See http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3917829
 
 
diff --git a/samples/SimpleAssimpViewX/MyDocument.mm b/samples/SimpleAssimpViewX/MyDocument.mm
index cbe034842..3e5d6f8af 100644
--- a/samples/SimpleAssimpViewX/MyDocument.mm
+++ b/samples/SimpleAssimpViewX/MyDocument.mm
@@ -257,7 +257,7 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink,const CVTimeS
 {
     CVReturn rv = kCVReturnError;
     NSAutoreleasePool *pool;
-	
+
     pool = [[NSAutoreleasePool alloc] init];
     {
         [self render];
@@ -345,7 +345,7 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink,const CVTimeS
             NSNumber* textureNumber = (NSNumber*)[textureDictionary valueForKey:textureKey];
             
             //NSLog(@"applyMaterialInContext: have texture %i", [textureNumber unsignedIntValue]); 
-            meshHelper.textureID = [textureNumber unsignedIntValue];		
+            meshHelper.textureID = [textureNumber unsignedIntValue];
         }
         else
             meshHelper.textureID = 0;
@@ -657,7 +657,7 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink,const CVTimeS
     
     /* getTexture Filenames and Numb of Textures */
 	for (unsigned int m = 0; m < _scene->mNumMaterials; m++)
-	{		
+	{
 		int texIndex = 0;
 		aiReturn texFound = AI_SUCCESS;
         
@@ -674,7 +674,7 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink,const CVTimeS
             [textureDictionary setValue:[NSNumber numberWithUnsignedInt:texIndex] forKey:texturePath];
             
 			texIndex++;
-		}		
+		}
 	}
     
     textureIds = (GLuint*) malloc(sizeof(GLuint) * [textureDictionary count]); //new GLuint[ [textureDictionary count] ];
diff --git a/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp b/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp
index ec031a594..e52fc6f59 100644
--- a/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp
+++ b/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp
@@ -157,7 +157,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/,
 
 	// Retrieve the model file path.
     std::wstring filename(argv[1]);
-    
+
 	char *targetStart = new char[filename.size()+1];
     memset(targetStart, '\0', filename.size() + 1);
 
diff --git a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
index f6d3097fe..9f4759ef8 100644
--- a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
+++ b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
@@ -119,9 +119,9 @@ bool Import3DFromFile( const std::string &filename) {
         logInfo(importer.GetErrorString());
         return false;
 	}
-    
+
 	fin.close();
-	
+
 	g_scene = importer.ReadFile(filename, aiProcessPreset_TargetRealtime_Quality);
 
 	// If the import failed, report it
@@ -176,7 +176,7 @@ void freeTextureIds() {
 int LoadGLTextures(const aiScene* scene) {
 	freeTextureIds();
 
-    if (scene->HasTextures()) 
+    if (scene->HasTextures())
 		return 1;
 
 	/* getTexture Filenames and Numb of Textures */
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index afe487411..ec4520d1a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Open Asset Import Library (assimp)
 # ----------------------------------------------------------------------
-# Copyright (c) 2006-2022, assimp team
+# Copyright (c) 2006-2025, assimp team
 #
 # All rights reserved.
 #
@@ -59,6 +59,10 @@ endif()
 # Assimp library can be found, even if it is not installed system-wide yet.
 LINK_DIRECTORIES( ${Assimp_BINARY_DIR} ${AssetImporter_BINARY_DIR}/lib )
 
+SET(TOOLS
+    unit/Tools/TestTools.h
+)
+
 SET( COMMON
   unit/utSimd.cpp
   unit/utIOSystem.cpp
@@ -86,6 +90,7 @@ SET( COMMON
   unit/TestModelFactory.h
   unit/utTypes.cpp
   unit/utVersion.cpp
+  unit/Common/utParsingUtils.cpp
   unit/utProfiler.cpp
   unit/utSharedPPData.cpp
   unit/utStringUtils.cpp
@@ -100,6 +105,7 @@ SET( COMMON
   unit/Common/utBase64.cpp
   unit/Common/utHash.cpp
   unit/Common/utBaseProcess.cpp
+  unit/Common/utLogger.cpp
 )
 
 SET(Geometry 
@@ -165,8 +171,15 @@ SET( IMPORTERS
   unit/ImportExport/MDL/utMDLImporter_HL1_Nodes.cpp
   unit/ImportExport/RAW/utRAWImportExport.cpp
   unit/ImportExport/Terragen/utTerragenImportExport.cpp
+  unit/ImportExport/Pbrt/utPbrtImportExport.cpp
 )
 
+if(ASSIMP_BUILD_USD_IMPORTER)
+  list( APPEND IMPORTERS
+    unit/utUSDImport.cpp
+  )
+endif()
+
 SET( MATERIAL
   unit/utMaterialSystem.cpp
 )
@@ -210,6 +223,7 @@ SOURCE_GROUP( UnitTests\\GeometryTools FILES ${Geometry} )
 SOURCE_GROUP( UnitTests\\ImportExport  FILES ${IMPORTERS} )
 SOURCE_GROUP( UnitTests\\Material      FILES ${MATERIAL} )
 SOURCE_GROUP( UnitTests\\Math          FILES ${MATH} )
+SOURCE_GROUP( UnitTests\\Tools         FILES ${TOOLS} )
 SOURCE_GROUP( UnitTests\\PostProcess   FILES ${POST_PROCESSES})
 
 add_executable( unit
@@ -218,11 +232,12 @@ add_executable( unit
     ../code/Common/Version.cpp
 	../code/Common/Base64.cpp
 	${COMMON}
-  ${Geometry}
+    ${Geometry}
 	${IMPORTERS}
 	${MATERIAL}
 	${MATH}
-  ${POST_PROCESSES}
+    ${POST_PROCESSES}
+    ${TOOLS}
 )
 
 if(ASSIMP_HUNTER_ENABLED)
diff --git a/test/models-nonbsd/AMF/ref/README.md b/test/models-nonbsd/AMF/ref/README.md
new file mode 100644
index 000000000..fa6a2608a
--- /dev/null
+++ b/test/models-nonbsd/AMF/ref/README.md
@@ -0,0 +1,14 @@
+# AMF 3D model reference images
+
+## 3_bananas.amf
+(Note: need to flip UVs when rendering)
+
+<img alt="3_bananas.amf" src="screenshots/3bananas_amf_uvs_flipped_01.png" width=180 /><img alt="3_bananas.amf" src="screenshots/screenshot_3_bananas.jpeg" width=360 />
+
+## 3_bananas.amf embedded texture
+3_bananas.amf embeds a strange-looking but valid texture, which when applied to the model renders correctly.
+
+(Note that this is a relatively rare example of a 3D model with an "uncompressed" embedded texture,
+may be useful for developers looking to test their assimp embedded texture implementations)
+
+<img alt="3bananas_embedded_texture.png" src="screenshots%2F3bananas_embedded_texture.png" width=320 />
diff --git a/test/models-nonbsd/AMF/ref/screenshots/3bananas_amf_uvs_flipped_01.png b/test/models-nonbsd/AMF/ref/screenshots/3bananas_amf_uvs_flipped_01.png
new file mode 100644
index 000000000..1c8622b12
Binary files /dev/null and b/test/models-nonbsd/AMF/ref/screenshots/3bananas_amf_uvs_flipped_01.png differ
diff --git a/test/models-nonbsd/AMF/ref/screenshots/3bananas_embedded_texture.png b/test/models-nonbsd/AMF/ref/screenshots/3bananas_embedded_texture.png
new file mode 100644
index 000000000..e69b089d6
Binary files /dev/null and b/test/models-nonbsd/AMF/ref/screenshots/3bananas_embedded_texture.png differ
diff --git a/test/models-nonbsd/AMF/screenshot_3_bananas.jpeg b/test/models-nonbsd/AMF/ref/screenshots/screenshot_3_bananas.jpeg
similarity index 100%
rename from test/models-nonbsd/AMF/screenshot_3_bananas.jpeg
rename to test/models-nonbsd/AMF/ref/screenshots/screenshot_3_bananas.jpeg
diff --git a/test/models-nonbsd/B3D/ref/README.md b/test/models-nonbsd/B3D/ref/README.md
new file mode 100644
index 000000000..05e1f59a9
--- /dev/null
+++ b/test/models-nonbsd/B3D/ref/README.md
@@ -0,0 +1,9 @@
+# B3D 3D model reference images
+
+## dwarf2.b3d
+Note: there's a weird artifact in the animation when the character starts running
+
+<img alt="dwarf2.b3d" src="screenshots/dwarf2_b3d.gif" width=180 />
+
+## turtle1.b3d
+<img alt="turtle1.b3d" src="screenshots/turtle1_b3d.gif" width=320 />
diff --git a/test/models-nonbsd/B3D/ref/screenshots/dwarf2_b3d.gif b/test/models-nonbsd/B3D/ref/screenshots/dwarf2_b3d.gif
new file mode 100644
index 000000000..0e6b5a0ae
Binary files /dev/null and b/test/models-nonbsd/B3D/ref/screenshots/dwarf2_b3d.gif differ
diff --git a/test/models-nonbsd/B3D/ref/screenshots/turtle1_b3d.gif b/test/models-nonbsd/B3D/ref/screenshots/turtle1_b3d.gif
new file mode 100644
index 000000000..73c6bdca7
Binary files /dev/null and b/test/models-nonbsd/B3D/ref/screenshots/turtle1_b3d.gif differ
diff --git a/test/models-nonbsd/BLEND/ref/README.md b/test/models-nonbsd/BLEND/ref/README.md
new file mode 100644
index 000000000..0d31c0cf1
--- /dev/null
+++ b/test/models-nonbsd/BLEND/ref/README.md
@@ -0,0 +1,4 @@
+# BLEND 3D model reference images
+
+## fleurOptonl.blend
+<img alt="fleurOptonl.blend" src="screenshots/fleurOptonl_blend.png" width=180 />
diff --git a/test/models-nonbsd/BLEND/ref/screenshots/fleurOptonl_blend.png b/test/models-nonbsd/BLEND/ref/screenshots/fleurOptonl_blend.png
new file mode 100644
index 000000000..fab4f7a72
Binary files /dev/null and b/test/models-nonbsd/BLEND/ref/screenshots/fleurOptonl_blend.png differ
diff --git a/test/models-nonbsd/HMP/ref/README.md b/test/models-nonbsd/HMP/ref/README.md
new file mode 100644
index 000000000..f1bb05807
--- /dev/null
+++ b/test/models-nonbsd/HMP/ref/README.md
@@ -0,0 +1,4 @@
+# HMP 3D model reference images
+
+## terrain_withtexture.hmp
+<img alt="terrain_withtexture.hmp" src="screenshots/terrain_withtexture_hmp.png" width=180 />
diff --git a/test/models-nonbsd/HMP/ref/screenshots/terrain_withtexture_hmp.png b/test/models-nonbsd/HMP/ref/screenshots/terrain_withtexture_hmp.png
new file mode 100644
index 000000000..e68eb0a0d
Binary files /dev/null and b/test/models-nonbsd/HMP/ref/screenshots/terrain_withtexture_hmp.png differ
diff --git a/test/models-nonbsd/LWS/ref/README.md b/test/models-nonbsd/LWS/ref/README.md
new file mode 100644
index 000000000..ea66b0e07
--- /dev/null
+++ b/test/models-nonbsd/LWS/ref/README.md
@@ -0,0 +1,4 @@
+# LWS 3D model reference images
+
+## QuickDraw v.2.2.lws
+<img alt="QuickDraw v.2.2.lws" src="screenshots/quickdraw_v2_2_lws.gif" width=320 />
diff --git a/test/models-nonbsd/LWS/ref/screenshots/quickdraw_v2_2_lws.gif b/test/models-nonbsd/LWS/ref/screenshots/quickdraw_v2_2_lws.gif
new file mode 100644
index 000000000..5e6720ab5
Binary files /dev/null and b/test/models-nonbsd/LWS/ref/screenshots/quickdraw_v2_2_lws.gif differ
diff --git a/test/models-nonbsd/MD5/ref/README.md b/test/models-nonbsd/MD5/ref/README.md
new file mode 100644
index 000000000..848c20105
--- /dev/null
+++ b/test/models-nonbsd/MD5/ref/README.md
@@ -0,0 +1,12 @@
+# MD5 3D model reference images
+
+## Bob.md5anim
+Bones/skeleton-only animation visualization
+
+<img alt="Bob.md5anim" src="screenshots/Bob_md5anim.gif" width=180 />
+
+
+## Bob.md5mesh
+Skinned, textured animated model
+
+<img alt="Bob.md5mesh" src="screenshots/Bob_md5mesh.gif" width=180 />
diff --git a/test/models-nonbsd/MD5/ref/screenshots/Bob_md5anim.gif b/test/models-nonbsd/MD5/ref/screenshots/Bob_md5anim.gif
new file mode 100644
index 000000000..0f64953ab
Binary files /dev/null and b/test/models-nonbsd/MD5/ref/screenshots/Bob_md5anim.gif differ
diff --git a/test/models-nonbsd/MD5/ref/screenshots/Bob_md5mesh.gif b/test/models-nonbsd/MD5/ref/screenshots/Bob_md5mesh.gif
new file mode 100644
index 000000000..8b2a648af
Binary files /dev/null and b/test/models-nonbsd/MD5/ref/screenshots/Bob_md5mesh.gif differ
diff --git a/test/models-nonbsd/MDL/IDPO (Quake1)/ref/README.md b/test/models-nonbsd/MDL/IDPO (Quake1)/ref/README.md
new file mode 100644
index 000000000..af934490d
--- /dev/null
+++ b/test/models-nonbsd/MDL/IDPO (Quake1)/ref/README.md	
@@ -0,0 +1,4 @@
+# IDPO 3D model reference images
+
+## gijoe.mdl
+<img alt="gijoe.mdl" src="screenshots/gijoe_mdl.png" width=180 />
diff --git a/test/models-nonbsd/MDL/IDPO (Quake1)/ref/screenshots/gijoe_mdl.png b/test/models-nonbsd/MDL/IDPO (Quake1)/ref/screenshots/gijoe_mdl.png
new file mode 100644
index 000000000..03a1b74ca
Binary files /dev/null and b/test/models-nonbsd/MDL/IDPO (Quake1)/ref/screenshots/gijoe_mdl.png differ
diff --git a/test/models-nonbsd/Ogre/OgreSDK/ref/README.md b/test/models-nonbsd/Ogre/OgreSDK/ref/README.md
new file mode 100644
index 000000000..57fd7b9dc
--- /dev/null
+++ b/test/models-nonbsd/Ogre/OgreSDK/ref/README.md
@@ -0,0 +1,9 @@
+# OgreSDK 3D model reference images
+
+## fish.mesh
+<img alt="fish.mesh" src="screenshots/fish_mesh.gif" width=320 />
+
+## ninja.mesh
+Simple rigged/skinned model with about 20 animations
+
+<img alt="ninja.mesh" src="screenshots/ninja_mesh.gif" width=180 />
diff --git a/test/models-nonbsd/Ogre/OgreSDK/ref/screenshots/fish_mesh.gif b/test/models-nonbsd/Ogre/OgreSDK/ref/screenshots/fish_mesh.gif
new file mode 100644
index 000000000..75115b0cb
Binary files /dev/null and b/test/models-nonbsd/Ogre/OgreSDK/ref/screenshots/fish_mesh.gif differ
diff --git a/test/models-nonbsd/Ogre/OgreSDK/ref/screenshots/ninja_mesh.gif b/test/models-nonbsd/Ogre/OgreSDK/ref/screenshots/ninja_mesh.gif
new file mode 100644
index 000000000..9b1b2ca8b
Binary files /dev/null and b/test/models-nonbsd/Ogre/OgreSDK/ref/screenshots/ninja_mesh.gif differ
diff --git a/test/models-nonbsd/USD/usda/README.md b/test/models-nonbsd/USD/usda/README.md
new file mode 100644
index 000000000..cb5477b26
--- /dev/null
+++ b/test/models-nonbsd/USD/usda/README.md
@@ -0,0 +1,5 @@
+[blendshape.usda](blendshape.usda) copied from tinyusdz/models (No attribution/license cited in that project)
+[texturedcube.usda](texturedcube.usda) copied from tinyusdz/models (No attribution/license cited in that project)
+[translated-cube.usda](translated-cube.usda) copied from tinyusdz/models (No attribution/license cited in that project)
+[simple-skin-test.usda](simple-skin-test.usda) copied from tinyusdz/models (No attribution/license cited in that project)
+[simple-skin-animation-test.usda](simple-skin-animation-test.usda) modified tinyusdz/models (No attribution/license cited in that project)
diff --git a/test/models-nonbsd/USD/usda/blendshape.usda b/test/models-nonbsd/USD/usda/blendshape.usda
new file mode 100644
index 000000000..06fc33063
--- /dev/null
+++ b/test/models-nonbsd/USD/usda/blendshape.usda
@@ -0,0 +1,154 @@
+#usda 1.0
+(
+    defaultPrim = "root"
+    doc = "Blender v3.4.0 Alpha"
+    metersPerUnit = 0.01
+    upAxis = "Z"
+)
+
+def Xform "root"
+{
+    float3 xformOp:scale = (100, 100, 100)
+    uniform token[] xformOpOrder = ["xformOp:scale"]
+
+    def Scope "lights"
+    {
+        def DomeLight "environment"
+        {
+            custom color3f color = (0.05087609, 0.05087609, 0.05087609)
+            color3f inputs:color = (0.05087609, 0.05087609, 0.05087609)
+            float inputs:intensity = 683.0135
+            custom float intensity = 683.0135
+        }
+    }
+
+    def Scope "materials"
+    {
+        def Material "Material"
+        {
+            token outputs:surface.connect = </root/materials/Material/preview/Principled_BSDF.outputs:surface>
+            custom string userProperties:blenderName:data = "Material"
+
+            def Scope "preview"
+            {
+                def Shader "Principled_BSDF"
+                {
+                    uniform token info:id = "UsdPreviewSurface"
+                    float inputs:clearcoat = 0
+                    float inputs:clearcoatRoughness = 0.03
+                    color3f inputs:diffuseColor = (0.8, 0.8, 0.8)
+                    color3f inputs:emissiveColor = (0, 0, 0)
+                    float inputs:ior = 1.45
+                    float inputs:metallic = 0
+                    float inputs:opacity = 1
+                    float inputs:roughness = 0.5
+                    float inputs:specular = 0.5
+                    token outputs:surface
+                }
+            }
+        }
+    }
+
+    def SkelRoot "Cube"
+    {
+        custom string userProperties:blenderName:object = "Cube"
+
+        def Mesh "Cube" (
+            active = true
+            prepend apiSchemas = ["SkelBindingAPI"]
+        )
+        {
+            uniform bool doubleSided = 1
+            int[] faceVertexCounts = [4, 4, 4, 4, 4, 4]
+            int[] faceVertexIndices = [0, 4, 6, 2, 3, 2, 6, 7, 7, 6, 4, 5, 5, 1, 3, 7, 1, 0, 2, 3, 5, 4, 0, 1]
+            rel material:binding = </root/materials/Material>
+            normal3f[] normals = [(-2.3880695e-8, 0, 1), (-2.3880695e-8, 0, 1), (-2.3880695e-8, 0, 1), (-2.3880695e-8, 0, 1), (-0.23399627, -0.9436586, -0.2339963), (-0.23399627, -0.9436586, -0.2339963), (-0.23399627, -0.9436586, -0.2339963), (-0.23399627, -0.9436586, -0.2339963), (-1, 0, 0), (-1, 0, 0), (-1, 0, 0), (-1, 0, 0), (0, 0, -1), (0, 0, -1), (0, 0, -1), (0, 0, -1), (1, 0, 0), (1, 0, 0), (1, 0, 0), (1, 0, 0), (0, 1, 0), (0, 1, 0), (0, 1, 0), (0, 1, 0)] (
+                interpolation = "faceVarying"
+            )
+            point3f[] points = [(1, 1, 1), (1, 1, -1), (1, -1.9918684, 1), (1, -1, -1), (-1, 1, 1), (-1, 1, -1), (-1, -1, 1), (-1, -1, -1)]
+            int[] primvars:skel:jointIndices = [0, 0, 0, 0, 0, 0, 0, 0] (
+                elementSize = 1
+                interpolation = "vertex"
+            )
+            float[] primvars:skel:jointWeights = [1, 1, 1, 1, 1, 1, 1, 1] (
+                elementSize = 1
+                interpolation = "vertex"
+            )
+            texCoord2f[] primvars:st = [(0.625, 0.5), (0.875, 0.5), (0.875, 0.75), (0.625, 0.75), (0.375, 0.75), (0.625, 0.75), (0.625, 1), (0.375, 1), (0.375, 0), (0.625, 0), (0.625, 0.25), (0.375, 0.25), (0.125, 0.5), (0.375, 0.5), (0.375, 0.75), (0.125, 0.75), (0.375, 0.5), (0.625, 0.5), (0.625, 0.75), (0.375, 0.75), (0.375, 0.25), (0.625, 0.25), (0.625, 0.5), (0.375, 0.5)] (
+                interpolation = "faceVarying"
+            )
+            uniform token[] skel:blendShapes = ["Key_1"]
+            rel skel:blendShapeTargets = </root/Cube/Cube/Key_1>
+            prepend rel skel:skeleton = </root/Cube/Skel>
+            uniform token subdivisionScheme = "none"
+            custom string userProperties:blenderName:data = "Cube"
+            custom string userProperties:blenderName:data:st = "UVMap"
+
+            def BlendShape "Key_1"
+            {
+                uniform vector3f[] offsets = [(0, 0, 0.98508406), (0, 0, 0), (0, 0.892874, 0.98508406), (0, 0, 0), (0, 0, 0.98508406), (0, 0, 0), (0, 0, 0.98508406), (0, 0, 0)]
+                uniform int[] pointIndices = [0, 1, 2, 3, 4, 5, 6, 7]
+            }
+        }
+
+        def Skeleton "Skel"
+        {
+            uniform matrix4d[] bindTransforms = [( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (0, 0, 0, 1) )]
+            uniform token[] joints = ["joint1"]
+            uniform matrix4d[] restTransforms = [( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (0, 0, 0, 1) )]
+            prepend rel skel:animationSource = </root/Cube/Skel/Anim>
+
+            def SkelAnimation "Anim"
+            {
+                uniform token[] blendShapes = ["Key_1"]
+                float[] blendShapeWeights = [0]
+            }
+        }
+    }
+
+    def Xform "Light"
+    {
+        custom string userProperties:blenderName:object = "Light"
+        float3 xformOp:rotateXYZ = (37.26105, 3.163703, 106.93632)
+        float3 xformOp:scale = (1, 0.99999994, 1)
+        double3 xformOp:translate = (4.076245307922363, 1.0054539442062378, 5.903861999511719)
+        uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ", "xformOp:scale"]
+
+        def SphereLight "Light"
+        {
+            custom color3f color = (1, 1, 1)
+            color3f inputs:color = (1, 1, 1)
+            float inputs:intensity = 5435247
+            float inputs:radius = 0.10000002
+            float inputs:specular = 1
+            custom float intensity = 5435247
+            custom float radius = 0.10000002
+            custom float specular = 1
+            custom string userProperties:blenderName:data = "Light"
+        }
+    }
+
+    def Xform "Camera"
+    {
+        custom string userProperties:blenderName:object = "Camera"
+        float3 xformOp:rotateXYZ = (63.559303, -0.0000026647115, 46.691948)
+        float3 xformOp:scale = (1, 1, 1)
+        double3 xformOp:translate = (7.358891487121582, -6.925790786743164, 4.958309173583984)
+        uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ", "xformOp:scale"]
+
+        def Camera "Camera"
+        {
+            float2 clippingRange = (10, 10000)
+            float focalLength = 50
+            float horizontalAperture = 36
+            float horizontalApertureOffset = 0
+            token projection = "perspective"
+            double shutter:close = 0.25
+            double shutter:open = -0.25
+            custom string userProperties:blenderName:data = "Camera"
+            float verticalAperture = 24
+            float verticalApertureOffset = 0
+        }
+    }
+}
+
diff --git a/test/models-nonbsd/USD/usda/simple-skin-animation-test.usda b/test/models-nonbsd/USD/usda/simple-skin-animation-test.usda
new file mode 100644
index 000000000..2324c2064
--- /dev/null
+++ b/test/models-nonbsd/USD/usda/simple-skin-animation-test.usda
@@ -0,0 +1,237 @@
+#usda 1.0
+(
+    defaultPrim = "root"
+    doc = "Blender v4.2.3 LTS"
+    endTimeCode = 40
+    metersPerUnit = 1
+    startTimeCode = 0
+    timeCodesPerSecond = 24
+    upAxis = "Z"
+)
+
+def Xform "root" (
+    customData = {
+        dictionary Blender = {
+            bool generated = 1
+        }
+    }
+)
+{
+    def SkelRoot "Armature_001"
+    {
+        custom string userProperties:blender:object_name = "Armature.001"
+        float3 xformOp:rotateXYZ = (-89.99999, 0, 0)
+        float3 xformOp:scale = (1, 1, 1)
+        double3 xformOp:translate = (0, -1.7017418146133423, 0)
+        uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ", "xformOp:scale"]
+
+        def Xform "Grid"
+        {
+            custom string userProperties:blender:object_name = "Grid"
+            float3 xformOp:rotateXYZ = (89.99999, -0, 0)
+            float3 xformOp:scale = (1, 1, 1)
+            double3 xformOp:translate = (0, -7.438549687321938e-8, 1.7017418146133423)
+            uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ", "xformOp:scale"]
+
+            def Mesh "Grid" (
+                active = true
+                prepend apiSchemas = ["SkelBindingAPI"]
+            )
+            {
+                float3[] extent = [(-1, -1, 0), (1, 1, 0)]
+                int[] faceVertexCounts = [4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4]
+                int[] faceVertexIndices = [0, 1, 6, 5, 1, 2, 7, 6, 2, 3, 8, 7, 3, 4, 9, 8, 5, 6, 11, 10, 6, 7, 12, 11, 7, 8, 13, 12, 8, 9, 14, 13, 10, 11, 16, 15, 11, 12, 17, 16, 12, 13, 18, 17, 13, 14, 19, 18, 15, 16, 21, 20, 16, 17, 22, 21, 17, 18, 23, 22, 18, 19, 24, 23]
+                normal3f[] normals = [(0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1)] (
+                    interpolation = "faceVarying"
+                )
+                point3f[] points = [(-1, -1, 0), (-0.5, -1, 0), (0, -1, 0), (0.5, -1, 0), (1, -1, 0), (-1, -0.5, 0), (-0.5, -0.5, 0), (0, -0.5, 0), (0.5, -0.5, 0), (1, -0.5, 0), (-1, 0, 0), (-0.5, 0, 0), (0, 0, 0), (0.5, 0, 0), (1, 0, 0), (-1, 0.5, 0), (-0.5, 0.5, 0), (0, 0.5, 0), (0.5, 0.5, 0), (1, 0.5, 0), (-1, 1, 0), (-0.5, 1, 0), (0, 1, 0), (0.5, 1, 0), (1, 1, 0)]
+                bool[] primvars:sharp_face = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] (
+                    interpolation = "uniform"
+                )
+                matrix4d primvars:skel:geomBindTransform = ( (1, 0, 0, 0), (0, 1.331580543606492e-7, 0.9999999999999911, 0), (0, -0.9999999999999911, 1.331580543606492e-7, 0), (0, -7.438549687321943e-8, 1.701741814613342, 1) )
+                int[] primvars:skel:jointIndices = [0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1] (
+                    elementSize = 2
+                    interpolation = "vertex"
+                )
+                float[] primvars:skel:jointWeights = [0.43767902, 0.56232095, 0.605441, 0.39455906, 1, 0, 0.605441, 0.39455906, 0.43767902, 0.562321, 0.23470172, 0.7652983, 0.18096954, 0.81903046, 1, 0, 0.18096954, 0.81903046, 0.23470171, 0.7652983, 0.114853, 0.88514704, 0.06506716, 0.9349329, 1, 0, 0.06506715, 0.9349329, 0.11485299, 0.88514704, 0.059175473, 0.94082457, 0.009479873, 0.9905201, 1, 0, 0.009479865, 0.9905201, 0.059175465, 0.94082457, 0.031181445, 0.96881855, 1, 0, 1, 0, 1, 0, 0.031181442, 0.9688186] (
+                    elementSize = 2
+                    interpolation = "vertex"
+                )
+                texCoord2f[] primvars:st = [(0, 0), (0.25, 0), (0.25, 0.25), (0, 0.25), (0.25, 0), (0.5, 0), (0.5, 0.25), (0.25, 0.25), (0.5, 0), (0.75, 0), (0.75, 0.25), (0.5, 0.25), (0.75, 0), (1, 0), (1, 0.25), (0.75, 0.25), (0, 0.25), (0.25, 0.25), (0.25, 0.5), (0, 0.5), (0.25, 0.25), (0.5, 0.25), (0.5, 0.5), (0.25, 0.5), (0.5, 0.25), (0.75, 0.25), (0.75, 0.5), (0.5, 0.5), (0.75, 0.25), (1, 0.25), (1, 0.5), (0.75, 0.5), (0, 0.5), (0.25, 0.5), (0.25, 0.75), (0, 0.75), (0.25, 0.5), (0.5, 0.5), (0.5, 0.75), (0.25, 0.75), (0.5, 0.5), (0.75, 0.5), (0.75, 0.75), (0.5, 0.75), (0.75, 0.5), (1, 0.5), (1, 0.75), (0.75, 0.75), (0, 0.75), (0.25, 0.75), (0.25, 1), (0, 1), (0.25, 0.75), (0.5, 0.75), (0.5, 1), (0.25, 1), (0.5, 0.75), (0.75, 0.75), (0.75, 1), (0.5, 1), (0.75, 0.75), (1, 0.75), (1, 1), (0.75, 1)] (
+                    interpolation = "faceVarying"
+                )
+                rel skel:skeleton = </root/Armature_001/Armature/Armature>
+                uniform token subdivisionScheme = "none"
+                custom string userProperties:blender:data_name = "Grid"
+            }
+        }
+
+        def Xform "Armature"
+        {
+            custom string userProperties:blender:object_name = "Armature"
+            float3 xformOp:rotateXYZ.timeSamples = {
+                0: (0, -0, 0),
+            }
+            float3 xformOp:scale.timeSamples = {
+                0: (1, 1, 1),
+            }
+            double3 xformOp:translate.timeSamples = {
+                0: (0, 0, 0),
+            }
+            uniform token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ", "xformOp:scale"]
+
+            def Skeleton "Armature" (
+                prepend apiSchemas = ["SkelBindingAPI"]
+            )
+            {
+                uniform matrix4d[] bindTransforms = [( (1, 0, 0, 0), (0, 0, 1, 0), (0, -1, 0, 0), (0, 0, 0, 1) ), ( (1, 0, 0, 0), (0, 0, 1, 0), (0, -1, 0, 0), (0, 0, 1, 1) )]
+                uniform token[] joints = ["Bone", "Bone/Bone_001"]
+                uniform matrix4d[] restTransforms = [( (1, 0, 0, 0), (0, 0, 1, 0), (0, -1, 0, 0), (0, 0, 0, 1) ), ( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (0, 1, 0, 1) )]
+                rel skel:animationSource = </root/Armature_001/Armature/Armature/Anim>
+
+                def SkelAnimation "Anim"
+                {
+                    uniform token[] joints = ["Bone", "Bone/Bone_001"]
+                    quatf[] rotations.timeSamples = {
+                        0: [(0.70710677, 0.70710677, 0, 0), (1, 0, 0, 0)],
+                        1: [(0.70710677, 0.70710677, 0, 0), (0.9996082, 0, 0, 0.027989032)],
+                        2: [(0.70710677, 0.70710677, 0, 0), (0.99463546, 0, 0, 0.10344209)],
+                        3: [(0.70710677, 0.70710677, 0, 0), (0.9774578, 0, 0, 0.21113087)],
+                        4: [(0.70710677, 0.70710677, 0, 0), (0.9432686, 0, 0, 0.3320306)],
+                        5: [(0.70710677, 0.70710677, 0, 0), (0.89442724, 0, 0, 0.4472135)],
+                        6: [(0.70710677, 0.70710677, 0, 0), (0.83920974, 0, 0, 0.5438079)],
+                        7: [(0.70710677, 0.70710677, 0, 0), (0.7869733, 0, 0, 0.61698705)],
+                        8: [(0.70710677, 0.70710677, 0, 0), (0.7447736, 0, 0, 0.6673172)],
+                        9: [(0.70710677, 0.70710677, 0, 0), (0.7170745, 0, 0, 0.6969965)],
+                        10: [(0.70710677, 0.70710677, 0, 0), (0.70710677, 0, 0, 0.70710677)],
+                        11: [(0.70710677, 0.70710677, 0, 0), (0.7122517, 0, 0, 0.70192415)],
+                        12: [(0.70710677, 0.70710677, 0, 0), (0.7271744, 0, 0, 0.68645275)],
+                        13: [(0.70710677, 0.70710677, 0, 0), (0.75127214, 0, 0, 0.6599926)],
+                        14: [(0.70710677, 0.70710677, 0, 0), (0.7839187, 0, 0, 0.62086356)],
+                        15: [(0.70710677, 0.70710677, 0, 0), (0.82404196, 0, 0, 0.5665288)],
+                        16: [(0.70710677, 0.70710677, 0, 0), (0.8695245, 0, 0, 0.49388987)],
+                        17: [(0.70710677, 0.70710677, 0, 0), (0.91649354, 0, 0, 0.4000495)],
+                        18: [(0.70710677, 0.70710677, 0, 0), (0.9588755, 0, 0, 0.28382713)],
+                        19: [(0.70710677, 0.70710677, 0, 0), (0.9890088, 0, 0, 0.14785683)],
+                        20: [(0.70710677, 0.70710677, 0, 0), (1, 0, 0, 0)],
+                        21: [(0.70710677, 0.70710677, 0, 0), (0.9890088, 0, 0, -0.14785682)],
+                        22: [(0.70710677, 0.70710677, 0, 0), (0.9588755, 0, 0, -0.28382716)],
+                        23: [(0.70710677, 0.70710677, 0, 0), (0.91649354, 0, 0, -0.40004945)],
+                        24: [(0.70710677, 0.70710677, 0, 0), (0.86952454, 0, 0, -0.49388978)],
+                        25: [(0.70710677, 0.70710677, 0, 0), (0.82404196, 0, 0, -0.5665288)],
+                        26: [(0.70710677, 0.70710677, 0, 0), (0.7839186, 0, 0, -0.6208636)],
+                        27: [(0.70710677, 0.70710677, 0, 0), (0.7512721, 0, 0, -0.65999264)],
+                        28: [(0.70710677, 0.70710677, 0, 0), (0.7271744, 0, 0, -0.68645275)],
+                        29: [(0.70710677, 0.70710677, 0, 0), (0.7122517, 0, 0, -0.70192415)],
+                        30: [(0.70710677, 0.70710677, 0, 0), (0.70710677, 0, 0, -0.70710677)],
+                        31: [(0.70710677, 0.70710677, 0, 0), (0.7170746, 0, 0, -0.69699645)],
+                        32: [(0.70710677, 0.70710677, 0, 0), (0.7447736, 0, 0, -0.6673172)],
+                        33: [(0.70710677, 0.70710677, 0, 0), (0.7869733, 0, 0, -0.61698705)],
+                        34: [(0.70710677, 0.70710677, 0, 0), (0.83920974, 0, 0, -0.5438079)],
+                        35: [(0.70710677, 0.70710677, 0, 0), (0.8944272, 0, 0, -0.44721356)],
+                        36: [(0.70710677, 0.70710677, 0, 0), (0.9432686, 0, 0, -0.3320306)],
+                        37: [(0.70710677, 0.70710677, 0, 0), (0.97745776, 0, 0, -0.21113095)],
+                        38: [(0.70710677, 0.70710677, 0, 0), (0.99463546, 0, 0, -0.10344207)],
+                        39: [(0.70710677, 0.70710677, 0, 0), (0.9996082, 0, 0, -0.027989028)],
+                        40: [(0.70710677, 0.70710677, 0, 0), (1, 0, 0, 0)],
+                    }
+                    half3[] scales.timeSamples = {
+                        0: [(1, 1, 1), (1, 1, 1)],
+                        1: [(1, 1, 1), (1, 1, 1)],
+                        2: [(1, 1, 1), (1, 1, 1)],
+                        3: [(1, 1, 1), (1, 1, 1)],
+                        4: [(1, 1, 1), (1, 1, 1)],
+                        5: [(1, 1, 1), (1, 1, 1)],
+                        6: [(1, 1, 1), (1, 1, 1)],
+                        7: [(1, 1, 1), (1, 1, 1)],
+                        8: [(1, 1, 1), (1, 1, 1)],
+                        9: [(1, 1, 1), (1, 1, 1)],
+                        10: [(1, 1, 1), (1, 1, 1)],
+                        11: [(1, 1, 1), (1, 1, 1)],
+                        12: [(1, 1, 1), (1, 1, 1)],
+                        13: [(1, 1, 1), (1, 1, 1)],
+                        14: [(1, 1, 1), (1, 1, 1)],
+                        15: [(1, 1, 1), (1, 1, 1)],
+                        16: [(1, 1, 1), (1, 1, 1)],
+                        17: [(1, 1, 1), (1, 1, 1)],
+                        18: [(1, 1, 1), (1, 1, 1)],
+                        19: [(1, 1, 1), (1, 1, 1)],
+                        20: [(1, 1, 1), (1, 1, 1)],
+                        21: [(1, 1, 1), (1, 1, 1)],
+                        22: [(1, 1, 1), (1, 1, 1)],
+                        23: [(1, 1, 1), (1, 1, 1)],
+                        24: [(1, 1, 1), (1, 1, 1)],
+                        25: [(1, 1, 1), (1, 1, 1)],
+                        26: [(1, 1, 1), (1, 1, 1)],
+                        27: [(1, 1, 1), (1, 1, 1)],
+                        28: [(1, 1, 1), (1, 1, 1)],
+                        29: [(1, 1, 1), (1, 1, 1)],
+                        30: [(1, 1, 1), (1, 1, 1)],
+                        31: [(1, 1, 1), (1, 1, 1)],
+                        32: [(1, 1, 1), (1, 1, 1)],
+                        33: [(1, 1, 1), (1, 1, 1)],
+                        34: [(1, 1, 1), (1, 1, 1)],
+                        35: [(1, 1, 1), (1, 1, 1)],
+                        36: [(1, 1, 1), (1, 1, 1)],
+                        37: [(1, 1, 1), (1, 1, 1)],
+                        38: [(1, 1, 1), (1, 1, 1)],
+                        39: [(1, 1, 1), (1, 1, 1)],
+                        40: [(1, 1, 1), (1, 1, 1)],
+                    }
+                    float3[] translations.timeSamples = {
+                        0: [(0, 0, 0), (0, 1, 0)],
+                        1: [(0, 0, 0), (0, 1, 0)],
+                        2: [(0, 0, 0), (0, 1, 0)],
+                        3: [(0, 0, 0), (0, 1, 0)],
+                        4: [(0, 0, 0), (0, 1, 0)],
+                        5: [(0, 0, 0), (0, 1, 0)],
+                        6: [(0, 0, 0), (0, 1, 0)],
+                        7: [(0, 0, 0), (0, 1, 0)],
+                        8: [(0, 0, 0), (0, 1, 0)],
+                        9: [(0, 0, 0), (0, 1, 0)],
+                        10: [(0, 0, 0), (0, 1, 0)],
+                        11: [(0, 0, 0), (0, 1, 0)],
+                        12: [(0, 0, 0), (0, 1, 0)],
+                        13: [(0, 0, 0), (0, 1, 0)],
+                        14: [(0, 0, 0), (0, 1, 0)],
+                        15: [(0, 0, 0), (0, 1, 0)],
+                        16: [(0, 0, 0), (0, 1, 0)],
+                        17: [(0, 0, 0), (0, 1, 0)],
+                        18: [(0, 0, 0), (0, 1, 0)],
+                        19: [(0, 0, 0), (0, 1, 0)],
+                        20: [(0, 0, 0), (0, 1, 0)],
+                        21: [(0, 0, 0), (0, 1, 0)],
+                        22: [(0, 0, 0), (0, 1, 0)],
+                        23: [(0, 0, 0), (0, 1, 0)],
+                        24: [(0, 0, 0), (0, 1, 0)],
+                        25: [(0, 0, 0), (0, 1, 0)],
+                        26: [(0, 0, 0), (0, 1, 0)],
+                        27: [(0, 0, 0), (0, 1, 0)],
+                        28: [(0, 0, 0), (0, 1, 0)],
+                        29: [(0, 0, 0), (0, 1, 0)],
+                        30: [(0, 0, 0), (0, 1, 0)],
+                        31: [(0, 0, 0), (0, 1, 0)],
+                        32: [(0, 0, 0), (0, 1, 0)],
+                        33: [(0, 0, 0), (0, 1, 0)],
+                        34: [(0, 0, 0), (0, 1, 0)],
+                        35: [(0, 0, 0), (0, 1, 0)],
+                        36: [(0, 0, 0), (0, 1, 0)],
+                        37: [(0, 0, 0), (0, 1, 0)],
+                        38: [(0, 0, 0), (0, 1, 0)],
+                        39: [(0, 0, 0), (0, 1, 0)],
+                        40: [(0, 0, 0), (0, 1, 0)],
+                    }
+                }
+            }
+        }
+    }
+
+    def DomeLight "env_light"
+    {
+        float inputs:intensity = 1
+        asset inputs:texture:file = @.\textures\color_121212.hdr@
+        float3 xformOp:rotateXYZ = (90, 1.2722219e-14, 90)
+        uniform token[] xformOpOrder = ["xformOp:rotateXYZ"]
+    }
+}
+
diff --git a/test/models-nonbsd/USD/usda/simple-skin-test.usda b/test/models-nonbsd/USD/usda/simple-skin-test.usda
new file mode 100644
index 000000000..501b79b72
--- /dev/null
+++ b/test/models-nonbsd/USD/usda/simple-skin-test.usda
@@ -0,0 +1,85 @@
+#usda 1.0
+(
+    defaultPrim = "root"
+    doc = "Blender v4.1.0"
+    metersPerUnit = 1
+    upAxis = "Z"
+)
+
+def Xform "root" (
+    customData = {
+        dictionary Blender = {
+            bool generated = 1
+        }
+    }
+)
+{
+    def SkelRoot "Armature"
+    {
+        matrix4d xformOp:transform = ( (1, 0, 0, 0), (0, -4.371138828673793e-8, -1, 0), (0, 1, -4.371138828673793e-8, 0), (0, -1.7017418146133423, 0, 1) )
+        uniform token[] xformOpOrder = ["xformOp:transform"]
+
+        def Skeleton "Armature" (
+            prepend apiSchemas = ["SkelBindingAPI"]
+        )
+        {
+            uniform matrix4d[] bindTransforms = [( (1, 0, 0, 0), (0, 0, 1, 0), (0, -1, 0, 0), (0, 0, 0, 1) ), ( (1, 0, 0, 0), (0, 0, 1, 0), (0, -1, 0, 0), (0, 0, 1, 1) )]
+            uniform token[] joints = ["Bone", "Bone/Bone_001"]
+            uniform matrix4d[] restTransforms = [( (1, 0, 0, 0), (0, 0, 1, 0), (0, -1, 0, 0), (0, 0, 0, 1) ), ( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (0, 1, 0, 1) )]
+        }
+
+        def Xform "Grid"
+        {
+            matrix4d xformOp:transform = ( (1, 0, 0, 0), (0, -4.371138828673793e-8, 1, 0), (0, -1, -4.371138828673793e-8, 0), (0, -7.438549687321938e-8, 1.7017418146133423, 1) )
+            uniform token[] xformOpOrder = ["xformOp:transform"]
+
+            def Mesh "Grid" (
+                prepend apiSchemas = ["SkelBindingAPI"]
+            )
+            {
+                float3[] extent = [(-1, -1, 0), (1, 1, 0)]
+                int[] faceVertexCounts = [4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4]
+                int[] faceVertexIndices = [0, 1, 6, 5, 1, 2, 7, 6, 2, 3, 8, 7, 3, 4, 9, 8, 5, 6, 11, 10, 6, 7, 12, 11, 7, 8, 13, 12, 8, 9, 14, 13, 10, 11, 16, 15, 11, 12, 17, 16, 12, 13, 18, 17, 13, 14, 19, 18, 15, 16, 21, 20, 16, 17, 22, 21, 17, 18, 23, 22, 18, 19, 24, 23]
+                normal3f[] normals = [(0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1)] (
+                    interpolation = "faceVarying"
+                )
+                point3f[] points = [(-1, -1, 0), (-0.5, -1, 0), (0, -1, 0), (0.5, -1, 0), (1, -1, 0), (-1, -0.5, 0), (-0.5, -0.5, 0), (0, -0.5, 0), (0.5, -0.5, 0), (1, -0.5, 0), (-1, 0, 0), (-0.5, 0, 0), (0, 0, 0), (0.5, 0, 0), (1, 0, 0), (-1, 0.5, 0), (-0.5, 0.5, 0), (0, 0.5, 0), (0.5, 0.5, 0), (1, 0.5, 0), (-1, 1, 0), (-0.5, 1, 0), (0, 1, 0), (0.5, 1, 0), (1, 1, 0)]
+                bool[] primvars:sharp_face = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] (
+                    interpolation = "uniform"
+                )
+                matrix4d primvars:skel:geomBindTransform = ( (1, 0, 0, 0), (0, -4.371138828673793e-8, 1, 0), (0, -1, -4.371138828673793e-8, 0), (0, -7.438549687321938e-8, 1.7017418146133423, 1) )
+                int[] primvars:skel:jointIndices = [0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1] (
+                    elementSize = 2
+                    interpolation = "vertex"
+                )
+                float[] primvars:skel:jointWeights = [0.43767902, 0.56232095, 0.605441, 0.39455906, 1, 0, 0.605441, 0.39455906, 0.43767902, 0.562321, 0.23470172, 0.7652983, 0.18096954, 0.81903046, 1, 0, 0.18096954, 0.81903046, 0.23470171, 0.7652983, 0.114853, 0.88514704, 0.06506716, 0.9349329, 1, 0, 0.06506715, 0.9349329, 0.11485299, 0.88514704, 0.059175473, 0.94082457, 0.009479873, 0.9905201, 1, 0, 0.009479865, 0.9905201, 0.059175465, 0.94082457, 0.031181445, 0.96881855, 1, 0, 1, 0, 1, 0, 0.031181442, 0.9688186] (
+                    elementSize = 2
+                    interpolation = "vertex"
+                )
+                texCoord2f[] primvars:UVMap = [(0, 0), (0.25, 0), (0.25, 0.25), (0, 0.25), (0.25, 0), (0.5, 0), (0.5, 0.25), (0.25, 0.25), (0.5, 0), (0.75, 0), (0.75, 0.25), (0.5, 0.25), (0.75, 0), (1, 0), (1, 0.25), (0.75, 0.25), (0, 0.25), (0.25, 0.25), (0.25, 0.5), (0, 0.5), (0.25, 0.25), (0.5, 0.25), (0.5, 0.5), (0.25, 0.5), (0.5, 0.25), (0.75, 0.25), (0.75, 0.5), (0.5, 0.5), (0.75, 0.25), (1, 0.25), (1, 0.5), (0.75, 0.5), (0, 0.5), (0.25, 0.5), (0.25, 0.75), (0, 0.75), (0.25, 0.5), (0.5, 0.5), (0.5, 0.75), (0.25, 0.75), (0.5, 0.5), (0.75, 0.5), (0.75, 0.75), (0.5, 0.75), (0.75, 0.5), (1, 0.5), (1, 0.75), (0.75, 0.75), (0, 0.75), (0.25, 0.75), (0.25, 1), (0, 1), (0.25, 0.75), (0.5, 0.75), (0.5, 1), (0.25, 1), (0.5, 0.75), (0.75, 0.75), (0.75, 1), (0.5, 1), (0.75, 0.75), (1, 0.75), (1, 1), (0.75, 1)] (
+                    interpolation = "faceVarying"
+                )
+                rel skel:skeleton = </root/Armature/Armature>
+                uniform token subdivisionScheme = "none"
+            }
+        }
+    }
+
+    def Xform "Camera"
+    {
+        matrix4d xformOp:transform = ( (0.6859206557273865, 0.7276763319969177, 0, 0), (-0.32401347160339355, 0.305420845746994, 0.8953956365585327, 0), (0.6515582203865051, -0.6141703724861145, 0.44527140259742737, 0), (7.358891487121582, -6.925790786743164, 4.958309173583984, 1) )
+        uniform token[] xformOpOrder = ["xformOp:transform"]
+
+        def Camera "Camera"
+        {
+            float2 clippingRange = (0.1, 100)
+            float focalLength = 0.5
+            float horizontalAperture = 0.36
+            float horizontalApertureOffset = 0
+            token projection = "perspective"
+            float verticalAperture = 0.2025
+            float verticalApertureOffset = 0
+        }
+    }
+}
+
diff --git a/test/models-nonbsd/USD/usda/texturedcube.usda b/test/models-nonbsd/USD/usda/texturedcube.usda
new file mode 100644
index 000000000..980fa323c
--- /dev/null
+++ b/test/models-nonbsd/USD/usda/texturedcube.usda
@@ -0,0 +1,101 @@
+#usda 1.0
+(
+    doc = "Blender v3.1.0"
+    metersPerUnit = 1
+    upAxis = "Z"
+)
+
+def Xform "Camera"
+{
+    matrix4d xformOp:transform = ( (0.6859206557273865, 0.7276763319969177, 0, 0), (-0.32401347160339355, 0.305420845746994, 0.8953956365585327, 0), (0.6515582203865051, -0.6141703724861145, 0.44527140259742737, 0), (7.358891487121582, -6.925790786743164, 4.958309173583984, 1) )
+    uniform token[] xformOpOrder = ["xformOp:transform"]
+
+    def Camera "Camera"
+    {
+        float2 clippingRange = (0.1, 100)
+        float focalLength = 50
+        float horizontalAperture = 36
+        float horizontalApertureOffset = 0
+        token projection = "perspective"
+        float verticalAperture = 20.25
+        float verticalApertureOffset = 0
+    }
+}
+
+def Xform "Cube"
+{
+    matrix4d xformOp:transform = ( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (-1.1853550672531128, 0, 1.9550952911376953, 1) )
+    uniform token[] xformOpOrder = ["xformOp:transform"]
+
+    def Mesh "Cube"
+    {
+        uniform bool doubleSided = 1
+        int[] faceVertexCounts = [4, 4, 4, 4, 4, 4]
+        int[] faceVertexIndices = [0, 4, 6, 2, 3, 2, 6, 7, 7, 6, 4, 5, 5, 1, 3, 7, 1, 0, 2, 3, 5, 4, 0, 1]
+        rel material:binding = </_materials/Material>
+        normal3f[] normals = [(0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, -1, 0), (0, -1, 0), (0, -1, 0), (0, -1, 0), (-1, 0, 0), (-1, 0, 0), (-1, 0, 0), (-1, 0, 0), (0, 0, -1), (0, 0, -1), (0, 0, -1), (0, 0, -1), (1, 0, 0), (1, 0, 0), (1, 0, 0), (1, 0, 0), (0, 1, 0), (0, 1, 0), (0, 1, 0), (0, 1, 0)] (
+            interpolation = "faceVarying"
+        )
+        point3f[] points = [(1, 1, 1), (1, 1, -1), (1, -1, 1), (1, -1, -1), (-1, 1, 1), (-1, 1, -1), (-1, -1, 1), (-1, -1, -1)]
+        texCoord2f[] primvars:UVMap = [(0.625, 0.5), (0.875, 0.5), (0.875, 0.75), (0.625, 0.75), (0.375, 0.75), (0.625, 0.75), (0.625, 1), (0.375, 1), (0.375, 0), (0.625, 0), (0.625, 0.25), (0.375, 0.25), (0.125, 0.5), (0.375, 0.5), (0.375, 0.75), (0.125, 0.75), (0.375, 0.5), (0.625, 0.5), (0.625, 0.75), (0.375, 0.75), (0.375, 0.25), (0.625, 0.25), (0.625, 0.5), (0.375, 0.5)] (
+            interpolation = "faceVarying"
+        )
+        uniform token subdivisionScheme = "none"
+    }
+}
+
+def "_materials"
+{
+    def Material "Material"
+    {
+        token outputs:surface.connect = </_materials/Material/preview/Principled_BSDF.outputs:surface>
+
+        def Scope "preview"
+        {
+            def Shader "Principled_BSDF"
+            {
+                uniform token info:id = "UsdPreviewSurface"
+                float inputs:clearcoat = 0
+                float inputs:clearcoatRoughness = 0.03
+                float3 inputs:diffuseColor.connect = </_materials/Material/preview/Image_Texture.outputs:rgb>
+                float inputs:ior = 1.45
+                float inputs:metallic = 0
+                float inputs:opacity = 1
+                float inputs:roughness = 0.4
+                float inputs:specular = 0.5
+                token outputs:surface
+            }
+
+            def Shader "Image_Texture"
+            {
+                uniform token info:id = "UsdUVTexture"
+                asset inputs:file = @.\textures\checkerboard.png@
+                token inputs:sourceColorSpace = "sRGB"
+                float2 inputs:st.connect = </_materials/Material/preview/uvmap.outputs:result>
+                float3 outputs:rgb
+            }
+
+            def Shader "uvmap"
+            {
+                uniform token info:id = "UsdPrimvarReader_float2"
+                token inputs:varname = "UVMap"
+                float2 outputs:result
+            }
+        }
+    }
+}
+
+def Xform "Light"
+{
+    matrix4d xformOp:transform = ( (-0.29086464643478394, 0.9551711678504944, -0.05518905818462372, 0), (-0.7711008191108704, -0.1998833566904068, 0.6045247316360474, 0), (0.5663931965827942, 0.21839119493961334, 0.7946722507476807, 0), (4.076245307922363, 1.0054539442062378, 5.903861999511719, 1) )
+    uniform token[] xformOpOrder = ["xformOp:transform"]
+
+    def SphereLight "Light"
+    {
+        color3f inputs:color = (1, 1, 1)
+        float inputs:intensity = 10
+        float inputs:radius = 0.1
+        float inputs:specular = 1
+    }
+}
+
diff --git a/test/models-nonbsd/USD/usda/textures/01.jpg b/test/models-nonbsd/USD/usda/textures/01.jpg
new file mode 100644
index 000000000..b24c7c708
Binary files /dev/null and b/test/models-nonbsd/USD/usda/textures/01.jpg differ
diff --git a/test/models-nonbsd/USD/usda/textures/checkerboard.png b/test/models-nonbsd/USD/usda/textures/checkerboard.png
new file mode 100644
index 000000000..fde967aca
Binary files /dev/null and b/test/models-nonbsd/USD/usda/textures/checkerboard.png differ
diff --git a/test/models-nonbsd/USD/usda/textures/texture-cat.jpg b/test/models-nonbsd/USD/usda/textures/texture-cat.jpg
new file mode 100644
index 000000000..22870c622
Binary files /dev/null and b/test/models-nonbsd/USD/usda/textures/texture-cat.jpg differ
diff --git a/test/models-nonbsd/USD/usda/translated-cube.usda b/test/models-nonbsd/USD/usda/translated-cube.usda
new file mode 100644
index 000000000..2a543dbdf
--- /dev/null
+++ b/test/models-nonbsd/USD/usda/translated-cube.usda
@@ -0,0 +1,55 @@
+#usda 1.0
+(
+    doc = "Blender v3.1.0"
+    metersPerUnit = 1
+    upAxis = "Z"
+)
+
+def Xform "Camera"
+{
+    matrix4d xformOp:transform = ( (0.6859206557273865, 0.7276763319969177, 0, 0), (-0.32401347160339355, 0.305420845746994, 0.8953956365585327, 0), (0.6515582203865051, -0.6141703724861145, 0.44527140259742737, 0), (7.358891487121582, -6.925790786743164, 4.958309173583984, 1) )
+    uniform token[] xformOpOrder = ["xformOp:transform"]
+
+    def Camera "Camera"
+    {
+        float2 clippingRange = (0.1, 100)
+        float focalLength = 50
+        float horizontalAperture = 36
+        float horizontalApertureOffset = 0
+        token projection = "perspective"
+        float verticalAperture = 20.25
+        float verticalApertureOffset = 0
+    }
+}
+
+def Xform "Cube"
+{
+    matrix4d xformOp:transform = ( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (-1.1853550672531128, 0, 1.9550952911376953, 1) )
+    uniform token[] xformOpOrder = ["xformOp:transform"]
+
+    def Mesh "Cube"
+    {
+        int[] faceVertexCounts = [4, 4, 4, 4, 4, 4]
+        int[] faceVertexIndices = [0, 4, 6, 2, 3, 2, 6, 7, 7, 6, 4, 5, 5, 1, 3, 7, 1, 0, 2, 3, 5, 4, 0, 1]
+        normal3f[] normals = [(0, 0, 1), (0, 0, 1), (0, 0, 1), (0, 0, 1), (0, -1, 0), (0, -1, 0), (0, -1, 0), (0, -1, 0), (-1, 0, 0), (-1, 0, 0), (-1, 0, 0), (-1, 0, 0), (0, 0, -1), (0, 0, -1), (0, 0, -1), (0, 0, -1), (1, 0, 0), (1, 0, 0), (1, 0, 0), (1, 0, 0), (0, 1, 0), (0, 1, 0), (0, 1, 0), (0, 1, 0)] (
+            interpolation = "faceVarying"
+        )
+        point3f[] points = [(1, 1, 1), (1, 1, -1), (1, -1, 1), (1, -1, -1), (-1, 1, 1), (-1, 1, -1), (-1, -1, 1), (-1, -1, -1)]
+        uniform token subdivisionScheme = "none"
+    }
+}
+
+def Xform "Light"
+{
+    matrix4d xformOp:transform = ( (-0.29086464643478394, 0.9551711678504944, -0.05518905818462372, 0), (-0.7711008191108704, -0.1998833566904068, 0.6045247316360474, 0), (0.5663931965827942, 0.21839119493961334, 0.7946722507476807, 0), (4.076245307922363, 1.0054539442062378, 5.903861999511719, 1) )
+    uniform token[] xformOpOrder = ["xformOp:transform"]
+
+    def SphereLight "Light"
+    {
+        color3f inputs:color = (1, 1, 1)
+        float inputs:intensity = 10
+        float inputs:radius = 0.1
+        float inputs:specular = 1
+    }
+}
+
diff --git a/test/models-nonbsd/USD/usdc/README.md b/test/models-nonbsd/USD/usdc/README.md
new file mode 100644
index 000000000..082ea9e11
--- /dev/null
+++ b/test/models-nonbsd/USD/usdc/README.md
@@ -0,0 +1,4 @@
+[blendshape.usdc](blendshape.usdc) copied from tinyusdz/models (No attribution/license cited in that project)
+[suzanne.usdc](suzanne.usdc) copied from tinyusdz/models (No attribution/license cited in that project)
+[texturedcube.usdc](texturedcube.usdc) copied from tinyusdz/models (No attribution/license cited in that project)
+[translated-cube.usdc](translated-cube.usdc) copied from tinyusdz/models (No attribution/license cited in that project)
\ No newline at end of file
diff --git a/test/models-nonbsd/USD/usdc/blendshape.usdc b/test/models-nonbsd/USD/usdc/blendshape.usdc
new file mode 100644
index 000000000..43ded1077
Binary files /dev/null and b/test/models-nonbsd/USD/usdc/blendshape.usdc differ
diff --git a/test/models-nonbsd/USD/usdc/suzanne.usdc b/test/models-nonbsd/USD/usdc/suzanne.usdc
new file mode 100644
index 000000000..b3ec9ad21
Binary files /dev/null and b/test/models-nonbsd/USD/usdc/suzanne.usdc differ
diff --git a/test/models-nonbsd/USD/usdc/texturedcube.usdc b/test/models-nonbsd/USD/usdc/texturedcube.usdc
new file mode 100644
index 000000000..899b005e3
Binary files /dev/null and b/test/models-nonbsd/USD/usdc/texturedcube.usdc differ
diff --git a/test/models-nonbsd/USD/usdc/textures/01.jpg b/test/models-nonbsd/USD/usdc/textures/01.jpg
new file mode 100644
index 000000000..b24c7c708
Binary files /dev/null and b/test/models-nonbsd/USD/usdc/textures/01.jpg differ
diff --git a/test/models-nonbsd/USD/usdc/textures/checkerboard.png b/test/models-nonbsd/USD/usdc/textures/checkerboard.png
new file mode 100644
index 000000000..fde967aca
Binary files /dev/null and b/test/models-nonbsd/USD/usdc/textures/checkerboard.png differ
diff --git a/test/models-nonbsd/USD/usdc/textures/texture-cat.jpg b/test/models-nonbsd/USD/usdc/textures/texture-cat.jpg
new file mode 100644
index 000000000..22870c622
Binary files /dev/null and b/test/models-nonbsd/USD/usdc/textures/texture-cat.jpg differ
diff --git a/test/models-nonbsd/USD/usdc/translated-cube.usdc b/test/models-nonbsd/USD/usdc/translated-cube.usdc
new file mode 100644
index 000000000..ea198b5ff
Binary files /dev/null and b/test/models-nonbsd/USD/usdc/translated-cube.usdc differ
diff --git a/test/models-nonbsd/X3D/ref/README.md b/test/models-nonbsd/X3D/ref/README.md
new file mode 100644
index 000000000..0c31bb809
--- /dev/null
+++ b/test/models-nonbsd/X3D/ref/README.md
@@ -0,0 +1,14 @@
+# X3D 3D model reference images
+
+## ChevyTahoe.x3d
+
+### Working (using IRR xml parser)
+ChevyTahoe as of 29 Sep 2020 git commit `6a4c338`, using IRR xml parsing, renders OK:
+
+<img alt="ChevyTahoe.x3d (irr_xml)" src="screenshots%2FChevyTahoe_x3d_irr_xml.png" width=320 />
+
+### Broken (using pugi xml parser)
+ChevyTahoe as of 1 Dec 2021 git commit `1614934`, using pugi xml parsing, renders with 
+missing meshes and obvious artifacts:
+
+<img alt="ChevyTahoe.x3d (pugi_xml)" src="screenshots%2FChevyTahoe_x3d_pugi_xml.png" width=320 />
diff --git a/test/models-nonbsd/X3D/ref/screenshots/ChevyTahoe_x3d_irr_xml.png b/test/models-nonbsd/X3D/ref/screenshots/ChevyTahoe_x3d_irr_xml.png
new file mode 100644
index 000000000..f1319a663
Binary files /dev/null and b/test/models-nonbsd/X3D/ref/screenshots/ChevyTahoe_x3d_irr_xml.png differ
diff --git a/test/models-nonbsd/X3D/ref/screenshots/ChevyTahoe_x3d_pugi_xml.png b/test/models-nonbsd/X3D/ref/screenshots/ChevyTahoe_x3d_pugi_xml.png
new file mode 100644
index 000000000..e5c7b95ea
Binary files /dev/null and b/test/models-nonbsd/X3D/ref/screenshots/ChevyTahoe_x3d_pugi_xml.png differ
diff --git a/test/models/AC/SphereWithLight.acc b/test/models/AC/SphereWithLight.acc
new file mode 100644
index 000000000..42096672a
--- /dev/null
+++ b/test/models/AC/SphereWithLight.acc
@@ -0,0 +1,535 @@
+AC3Db
+MATERIAL "ac3dmat1" rgb 1.00 1.00 1.00  amb 0.20 0.20 0.20  emis 0.00 0.00 0.00  spec 0.20 0.20 0.20  shi 128  trans 0
+OBJECT world
+kids 2
+OBJECT light
+name "light"
+loc 0.000424567 -0.0127304 0
+kids 0
+OBJECT poly
+name "sphere"
+texture "earthSpherical.jpg" base
+texture empty_texture_no_mapping tiled
+texture empty_texture_no_mapping skids
+texture empty_texture_no_mapping shad
+numvert 167
+-0.051576 -0.062833 0.063067 0.224114 -0.961969 0.156168
+-0.064432 -0.064684 0.055841 0.000000 -1.000000 -0.000000
+-0.049587 -0.062833 0.055841 0.270337 -0.962554 0.020215
+-0.057009 -0.062833 0.068357 0.117917 -0.961035 0.250013
+-0.064432 -0.064684 0.055841 0.000000 -1.000000 -0.000000
+-0.064432 -0.062833 0.070294 -0.019618 -0.960685 0.276946
+-0.064432 -0.064684 0.055841 0.000000 -1.000000 -0.000000
+-0.071854 -0.062833 0.068357 -0.151973 -0.961267 0.229935
+-0.064432 -0.064684 0.055841 0.000000 -1.000000 -0.000000
+-0.077288 -0.062833 0.063067 -0.243865 -0.962202 0.121235
+-0.064432 -0.064684 0.055841 0.000000 -1.000000 -0.000000
+-0.079277 -0.062833 0.055841 -0.270337 -0.962554 -0.020215
+-0.064432 -0.064684 0.055841 0.000000 -1.000000 -0.000000
+-0.077288 -0.062833 0.048614 -0.224114 -0.961969 -0.156168
+-0.064432 -0.064684 0.055841 0.000000 -1.000000 -0.000000
+-0.071854 -0.062833 0.043324 -0.117917 -0.961035 -0.250013
+-0.064432 -0.064684 0.055841 0.000000 -1.000000 -0.000000
+-0.064432 -0.062833 0.041388 0.019618 -0.960685 -0.276946
+-0.064432 -0.064684 0.055841 0.000000 -1.000000 -0.000000
+-0.057009 -0.062833 0.043324 0.151973 -0.961267 -0.229935
+-0.064432 -0.064684 0.055841 0.000000 -1.000000 -0.000000
+-0.049587 0.042114 0.055841 0.270334 0.962554 -0.020215
+-0.064432 0.043965 0.055841 0.000000 1.000000 -0.000000
+-0.051576 0.042114 0.063067 0.243863 0.962202 0.121233
+-0.064432 0.043965 0.055841 0.000000 1.000000 -0.000000
+-0.057009 0.042114 0.068357 0.151972 0.961268 0.229933
+-0.064432 0.043965 0.055841 0.000000 1.000000 -0.000000
+-0.064432 0.042114 0.070294 0.019618 0.960686 0.276944
+-0.064432 0.043965 0.055841 0.000000 1.000000 -0.000000
+-0.071854 0.042114 0.068357 -0.117915 0.961036 0.250011
+-0.064432 0.043965 0.055841 0.000000 1.000000 -0.000000
+-0.077288 0.042114 0.063067 -0.224112 0.961970 0.156167
+-0.064432 0.043965 0.055841 0.000000 1.000000 -0.000000
+-0.079277 0.042114 0.055841 -0.270334 0.962554 0.020215
+-0.064432 0.043965 0.055841 0.000000 1.000000 -0.000000
+-0.077288 0.042114 0.048614 -0.243863 0.962202 -0.121233
+-0.064432 0.043965 0.055841 0.000000 1.000000 -0.000000
+-0.071854 0.042114 0.043324 -0.151972 0.961268 -0.229933
+-0.064432 0.043965 0.055841 0.000000 1.000000 -0.000000
+-0.064432 0.042114 0.041388 -0.019618 0.960686 -0.276944
+-0.064432 0.043965 0.055841 0.000000 1.000000 -0.000000
+-0.057009 0.042114 0.043324 0.117916 0.961036 -0.250011
+-0.035753 -0.057406 0.055841 0.479979 -0.877222 0.010123
+-0.049587 -0.062833 0.055841 0.270337 -0.962554 0.020215
+-0.051576 -0.062833 0.048614 0.243865 -0.962202 -0.121234
+-0.039596 -0.057406 0.041881 0.420061 -0.875943 -0.237219
+-0.023874 -0.048773 0.055841 0.687850 -0.725803 0.008451
+-0.029308 -0.048773 0.036098 0.598218 -0.723534 -0.344433
+-0.014759 -0.037522 0.055841 0.853991 -0.520251 0.006112
+-0.021414 -0.037522 0.031661 0.739473 -0.517639 -0.430382
+-0.009029 -0.024420 0.055841 0.962274 -0.272063 0.003217
+-0.016452 -0.024420 0.028872 0.830450 -0.270187 -0.487187
+-0.007075 -0.010360 0.055841 1.000000 -0.000000 0.000000
+-0.014759 -0.010360 0.027920 0.860926 0.000265 -0.508731
+-0.009029 0.003701 0.055841 0.962274 0.272063 -0.003217
+-0.016452 0.003701 0.028872 0.827147 0.270625 -0.492534
+-0.014759 0.016803 0.055841 0.853991 0.520251 -0.006112
+-0.021414 0.016803 0.031661 0.733264 0.517855 -0.440625
+-0.023874 0.028054 0.055841 0.687850 0.725803 -0.008451
+-0.029308 0.028054 0.036098 0.589753 0.723523 -0.358756
+-0.035753 0.036687 0.055841 0.479979 0.877222 -0.010123
+-0.039596 0.036687 0.041881 0.410061 0.875812 -0.254565
+-0.049587 0.042114 0.055841 0.270334 0.962554 -0.020215
+-0.051576 0.042114 0.048614 0.224112 0.961970 -0.156167
+-0.064432 0.043965 0.055841 0.000000 1.000000 -0.000000
+-0.064432 -0.064684 0.055841 0.000000 -1.000000 -0.000000
+-0.039596 -0.057406 0.069801 0.410061 -0.875812 0.254565
+-0.035753 -0.057406 0.055841 0.479979 -0.877222 0.010123
+-0.050092 -0.057406 0.080021 0.230454 -0.873143 0.429549
+-0.064432 -0.057406 0.083761 -0.009683 -0.871880 0.489625
+-0.078771 -0.057406 0.080021 -0.247407 -0.873270 0.419748
+-0.089268 -0.057406 0.069801 -0.420061 -0.875942 0.237220
+-0.093110 -0.057406 0.055841 -0.479980 -0.877221 -0.010124
+-0.089268 -0.057406 0.041881 -0.410062 -0.875812 -0.254565
+-0.078771 -0.057406 0.031661 -0.230453 -0.873143 -0.429549
+-0.064432 -0.057406 0.027920 0.009684 -0.871880 -0.489625
+-0.050092 -0.057406 0.031661 0.247407 -0.873271 -0.419748
+-0.029308 -0.048773 0.075583 0.589753 -0.723523 0.358757
+-0.023874 -0.048773 0.055841 0.687850 -0.725803 0.008451
+-0.044153 -0.048773 0.090036 0.333957 -0.719029 0.609483
+-0.064432 -0.048773 0.095326 -0.007940 -0.716811 0.697222
+-0.084710 -0.048773 0.090036 -0.348006 -0.719035 0.601564
+-0.099555 -0.048773 0.075583 -0.598218 -0.723534 0.344434
+-0.104989 -0.048773 0.055841 -0.687850 -0.725804 -0.008451
+-0.099555 -0.048773 0.036098 -0.589753 -0.723523 -0.358757
+-0.084710 -0.048773 0.021645 -0.333958 -0.719029 -0.609483
+-0.064432 -0.048773 0.016355 0.007940 -0.716811 -0.697222
+-0.044153 -0.048773 0.021645 0.348006 -0.719035 -0.601565
+-0.021414 -0.037522 0.080021 0.733263 -0.517855 0.440625
+-0.014759 -0.037522 0.055841 0.853991 -0.520251 0.006112
+-0.039596 -0.037522 0.097721 0.416448 -0.512938 0.750643
+-0.064432 -0.037522 0.104200 -0.005639 -0.510417 0.859908
+-0.089268 -0.037522 0.097721 -0.426533 -0.512723 0.745107
+-0.107449 -0.037522 0.080021 -0.739473 -0.517640 0.430382
+-0.114104 -0.037522 0.055841 -0.853991 -0.520252 -0.006112
+-0.107449 -0.037522 0.031661 -0.733262 -0.517857 -0.440626
+-0.089268 -0.037522 0.013960 -0.416448 -0.512938 -0.750643
+-0.064432 -0.037522 0.007481 0.005639 -0.510417 -0.859908
+-0.039595 -0.037522 0.013960 0.426534 -0.512723 -0.745107
+-0.016452 -0.024420 0.082810 0.827147 -0.270625 0.492534
+-0.009029 -0.024420 0.055841 0.962274 -0.272063 0.003217
+-0.036730 -0.024420 0.102553 0.470709 -0.267377 0.840799
+-0.064432 -0.024420 0.109779 -0.002929 -0.265584 0.964083
+-0.092133 -0.024420 0.102553 -0.475987 -0.266955 0.837957
+-0.112412 -0.024420 0.082810 -0.830450 -0.270188 0.487187
+-0.119834 -0.024420 0.055841 -0.962274 -0.272062 -0.003217
+-0.112412 -0.024420 0.028872 -0.827148 -0.270623 -0.492534
+-0.092133 -0.024420 0.009129 -0.470709 -0.267377 -0.840799
+-0.064432 -0.024420 0.001903 0.002929 -0.265584 -0.964083
+-0.036730 -0.024420 0.009129 0.475987 -0.266954 -0.837957
+-0.014759 -0.010360 0.083761 0.860926 -0.000266 0.508731
+-0.007075 -0.010360 0.055841 1.000000 -0.000000 0.000000
+-0.035753 -0.010360 0.104200 0.491288 -0.000257 0.870997
+-0.064432 -0.010360 0.111682 0.000000 -0.000000 1.000000
+-0.093110 -0.010360 0.104200 -0.491288 0.000257 0.870997
+-0.114104 -0.010360 0.083761 -0.860926 0.000265 0.508731
+-0.121788 -0.010360 0.055841 -1.000000 -0.000001 -0.000001
+-0.114104 -0.010360 0.027920 -0.860925 -0.000266 -0.508731
+-0.093110 -0.010360 0.007481 -0.491288 -0.000256 -0.870997
+-0.064432 -0.010360 0.000000 0.000000 -0.000000 -1.000000
+-0.035753 -0.010360 0.007481 0.491288 0.000257 -0.870997
+-0.016452 0.003701 0.082810 0.830450 0.270188 0.487187
+-0.009029 0.003701 0.055841 0.962274 0.272063 -0.003217
+-0.036730 0.003701 0.102553 0.475987 0.266955 0.837957
+-0.064432 0.003701 0.109779 0.002929 0.265584 0.964083
+-0.092133 0.003701 0.102553 -0.470709 0.267377 0.840799
+-0.112412 0.003701 0.082810 -0.827147 0.270625 0.492534
+-0.119834 0.003701 0.055841 -0.962274 0.272063 0.003217
+-0.112412 0.003701 0.028872 -0.830450 0.270186 -0.487188
+-0.092133 0.003701 0.009129 -0.475987 0.266954 -0.837957
+-0.064432 0.003701 0.001903 -0.002929 0.265583 -0.964083
+-0.036730 0.003701 0.009129 0.470710 0.267376 -0.840799
+-0.021414 0.016803 0.080021 0.739473 0.517639 0.430383
+-0.014759 0.016803 0.055841 0.853991 0.520251 -0.006112
+-0.039596 0.016803 0.097721 0.426533 0.512723 0.745107
+-0.064432 0.016803 0.104200 0.005639 0.510417 0.859908
+-0.089268 0.016803 0.097721 -0.416448 0.512938 0.750643
+-0.107449 0.016803 0.080021 -0.733262 0.517857 0.440626
+-0.114104 0.016803 0.055841 -0.853991 0.520252 0.006112
+-0.107449 0.016803 0.031661 -0.739473 0.517640 -0.430382
+-0.089268 0.016803 0.013960 -0.426533 0.512723 -0.745107
+-0.064432 0.016803 0.007481 -0.005640 0.510418 -0.859908
+-0.039595 0.016803 0.013960 0.416449 0.512938 -0.750643
+-0.029308 0.028054 0.075583 0.598218 0.723534 0.344433
+-0.023874 0.028054 0.055841 0.687850 0.725803 -0.008451
+-0.044153 0.028054 0.090036 0.348006 0.719035 0.601565
+-0.064432 0.028054 0.095326 0.007940 0.716811 0.697222
+-0.084710 0.028054 0.090036 -0.333958 0.719029 0.609483
+-0.099555 0.028054 0.075583 -0.589753 0.723523 0.358757
+-0.104989 0.028054 0.055841 -0.687850 0.725804 0.008451
+-0.099555 0.028054 0.036098 -0.598218 0.723534 -0.344434
+-0.084710 0.028054 0.021645 -0.348006 0.719035 -0.601564
+-0.064432 0.028054 0.016355 -0.007940 0.716811 -0.697222
+-0.044153 0.028054 0.021645 0.333956 0.719030 -0.609483
+-0.039596 0.036687 0.069801 0.420061 0.875943 0.237219
+-0.035753 0.036687 0.055841 0.479979 0.877222 -0.010123
+-0.050092 0.036687 0.080021 0.247407 0.873271 0.419748
+-0.064432 0.036687 0.083761 0.009684 0.871880 0.489625
+-0.078771 0.036687 0.080021 -0.230453 0.873143 0.429549
+-0.089268 0.036687 0.069801 -0.410062 0.875812 0.254565
+-0.093110 0.036687 0.055841 -0.479980 0.877221 0.010124
+-0.089268 0.036687 0.041881 -0.420061 0.875942 -0.237220
+-0.078771 0.036687 0.031661 -0.247407 0.873270 -0.419748
+-0.064432 0.036687 0.027920 -0.009683 0.871880 -0.489625
+-0.050092 0.036687 0.031661 0.230454 0.873143 -0.429549
+-0.064432 0.043965 0.055841 0.000000 1.000000 -0.000000
+-0.064432 -0.064684 0.055841 0.000000 -1.000000 -0.000000
+numsurf 13
+SURF 0x14
+mat 0
+refs 25
+166 0.12500 0.00000 0.19898 0.00100 0.23912 -0.60440 0.00000 0.00000
+19 0.16667 0.08333 0.20078 0.00100 0.27261 -0.65958 0.06470 0.11207
+44 0.08333 0.08333 0.22774 0.00100 0.24337 -0.66338 0.11207 0.06470
+45 0.08333 0.16667 0.25662 0.00100 0.24258 -0.70570 0.21651 0.12500
+42 -0.00000 0.16667 0.29617 0.00100 0.18165 -0.65455 0.25000 0.00000
+45 0.08333 0.16667 0.25662 0.00100 0.24258 -0.70570 0.21651 0.12500
+46 -0.00000 0.25000 0.34675 0.00100 0.14154 -0.62617 0.35355 0.00000
+47 0.08333 0.25000 0.28254 0.00100 0.23215 -0.72379 0.30619 0.17678
+48 -0.00000 0.33333 0.39286 0.00100 0.09463 -0.54477 0.43301 0.00000
+49 0.08333 0.33333 0.30010 0.00100 0.20445 -0.70053 0.37500 0.21651
+50 -0.00000 0.41667 0.42672 0.00100 0.04684 -0.39635 0.48296 0.00000
+51 0.08333 0.41667 0.30053 0.00100 0.14994 -0.59217 0.41826 0.24148
+52 -0.00000 0.50000 0.43819 0.27990 0.01216 -0.18101 0.50000 0.00000
+53 0.08333 0.50000 0.27797 0.11146 0.07998 -0.31169 0.43301 0.25000
+54 -0.00000 0.58333 0.42036 0.71453 0.00746 0.06528 0.48296 0.00000
+55 0.08333 0.58333 0.25398 0.77247 0.06825 0.11068 0.41826 0.24148
+56 -0.00000 0.66667 0.37732 0.99900 0.03584 0.27934 0.43301 0.00000
+57 0.08333 0.66667 0.24356 0.99900 0.12085 0.40243 0.37500 0.21651
+58 -0.00000 0.75000 0.32156 0.99900 0.08264 0.41936 0.35355 0.00000
+59 0.08333 0.75000 0.23016 0.99900 0.16764 0.51660 0.30619 0.17678
+60 -0.00000 0.83333 0.26409 0.99900 0.13155 0.48413 0.25000 0.00000
+61 0.08333 0.83333 0.21022 0.99900 0.19350 0.53698 0.21651 0.12500
+62 -0.00000 0.91667 0.21082 0.99900 0.17434 0.49121 0.12941 0.00000
+63 0.08333 0.91667 0.18721 0.99900 0.20517 0.51082 0.11207 0.06470
+64 0.04167 1.00000 0.16417 0.99900 0.20895 0.45830 0.00000 0.00000
+SURF 0x14
+mat 0
+refs 4
+42 -0.00000 0.16667 0.29617 0.00100 0.18165 -0.65455 0.25000 0.00000
+43 -0.00000 0.08333 0.24596 0.00100 0.21392 -0.64381 0.12941 0.00000
+44 0.08333 0.08333 0.22774 0.00100 0.24337 -0.66338 0.11207 0.06470
+65 0.04167 0.00000 0.19898 0.00100 0.23912 -0.60440 0.00000 0.00000
+SURF 0x14
+mat 0
+refs 26
+41 0.16667 0.91667 0.15686 0.99900 0.23923 0.50697 0.06470 0.11207
+165 0.12500 1.00000 0.16417 0.99900 0.20895 0.45830 0.00000 0.00000
+41 0.16667 0.91667 0.15686 0.99900 0.23923 0.50697 0.06470 0.11207
+63 0.08333 0.91667 0.18721 0.99900 0.20517 0.51082 0.11207 0.06470
+164 0.16667 0.83333 0.14064 0.99900 0.27287 0.52638 0.12500 0.21651
+61 0.08333 0.83333 0.21022 0.99900 0.19350 0.53698 0.21651 0.12500
+153 0.16667 0.75000 0.11005 0.99900 0.30883 0.49554 0.17678 0.30619
+59 0.08333 0.75000 0.23016 0.99900 0.16764 0.51660 0.30619 0.17678
+142 0.16667 0.66667 0.06221 0.99900 0.34565 0.37156 0.21651 0.37500
+57 0.08333 0.66667 0.24356 0.99900 0.12085 0.40243 0.37500 0.21651
+131 0.16667 0.58333 0.01707 0.75383 0.37997 0.09731 0.24148 0.41826
+55 0.08333 0.58333 0.25398 0.77247 0.06825 0.11068 0.41826 0.24148
+120 0.16667 0.50000 0.02917 0.16155 0.40148 -0.27285 0.25000 0.43301
+53 0.08333 0.50000 0.27797 0.11146 0.07998 -0.31169 0.43301 0.25000
+109 0.16667 0.41667 0.09227 0.00100 0.39866 -0.54216 0.24148 0.41826
+51 0.08333 0.41667 0.30053 0.00100 0.14994 -0.59217 0.41826 0.24148
+98 0.16667 0.33333 0.14840 0.00100 0.37604 -0.66637 0.21651 0.37500
+49 0.08333 0.33333 0.30010 0.00100 0.20445 -0.70053 0.37500 0.21651
+87 0.16667 0.25000 0.18125 0.00100 0.34374 -0.70421 0.17678 0.30619
+47 0.08333 0.25000 0.28254 0.00100 0.23215 -0.72379 0.30619 0.17678
+76 0.16667 0.16667 0.19643 0.00100 0.30813 -0.69579 0.12500 0.21651
+45 0.08333 0.16667 0.25662 0.00100 0.24258 -0.70570 0.21651 0.12500
+76 0.16667 0.16667 0.19643 0.00100 0.30813 -0.69579 0.12500 0.21651
+19 0.16667 0.08333 0.20078 0.00100 0.27261 -0.65958 0.06470 0.11207
+17 0.25000 0.08333 0.17478 0.00100 0.29109 -0.63431 0.00000 0.12941
+20 0.20833 0.00000 0.19898 0.00100 0.23912 -0.60440 0.00000 0.00000
+SURF 0x14
+mat 0
+refs 26
+39 0.25000 0.91667 0.13138 0.99900 0.26321 0.48188 0.00000 0.12941
+40 0.20833 1.00000 0.16417 0.99900 0.20895 0.45830 0.00000 0.00000
+39 0.25000 0.91667 0.13138 0.99900 0.26321 0.48188 0.00000 0.12941
+41 0.16667 0.91667 0.15686 0.99900 0.23923 0.50697 0.06470 0.11207
+163 0.25000 0.83333 0.09337 0.99900 0.32380 0.46306 0.00000 0.25000
+164 0.16667 0.83333 0.14064 0.99900 0.27287 0.52638 0.12500 0.21651
+152 0.25000 0.75000 0.05350 0.99900 0.38666 0.38881 0.00000 0.35355
+153 0.16667 0.75000 0.11005 0.99900 0.30883 0.49554 0.17678 0.30619
+141 0.25000 0.66667 0.01921 0.99900 0.44417 0.25077 0.00000 0.43301
+142 0.16667 0.66667 0.06221 0.99900 0.34565 0.37156 0.21651 0.37500
+130 0.25000 0.58333 0.00104 0.70147 0.48527 0.05732 0.00000 0.48296
+131 0.16667 0.58333 0.01707 0.75383 0.37997 0.09731 0.24148 0.41826
+119 0.25000 0.50000 0.00634 0.30861 0.50000 -0.15875 0.00000 0.50000
+120 0.16667 0.50000 0.02917 0.16155 0.40148 -0.27285 0.25000 0.43301
+108 0.25000 0.41667 0.03263 0.00100 0.48620 -0.35427 0.00000 0.48296
+109 0.16667 0.41667 0.09227 0.00100 0.39866 -0.54216 0.24148 0.41826
+97 0.25000 0.33333 0.07009 0.00100 0.45008 -0.50072 0.00000 0.43301
+98 0.16667 0.33333 0.14840 0.00100 0.37604 -0.66637 0.21651 0.37500
+86 0.25000 0.25000 0.10926 0.00100 0.40081 -0.59156 0.00000 0.35355
+87 0.16667 0.25000 0.18125 0.00100 0.34374 -0.70421 0.17678 0.30619
+75 0.25000 0.16667 0.14481 0.00100 0.34608 -0.63293 0.00000 0.25000
+76 0.16667 0.16667 0.19643 0.00100 0.30813 -0.69579 0.12500 0.21651
+75 0.25000 0.16667 0.14481 0.00100 0.34608 -0.63293 0.00000 0.25000
+17 0.25000 0.08333 0.17478 0.00100 0.29109 -0.63431 0.00000 0.12941
+15 0.33333 0.08333 0.15726 0.00100 0.29335 -0.59942 -0.06470 0.11207
+18 0.29167 0.00000 0.19898 0.00100 0.23912 -0.60440 0.00000 0.00000
+SURF 0x14
+mat 0
+refs 26
+37 0.33333 0.91667 0.11731 0.99900 0.26926 0.44859 -0.06470 0.11207
+38 0.29167 1.00000 0.16417 0.99900 0.20895 0.45830 0.00000 0.00000
+37 0.33333 0.91667 0.11731 0.99900 0.26926 0.44859 -0.06470 0.11207
+39 0.25000 0.91667 0.13138 0.99900 0.26321 0.48188 0.00000 0.12941
+162 0.33333 0.83333 0.07414 0.99900 0.32883 0.39669 -0.12500 0.21651
+163 0.25000 0.83333 0.09337 0.99900 0.32380 0.46306 0.00000 0.25000
+151 0.33333 0.75000 0.03873 0.99900 0.38213 0.30552 -0.17678 0.30619
+152 0.25000 0.75000 0.05350 0.99900 0.38666 0.38881 0.00000 0.35355
+140 0.33333 0.66667 0.01433 0.96962 0.42405 0.18283 -0.21651 0.37500
+141 0.25000 0.66667 0.01921 0.99900 0.44417 0.25077 0.00000 0.43301
+129 0.33333 0.58333 0.00283 0.67965 0.45074 0.03994 -0.24148 0.41826
+130 0.25000 0.58333 0.00104 0.70147 0.48527 0.05732 0.00000 0.48296
+118 0.33333 0.50000 0.00464 0.37108 0.46020 -0.11023 -0.25000 0.43301
+119 0.25000 0.50000 0.00634 0.30861 0.50000 -0.15875 0.00000 0.50000
+107 0.33333 0.41667 0.01889 0.06946 0.45233 -0.25504 -0.24148 0.41826
+108 0.25000 0.41667 0.03263 0.00100 0.48620 -0.35427 0.00000 0.48296
+96 0.33333 0.33333 0.04378 0.00100 0.42865 -0.38353 -0.21651 0.37500
+97 0.25000 0.33333 0.07009 0.00100 0.45008 -0.50072 0.00000 0.43301
+85 0.33333 0.25000 0.07694 0.00100 0.39190 -0.48717 -0.17678 0.30619
+86 0.25000 0.25000 0.10926 0.00100 0.40081 -0.59156 0.00000 0.35355
+74 0.33333 0.16667 0.11569 0.00100 0.34553 -0.56015 -0.12500 0.21651
+75 0.25000 0.16667 0.14481 0.00100 0.34608 -0.63293 0.00000 0.25000
+74 0.33333 0.16667 0.11569 0.00100 0.34553 -0.56015 -0.12500 0.21651
+15 0.33333 0.08333 0.15726 0.00100 0.29335 -0.59942 -0.06470 0.11207
+13 0.41667 0.08333 0.15134 0.00100 0.28069 -0.56690 -0.11207 0.06470
+16 0.37500 0.00000 0.19898 0.00100 0.23912 -0.60440 0.00000 0.00000
+SURF 0x14
+mat 0
+refs 26
+35 0.41667 0.91667 0.11568 0.99900 0.25826 0.41884 -0.11207 0.06470
+36 0.37500 1.00000 0.16417 0.99900 0.20895 0.45830 0.00000 0.00000
+35 0.41667 0.91667 0.11568 0.99900 0.25826 0.41884 -0.11207 0.06470
+37 0.33333 0.91667 0.11731 0.99900 0.26926 0.44859 -0.06470 0.11207
+161 0.41667 0.83333 0.07575 0.99900 0.30096 0.34871 -0.21651 0.12500
+162 0.33333 0.83333 0.07414 0.99900 0.32883 0.39669 -0.12500 0.21651
+150 0.41667 0.75000 0.04562 0.99900 0.33524 0.25608 -0.30619 0.17678
+151 0.33333 0.75000 0.03873 0.99900 0.38213 0.30552 -0.17678 0.30619
+139 0.41667 0.66667 0.02569 0.92724 0.36024 0.14834 -0.37500 0.21651
+140 0.33333 0.66667 0.01433 0.96962 0.42405 0.18283 -0.21651 0.37500
+128 0.41667 0.58333 0.01596 0.67063 0.37568 0.03187 -0.41826 0.24148
+129 0.33333 0.58333 0.00283 0.67965 0.45074 0.03994 -0.24148 0.41826
+117 0.41667 0.50000 0.01621 0.39994 0.38162 -0.08785 -0.43301 0.25000
+118 0.33333 0.50000 0.00464 0.37108 0.46020 -0.11023 -0.25000 0.43301
+106 0.41667 0.41667 0.02609 0.13144 0.37828 -0.20590 -0.41826 0.24148
+107 0.33333 0.41667 0.01889 0.06946 0.45233 -0.25504 -0.24148 0.41826
+95 0.41667 0.33333 0.04522 0.00100 0.36600 -0.31762 -0.37500 0.21651
+96 0.33333 0.33333 0.04378 0.00100 0.42865 -0.38353 -0.21651 0.37500
+84 0.41667 0.25000 0.07305 0.00100 0.34519 -0.41833 -0.30619 0.17678
+85 0.33333 0.25000 0.07694 0.00100 0.39190 -0.48717 -0.17678 0.30619
+73 0.41667 0.16667 0.10881 0.00100 0.31647 -0.50313 -0.21651 0.12500
+74 0.33333 0.16667 0.11569 0.00100 0.34553 -0.56015 -0.12500 0.21651
+73 0.41667 0.16667 0.10881 0.00100 0.31647 -0.50313 -0.21651 0.12500
+13 0.41667 0.08333 0.15134 0.00100 0.28069 -0.56690 -0.11207 0.06470
+11 0.50000 0.08333 0.15695 0.00100 0.25836 -0.54379 -0.12941 0.00000
+14 0.45833 0.00000 0.19898 0.00100 0.23912 -0.60440 0.00000 0.00000
+SURF 0x14
+mat 0
+refs 26
+33 0.50000 0.91667 0.12506 0.99900 0.23590 0.39836 -0.12941 0.00000
+34 0.45833 1.00000 0.16417 0.99900 0.20895 0.45830 0.00000 0.00000
+33 0.50000 0.91667 0.12506 0.99900 0.23590 0.39836 -0.12941 0.00000
+35 0.41667 0.91667 0.11568 0.99900 0.25826 0.41884 -0.11207 0.06470
+160 0.50000 0.83333 0.09377 0.99900 0.25637 0.32013 -0.25000 0.00000
+161 0.41667 0.83333 0.07575 0.99900 0.30096 0.34871 -0.21651 0.12500
+149 0.50000 0.75000 0.07035 0.99900 0.27148 0.22961 -0.35355 0.00000
+150 0.41667 0.75000 0.04562 0.99900 0.33524 0.25608 -0.30619 0.17678
+138 0.50000 0.66667 0.05477 0.90616 0.28211 0.13113 -0.43301 0.00000
+139 0.41667 0.66667 0.02569 0.92724 0.36024 0.14834 -0.37500 0.21651
+127 0.50000 0.58333 0.04697 0.66642 0.28889 0.02798 -0.48296 0.00000
+128 0.41667 0.58333 0.01596 0.67063 0.37568 0.03187 -0.41826 0.24148
+116 0.50000 0.50000 0.04685 0.41393 0.29223 -0.07709 -0.50000 0.00000
+117 0.41667 0.50000 0.01621 0.39994 0.38162 -0.08785 -0.43301 0.25000
+105 0.50000 0.41667 0.05433 0.16212 0.29232 -0.18164 -0.48296 0.00000
+106 0.41667 0.41667 0.02609 0.13144 0.37828 -0.20590 -0.41826 0.24148
+94 0.50000 0.33333 0.06929 0.00100 0.28922 -0.28327 -0.43301 0.00000
+95 0.41667 0.33333 0.04522 0.00100 0.36600 -0.31762 -0.37500 0.21651
+83 0.50000 0.25000 0.09157 0.00100 0.28277 -0.37947 -0.35355 0.00000
+84 0.41667 0.25000 0.07305 0.00100 0.34519 -0.41833 -0.30619 0.17678
+72 0.50000 0.16667 0.12093 0.00100 0.27266 -0.46743 -0.25000 0.00000
+73 0.41667 0.16667 0.10881 0.00100 0.31647 -0.50313 -0.21651 0.12500
+72 0.50000 0.16667 0.12093 0.00100 0.27266 -0.46743 -0.25000 0.00000
+11 0.50000 0.08333 0.15695 0.00100 0.25836 -0.54379 -0.12941 0.00000
+9 0.58333 0.08333 0.17221 0.00100 0.23253 -0.53297 -0.11207 -0.06470
+12 0.54167 0.00000 0.19898 0.00100 0.23912 -0.60440 0.00000 0.00000
+SURF 0x14
+mat 0
+refs 26
+31 0.58333 0.91667 0.14311 0.99900 0.20878 0.38894 -0.11207 -0.06470
+32 0.54167 1.00000 0.16417 0.99900 0.20895 0.45830 0.00000 0.00000
+31 0.58333 0.91667 0.14311 0.99900 0.20878 0.38894 -0.11207 -0.06470
+33 0.50000 0.91667 0.12506 0.99900 0.23590 0.39836 -0.12941 0.00000
+159 0.58333 0.83333 0.12527 0.99900 0.20699 0.30801 -0.21651 -0.12500
+160 0.50000 0.83333 0.09377 0.99900 0.25637 0.32013 -0.25000 0.00000
+148 0.58333 0.75000 0.11143 0.99900 0.20500 0.21899 -0.30619 -0.17678
+149 0.50000 0.75000 0.07035 0.99900 0.27148 0.22961 -0.35355 0.00000
+137 0.58333 0.66667 0.10210 0.89651 0.20368 0.12444 -0.37500 -0.21651
+138 0.50000 0.66667 0.05477 0.90616 0.28211 0.13113 -0.43301 0.00000
+126 0.58333 0.58333 0.09758 0.66389 0.20355 0.02650 -0.41826 -0.24148
+127 0.50000 0.58333 0.04697 0.66642 0.28889 0.02798 -0.48296 0.00000
+115 0.58333 0.50000 0.09802 0.41933 0.20491 -0.07299 -0.43301 -0.25000
+116 0.50000 0.50000 0.04685 0.41393 0.29223 -0.07709 -0.50000 0.00000
+104 0.58333 0.41667 0.10346 0.17498 0.20788 -0.17229 -0.41826 -0.24148
+105 0.50000 0.41667 0.05433 0.16212 0.29232 -0.18164 -0.48296 0.00000
+93 0.58333 0.33333 0.11385 0.00100 0.21242 -0.26969 -0.37500 -0.21651
+94 0.50000 0.33333 0.06929 0.00100 0.28922 -0.28327 -0.43301 0.00000
+82 0.58333 0.25000 0.12901 0.00100 0.21834 -0.36350 -0.30619 -0.17678
+83 0.50000 0.25000 0.09157 0.00100 0.28277 -0.37947 -0.35355 0.00000
+71 0.58333 0.16667 0.14863 0.00100 0.22526 -0.45191 -0.21651 -0.12500
+72 0.50000 0.16667 0.12093 0.00100 0.27266 -0.46743 -0.25000 0.00000
+71 0.58333 0.16667 0.14863 0.00100 0.22526 -0.45191 -0.21651 -0.12500
+9 0.58333 0.08333 0.17221 0.00100 0.23253 -0.53297 -0.11207 -0.06470
+7 0.66667 0.08333 0.19399 0.00100 0.20888 -0.53519 -0.06470 -0.11207
+10 0.62500 0.00000 0.19898 0.00100 0.23912 -0.60440 0.00000 0.00000
+SURF 0x14
+mat 0
+refs 26
+29 0.66667 0.91667 0.16656 0.99900 0.18279 0.39086 -0.06470 -0.11207
+30 0.62500 1.00000 0.16417 0.99900 0.20895 0.45830 0.00000 0.00000
+29 0.66667 0.91667 0.16656 0.99900 0.18279 0.39086 -0.06470 -0.11207
+31 0.58333 0.91667 0.14311 0.99900 0.20878 0.38894 -0.11207 -0.06470
+158 0.66667 0.83333 0.16659 0.99900 0.16130 0.31057 -0.12500 -0.21651
+159 0.58333 0.83333 0.12527 0.99900 0.20699 0.30801 -0.21651 -0.12500
+147 0.66667 0.75000 0.16588 0.99900 0.14487 0.22131 -0.17678 -0.30619
+148 0.58333 0.75000 0.11143 0.99900 0.20500 0.21899 -0.30619 -0.17678
+136 0.66667 0.66667 0.16546 0.89633 0.13378 0.12594 -0.21651 -0.37500
+137 0.58333 0.66667 0.10210 0.89651 0.20368 0.12444 -0.37500 -0.21651
+125 0.66667 0.58333 0.16597 0.66293 0.12819 0.02683 -0.24148 -0.41826
+126 0.58333 0.58333 0.09758 0.66389 0.20355 0.02650 -0.41826 -0.24148
+114 0.66667 0.50000 0.16776 0.41811 0.12818 -0.07393 -0.25000 -0.43301
+115 0.58333 0.50000 0.09802 0.41933 0.20491 -0.07299 -0.43301 -0.25000
+103 0.66667 0.41667 0.17097 0.17362 0.13376 -0.17442 -0.24148 -0.41826
+104 0.58333 0.41667 0.10346 0.17498 0.20788 -0.17229 -0.41826 -0.24148
+92 0.66667 0.33333 0.17556 0.00100 0.14484 -0.27274 -0.21651 -0.37500
+93 0.58333 0.33333 0.11385 0.00100 0.21242 -0.26969 -0.37500 -0.21651
+81 0.66667 0.25000 0.18129 0.00100 0.16125 -0.36700 -0.17678 -0.30619
+82 0.58333 0.25000 0.12901 0.00100 0.21834 -0.36350 -0.30619 -0.17678
+70 0.66667 0.16667 0.18769 0.00100 0.18273 -0.45521 -0.12500 -0.21651
+71 0.58333 0.16667 0.14863 0.00100 0.22526 -0.45191 -0.21651 -0.12500
+70 0.66667 0.16667 0.18769 0.00100 0.18273 -0.45521 -0.12500 -0.21651
+7 0.66667 0.08333 0.19399 0.00100 0.20888 -0.53519 -0.06470 -0.11207
+5 0.75000 0.08333 0.21789 0.00100 0.19222 -0.55023 0.00000 -0.12941
+8 0.70833 0.00000 0.19898 0.00100 0.23912 -0.60440 0.00000 0.00000
+SURF 0x14
+mat 0
+refs 26
+27 0.75000 0.91667 0.19095 0.99900 0.16283 0.40401 0.00000 -0.12941
+28 0.70833 1.00000 0.16417 0.99900 0.20895 0.45830 0.00000 0.00000
+27 0.75000 0.91667 0.19095 0.99900 0.16283 0.40401 0.00000 -0.12941
+29 0.66667 0.91667 0.16656 0.99900 0.18279 0.39086 -0.06470 -0.11207
+157 0.75000 0.83333 0.21201 0.99900 0.12561 0.32796 0.00000 -0.25000
+158 0.66667 0.83333 0.16659 0.99900 0.16130 0.31057 -0.12500 -0.21651
+146 0.75000 0.75000 0.22797 0.99900 0.09754 0.23688 0.00000 -0.35355
+147 0.66667 0.75000 0.16588 0.99900 0.14487 0.22131 -0.17678 -0.30619
+135 0.75000 0.66667 0.23948 0.90806 0.07868 0.13588 0.00000 -0.43301
+136 0.66667 0.66667 0.16546 0.89633 0.13378 0.12594 -0.21651 -0.37500
+124 0.75000 0.58333 0.24702 0.66503 0.06897 0.02906 0.00000 -0.48296
+125 0.66667 0.58333 0.16597 0.66293 0.12819 0.02683 -0.24148 -0.41826
+113 0.75000 0.50000 0.25094 0.41006 0.06830 -0.08009 0.00000 -0.50000
+114 0.66667 0.50000 0.16776 0.41811 0.12818 -0.07393 -0.25000 -0.43301
+102 0.75000 0.41667 0.25144 0.15617 0.07651 -0.18841 0.00000 -0.48296
+103 0.66667 0.41667 0.17097 0.17362 0.13376 -0.17442 -0.24148 -0.41826
+91 0.75000 0.33333 0.24857 0.00100 0.09338 -0.29285 0.00000 -0.43301
+92 0.66667 0.33333 0.17556 0.00100 0.14484 -0.27274 -0.21651 -0.37500
+80 0.75000 0.25000 0.24221 0.00100 0.11860 -0.39028 0.00000 -0.35355
+81 0.66667 0.25000 0.18129 0.00100 0.16125 -0.36700 -0.17678 -0.30619
+69 0.75000 0.16667 0.23212 0.00100 0.15175 -0.47734 0.00000 -0.25000
+70 0.66667 0.16667 0.18769 0.00100 0.18273 -0.45521 -0.12500 -0.21651
+69 0.75000 0.16667 0.23212 0.00100 0.15175 -0.47734 0.00000 -0.25000
+5 0.75000 0.08333 0.21789 0.00100 0.19222 -0.55023 0.00000 -0.12941
+3 0.83333 0.08333 0.23838 0.00100 0.18630 -0.57670 0.06470 -0.11207
+6 0.79167 0.00000 0.19898 0.00100 0.23912 -0.60440 0.00000 0.00000
+SURF 0x14
+mat 0
+refs 26
+25 0.83333 0.91667 0.21053 0.99900 0.15290 0.42768 0.06470 -0.11207
+26 0.79167 1.00000 0.16417 0.99900 0.20895 0.45830 0.00000 0.00000
+25 0.83333 0.91667 0.21053 0.99900 0.15290 0.42768 0.06470 -0.11207
+27 0.75000 0.91667 0.19095 0.99900 0.16283 0.40401 0.00000 -0.12941
+156 0.83333 0.83333 0.25271 0.99900 0.10497 0.36222 0.12500 -0.21651
+157 0.75000 0.83333 0.21201 0.99900 0.12561 0.32796 0.00000 -0.25000
+145 0.83333 0.75000 0.28799 0.99900 0.06767 0.26941 0.17678 -0.30619
+146 0.75000 0.75000 0.22797 0.99900 0.09754 0.23688 0.00000 -0.35355
+134 0.83333 0.66667 0.31457 0.93678 0.04237 0.15738 0.21651 -0.37500
+135 0.75000 0.66667 0.23948 0.90806 0.07868 0.13588 0.00000 -0.43301
+123 0.83333 0.58333 0.33150 0.67193 0.02955 0.03395 0.24148 -0.41826
+124 0.75000 0.58333 0.24702 0.66503 0.06897 0.02906 0.00000 -0.48296
+112 0.83333 0.50000 0.33844 0.39249 0.02914 -0.09363 0.25000 -0.43301
+113 0.75000 0.50000 0.25094 0.41006 0.06830 -0.08009 0.00000 -0.50000
+101 0.83333 0.41667 0.33549 0.11627 0.04068 -0.21875 0.24148 -0.41826
+102 0.75000 0.41667 0.25144 0.15617 0.07651 -0.18841 0.00000 -0.48296
+90 0.83333 0.33333 0.32310 0.00100 0.06342 -0.33527 0.21651 -0.37500
+91 0.75000 0.33333 0.24857 0.00100 0.09338 -0.29285 0.00000 -0.43301
+79 0.83333 0.25000 0.30202 0.00100 0.09629 -0.43738 0.17678 -0.30619
+80 0.75000 0.25000 0.24221 0.00100 0.11860 -0.39028 0.00000 -0.35355
+68 0.83333 0.16667 0.27332 0.00100 0.13788 -0.51956 0.12500 -0.21651
+69 0.75000 0.16667 0.23212 0.00100 0.15175 -0.47734 0.00000 -0.25000
+68 0.83333 0.16667 0.27332 0.00100 0.13788 -0.51956 0.12500 -0.21651
+3 0.83333 0.08333 0.23838 0.00100 0.18630 -0.57670 0.06470 -0.11207
+0 0.91667 0.08333 0.24936 0.00100 0.19351 -0.61071 0.11207 -0.06470
+4 0.87500 0.00000 0.19898 0.00100 0.23912 -0.60440 0.00000 0.00000
+SURF 0x14
+mat 0
+refs 26
+23 0.91667 0.91667 0.21882 0.99900 0.15617 0.45920 0.11207 -0.06470
+24 0.87500 1.00000 0.16417 0.99900 0.20895 0.45830 0.00000 0.00000
+23 0.91667 0.91667 0.21882 0.99900 0.15617 0.45920 0.11207 -0.06470
+25 0.83333 0.91667 0.21053 0.99900 0.15290 0.42768 0.06470 -0.11207
+154 0.91667 0.83333 0.27563 0.99900 0.10447 0.41577 0.21651 -0.12500
+156 0.83333 0.83333 0.25271 0.99900 0.10497 0.36222 0.12500 -0.21651
+143 0.91667 0.75000 0.32918 0.99900 0.05945 0.32703 0.30619 -0.17678
+145 0.83333 0.75000 0.28799 0.99900 0.06767 0.26941 0.17678 -0.30619
+132 0.91667 0.66667 0.37332 0.99232 0.02664 0.19879 0.37500 -0.21651
+134 0.83333 0.66667 0.31457 0.93678 0.04237 0.15738 0.21651 -0.37500
+121 0.91667 0.58333 0.40266 0.68601 0.01006 0.04379 0.41826 -0.24148
+123 0.83333 0.58333 0.33150 0.67193 0.02955 0.03395 0.24148 -0.41826
+110 0.91667 0.50000 0.41387 0.35730 0.01120 -0.12091 0.43301 -0.25000
+112 0.83333 0.50000 0.33844 0.39249 0.02914 -0.09363 0.25000 -0.43301
+99 0.91667 0.41667 0.40641 0.03864 0.02889 -0.27785 0.41826 -0.24148
+101 0.83333 0.41667 0.33549 0.11627 0.04068 -0.21875 0.24148 -0.41826
+88 0.91667 0.33333 0.38226 0.00100 0.06003 -0.41261 0.37500 -0.21651
+90 0.83333 0.33333 0.32310 0.00100 0.06342 -0.33527 0.21651 -0.37500
+77 0.91667 0.25000 0.34511 0.00100 0.10054 -0.51553 0.30619 -0.17678
+79 0.83333 0.25000 0.30202 0.00100 0.09629 -0.43738 0.17678 -0.30619
+66 0.91667 0.16667 0.29935 0.00100 0.14628 -0.58181 0.21651 -0.12500
+68 0.83333 0.16667 0.27332 0.00100 0.13788 -0.51956 0.12500 -0.21651
+66 0.91667 0.16667 0.29935 0.00100 0.14628 -0.58181 0.21651 -0.12500
+0 0.91667 0.08333 0.24936 0.00100 0.19351 -0.61071 0.11207 -0.06470
+2 1.00000 0.08333 0.24596 0.00100 0.21392 -0.64381 0.12941 0.00000
+1 0.95833 0.00000 0.19898 0.00100 0.23912 -0.60440 0.00000 0.00000
+SURF 0x14
+mat 0
+refs 23
+66 0.91667 0.16667 0.29935 0.00100 0.14628 -0.58181 0.21651 -0.12500
+2 1.00000 0.08333 0.24596 0.00100 0.21392 -0.64381 0.12941 0.00000
+66 0.91667 0.16667 0.29935 0.00100 0.14628 -0.58181 0.21651 -0.12500
+67 1.00000 0.16667 0.29617 0.00100 0.18165 -0.65455 0.25000 0.00000
+77 0.91667 0.25000 0.34511 0.00100 0.10054 -0.51553 0.30619 -0.17678
+78 1.00000 0.25000 0.34675 0.00100 0.14154 -0.62617 0.35355 0.00000
+88 0.91667 0.33333 0.38226 0.00100 0.06003 -0.41261 0.37500 -0.21651
+89 1.00000 0.33333 0.39286 0.00100 0.09463 -0.54477 0.43301 0.00000
+99 0.91667 0.41667 0.40641 0.03864 0.02889 -0.27785 0.41826 -0.24148
+100 1.00000 0.41667 0.42672 0.00100 0.04684 -0.39635 0.48296 0.00000
+110 0.91667 0.50000 0.41387 0.35730 0.01120 -0.12091 0.43301 -0.25000
+111 1.00000 0.50000 0.43819 0.27990 0.01216 -0.18101 0.50000 0.00000
+121 0.91667 0.58333 0.40266 0.68601 0.01006 0.04379 0.41826 -0.24148
+122 1.00000 0.58333 0.42036 0.71453 0.00746 0.06528 0.48296 0.00000
+132 0.91667 0.66667 0.37332 0.99232 0.02664 0.19879 0.37500 -0.21651
+133 1.00000 0.66667 0.37732 0.99900 0.03584 0.27934 0.43301 0.00000
+143 0.91667 0.75000 0.32918 0.99900 0.05945 0.32703 0.30619 -0.17678
+144 1.00000 0.75000 0.32156 0.99900 0.08264 0.41936 0.35355 0.00000
+154 0.91667 0.83333 0.27563 0.99900 0.10447 0.41577 0.21651 -0.12500
+155 1.00000 0.83333 0.26409 0.99900 0.13155 0.48413 0.25000 0.00000
+23 0.91667 0.91667 0.21882 0.99900 0.15617 0.45920 0.11207 -0.06470
+21 1.00000 0.91667 0.21082 0.99900 0.17434 0.49121 0.12941 0.00000
+22 0.95833 1.00000 0.16417 0.99900 0.20895 0.45830 0.00000 0.00000
+kids 0
diff --git a/test/models/AC/ref/README.md b/test/models/AC/ref/README.md
new file mode 100644
index 000000000..0034c2600
--- /dev/null
+++ b/test/models/AC/ref/README.md
@@ -0,0 +1,6 @@
+# AC 3D model reference images
+
+## sample_subdiv.ac
+Note that there appear to be some small holes in the surface in a few places
+
+<img alt="sample_subdiv.ac (as solid)" src="screenshots/sample_subdiv_ac_solid.png" width=180 />
diff --git a/test/models/AC/ref/screenshots/sample_subdiv_ac_solid.png b/test/models/AC/ref/screenshots/sample_subdiv_ac_solid.png
new file mode 100644
index 000000000..61a14edac
Binary files /dev/null and b/test/models/AC/ref/screenshots/sample_subdiv_ac_solid.png differ
diff --git a/test/models/ASE/ref/README.md b/test/models/ASE/ref/README.md
new file mode 100644
index 000000000..2f6d7aa5f
--- /dev/null
+++ b/test/models/ASE/ref/README.md
@@ -0,0 +1,18 @@
+# ASE 3D model reference images
+
+## MotionCaptureROM.ase
+
+### Model is pure node animation of separate rigid meshes, no bones/mesh deformation
+Note: this model has no bones/skeleton; the body is formed of separate rigid meshes
+for each segment (e.g. upper arm, lower arm, upper leg, lower leg are all separate meshses) 
+and animation  is entirely driven by changing node transformations over the animation timeline, 
+rather than deforming vertices via bones and associated weights.
+
+### Artifacts
+Animation has known artifacts, as stated in [MotionCaptureROM.source.txt](../MotionCaptureROM.source.txt):
+```
+NOTE: The errors in the middle of the animation are caused by problems during recording,
+it's not an importer issue.
+```
+
+<img alt="MotionCaptureROM.ase" src="screenshots/MotionCaptureROM_ase.gif" width=320 />
diff --git a/test/models/ASE/ref/screenshots/MotionCaptureROM_ase.gif b/test/models/ASE/ref/screenshots/MotionCaptureROM_ase.gif
new file mode 100644
index 000000000..a4978b11b
Binary files /dev/null and b/test/models/ASE/ref/screenshots/MotionCaptureROM_ase.gif differ
diff --git a/test/models/BVH/ref/README.md b/test/models/BVH/ref/README.md
new file mode 100644
index 000000000..57d4496b9
--- /dev/null
+++ b/test/models/BVH/ref/README.md
@@ -0,0 +1,16 @@
+# BVH 3D model reference images
+
+## 01_01.bvh
+Three hops forward, turn around, three hops back, turn around, three hops forward
+
+<img alt="01_01.bvh" src="screenshots/01_01_bvh.gif" width=180 />
+
+## 01_03.bvh
+Climb step ladder, hang on bar, climb step ladder, hang on bar
+
+<img alt="01_03.bvh" src="screenshots/01_03_bvh.gif" width=320 />
+
+## Boxing_Toes.bvh
+Boxer warming up, throwing punches, getting hit, going to canvas
+
+<img alt="Boxing_Toes.bvh" src="screenshots/Boxing_Toes_bvh.gif" width=180 />
diff --git a/test/models/BVH/ref/screenshots/01_01_bvh.gif b/test/models/BVH/ref/screenshots/01_01_bvh.gif
new file mode 100644
index 000000000..604be85b1
Binary files /dev/null and b/test/models/BVH/ref/screenshots/01_01_bvh.gif differ
diff --git a/test/models/BVH/ref/screenshots/01_03_bvh.gif b/test/models/BVH/ref/screenshots/01_03_bvh.gif
new file mode 100644
index 000000000..88c0a4408
Binary files /dev/null and b/test/models/BVH/ref/screenshots/01_03_bvh.gif differ
diff --git a/test/models/BVH/ref/screenshots/Boxing_Toes_bvh.gif b/test/models/BVH/ref/screenshots/Boxing_Toes_bvh.gif
new file mode 100644
index 000000000..faba5edc5
Binary files /dev/null and b/test/models/BVH/ref/screenshots/Boxing_Toes_bvh.gif differ
diff --git a/test/models/COB/molecule_ascii.cob b/test/models/COB/molecule_ascii.cob
index 9185e741e..f4f4c783d 100644
--- a/test/models/COB/molecule_ascii.cob
+++ b/test/models/COB/molecule_ascii.cob
@@ -1170,7 +1170,7 @@ Object Mode Off 0
 Mat1 V0.08 Id 497131204 Parent 58548212 Size 00000083
 mat# 0
 shader: phong  facet: auto40
-rgb 1,1,1
+rgb 1.0,1.0,1.0
 alpha 1  ka 0  ks 0.1  exp 0  ior 1
 ShBx V0.04 Id 497131205 Parent 497131204 Size 00000605
 Shader class: color
@@ -1758,7 +1758,7 @@ Object Mode Off 0
 Mat1 V0.08 Id 497168220 Parent 57850740 Size 00000083
 mat# 0
 shader: phong  facet: auto40
-rgb 1,1,1
+rgb 1.0,1.0,1.0
 alpha 1  ka 0  ks 0.1  exp 0  ior 1
 ShBx V0.04 Id 497168221 Parent 497168220 Size 00000605
 Shader class: color
@@ -2346,7 +2346,7 @@ Object Mode Off 0
 Mat1 V0.08 Id 497153380 Parent 497235148 Size 00000083
 mat# 0
 shader: phong  facet: auto40
-rgb 1,1,1
+rgb 1.0,1.0,1.0
 alpha 1  ka 0  ks 0.1  exp 0  ior 1
 ShBx V0.04 Id 497153381 Parent 497153380 Size 00000605
 Shader class: color
diff --git a/test/models/COB/ref/README.md b/test/models/COB/ref/README.md
new file mode 100644
index 000000000..3fc4b137b
--- /dev/null
+++ b/test/models/COB/ref/README.md
@@ -0,0 +1,4 @@
+# COB 3D model reference images
+
+## molecule_ascii.cob
+<img alt="molecule_ascii.cob" src="screenshots/molecule_ascii_cob.png" width=180 />
diff --git a/test/models/COB/ref/screenshots/molecule_ascii_cob.png b/test/models/COB/ref/screenshots/molecule_ascii_cob.png
new file mode 100644
index 000000000..2852c5f28
Binary files /dev/null and b/test/models/COB/ref/screenshots/molecule_ascii_cob.png differ
diff --git a/test/models/CSM/ref/README.md b/test/models/CSM/ref/README.md
new file mode 100644
index 000000000..5b757f49f
--- /dev/null
+++ b/test/models/CSM/ref/README.md
@@ -0,0 +1,4 @@
+# CSM 3D model reference images
+
+## ThomasFechten.csm
+<img alt="ThomasFechten.csm" src="screenshots/ThomasFechten_csm.gif" width=180 />
diff --git a/test/models/CSM/ref/screenshots/ThomasFechten_csm.gif b/test/models/CSM/ref/screenshots/ThomasFechten_csm.gif
new file mode 100644
index 000000000..365aea2f8
Binary files /dev/null and b/test/models/CSM/ref/screenshots/ThomasFechten_csm.gif differ
diff --git a/test/models/Collada/ref/README.md b/test/models/Collada/ref/README.md
new file mode 100644
index 000000000..92f74960a
--- /dev/null
+++ b/test/models/Collada/ref/README.md
@@ -0,0 +1,6 @@
+# Collada 3D model reference images
+
+## human.zae
+Compressed Collada file (.zae)
+
+<img alt="human.zae" src="screenshots/human_zae.png" width=180 />
diff --git a/test/models/Collada/ref/screenshots/human_zae.png b/test/models/Collada/ref/screenshots/human_zae.png
new file mode 100644
index 000000000..8d7945c3a
Binary files /dev/null and b/test/models/Collada/ref/screenshots/human_zae.png differ
diff --git a/test/models/HMP/ref/README.md b/test/models/HMP/ref/README.md
new file mode 100644
index 000000000..aa5ccf1d5
--- /dev/null
+++ b/test/models/HMP/ref/README.md
@@ -0,0 +1,4 @@
+# HMP 3D model reference images
+
+## terrain.hmp
+<img alt="terrain.hmp" src="screenshots/terrain_hmp.png" width=180 />
diff --git a/test/models/HMP/ref/screenshots/terrain_hmp.png b/test/models/HMP/ref/screenshots/terrain_hmp.png
new file mode 100644
index 000000000..d7c8dcb0c
Binary files /dev/null and b/test/models/HMP/ref/screenshots/terrain_hmp.png differ
diff --git a/test/models/IQM/ref/README.md b/test/models/IQM/ref/README.md
new file mode 100644
index 000000000..78986b04d
--- /dev/null
+++ b/test/models/IQM/ref/README.md
@@ -0,0 +1,4 @@
+# IQM 3D model reference images
+
+## mrfixit.iqm
+<img alt="mrfixit.iqm" src="screenshots/mrfixit_iqm.png" width=180 />
diff --git a/test/models/IQM/ref/screenshots/mrfixit_iqm.png b/test/models/IQM/ref/screenshots/mrfixit_iqm.png
new file mode 100644
index 000000000..cb57f1694
Binary files /dev/null and b/test/models/IQM/ref/screenshots/mrfixit_iqm.png differ
diff --git a/test/models/IRR/EpisodeII_TheDwarfesStrikeBack.irr b/test/models/IRR/EpisodeII_TheDwarfesStrikeBack.irr
index a317ac61e..761ea0ad4 100644
--- a/test/models/IRR/EpisodeII_TheDwarfesStrikeBack.irr
+++ b/test/models/IRR/EpisodeII_TheDwarfesStrikeBack.irr
@@ -32,7 +32,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="textures/editor_defaults/default_texture.png" />
+				<texture name="Texture1" value="assets/default_texture.png" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -89,7 +89,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="skybox/default_skybox2.jpg" />
+				<texture name="Texture1" value="assets/skybox/default_skybox2.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -128,7 +128,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="skybox/default_skybox1.jpg" />
+				<texture name="Texture1" value="assets/skybox/default_skybox1.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -167,7 +167,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="skybox/default_skybox0.jpg" />
+				<texture name="Texture1" value="assets/skybox/default_skybox0.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -206,7 +206,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="skybox/default_skybox3.jpg" />
+				<texture name="Texture1" value="assets/skybox/default_skybox3.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -245,7 +245,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="skybox/default_skyboxup.jpg" />
+				<texture name="Texture1" value="assets/skybox/default_skyboxup.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -284,7 +284,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="skybox/default_skyboxdn.jpg" />
+				<texture name="Texture1" value="assets/skybox/default_skyboxdn.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -329,7 +329,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="Looping" value="true" />
 			<bool name="ReadOnlyMaterials" value="false" />
 			<float name="FramesPerSecond" value="0.250000" />
@@ -345,7 +345,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -384,7 +384,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -468,7 +468,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="Looping" value="true" />
 			<bool name="ReadOnlyMaterials" value="false" />
 			<float name="FramesPerSecond" value="0.250000" />
@@ -484,7 +484,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -523,7 +523,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -620,7 +620,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="textures/editor_defaults/default_texture.png" />
+				<texture name="Texture1" value="assets/default_texture.png" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -678,7 +678,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="textures/editor_defaults/default_texture.png" />
+				<texture name="Texture1" value="assets/default_texture.png" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -723,7 +723,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="Looping" value="true" />
 			<bool name="ReadOnlyMaterials" value="false" />
 			<float name="FramesPerSecond" value="0.250000" />
@@ -739,7 +739,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -778,7 +778,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -875,7 +875,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="textures/editor_defaults/default_texture.png" />
+				<texture name="Texture1" value="assets/default_texture.png" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -920,7 +920,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="Looping" value="true" />
 			<bool name="ReadOnlyMaterials" value="false" />
 			<float name="FramesPerSecond" value="0.250000" />
@@ -936,7 +936,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -975,7 +975,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
diff --git a/test/models/IRR/EpisodeII_TheDwarfesStrikeBack_UTF16LE.irr b/test/models/IRR/EpisodeII_TheDwarfesStrikeBack_UTF16LE.irr
index 9321cf93f..d109c67cc 100644
Binary files a/test/models/IRR/EpisodeII_TheDwarfesStrikeBack_UTF16LE.irr and b/test/models/IRR/EpisodeII_TheDwarfesStrikeBack_UTF16LE.irr differ
diff --git a/test/models/IRR/EpisodeI_ANewDwarf.irr b/test/models/IRR/EpisodeI_ANewDwarf.irr
index 65f65ad4b..c84073553 100644
--- a/test/models/IRR/EpisodeI_ANewDwarf.irr
+++ b/test/models/IRR/EpisodeI_ANewDwarf.irr
@@ -33,8 +33,8 @@
 				<float name="Shininess" value="0.750000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="brownground_1-1.jpg" />
-				<texture name="Texture2" value="1.png" />
+				<texture name="Texture1" value="assets/brownground_1-1.jpg" />
+				<texture name="Texture2" value="assets/1.png" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
 				<bool name="Wireframe" value="false" />
@@ -72,8 +72,8 @@
 				<float name="Shininess" value="0.750000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="crackedground_1-6.jpg" />
-				<texture name="Texture2" value="1.png" />
+				<texture name="Texture1" value="assets/crackedground_1-6.jpg" />
+				<texture name="Texture2" value="assets/1.png" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
 				<bool name="Wireframe" value="false" />
@@ -117,7 +117,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="ReadOnlyMaterials" value="false" />
 		</attributes>
 
@@ -131,7 +131,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -170,7 +170,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -254,7 +254,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="ReadOnlyMaterials" value="false" />
 		</attributes>
 
@@ -268,7 +268,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -307,7 +307,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -391,7 +391,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="ReadOnlyMaterials" value="false" />
 		</attributes>
 
@@ -405,7 +405,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -444,7 +444,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -528,7 +528,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="ReadOnlyMaterials" value="false" />
 		</attributes>
 
@@ -542,7 +542,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -581,7 +581,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -665,7 +665,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="ReadOnlyMaterials" value="false" />
 		</attributes>
 
@@ -679,7 +679,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -718,7 +718,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
diff --git a/test/models/IRR/EpisodeI_ANewDwarf_UTF16LE.irr b/test/models/IRR/EpisodeI_ANewDwarf_UTF16LE.irr
index 5e5a68f2d..551a5ac9a 100644
Binary files a/test/models/IRR/EpisodeI_ANewDwarf_UTF16LE.irr and b/test/models/IRR/EpisodeI_ANewDwarf_UTF16LE.irr differ
diff --git a/test/models/IRR/animMesh.irr b/test/models/IRR/animMesh.irr
index 0e246bacf..5cd109d77 100644
--- a/test/models/IRR/animMesh.irr
+++ b/test/models/IRR/animMesh.irr
@@ -19,7 +19,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="Looping" value="true" />
 			<bool name="ReadOnlyMaterials" value="false" />
 			<float name="FramesPerSecond" value="0.025000" />
@@ -35,7 +35,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -73,7 +73,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
diff --git a/test/models/IRR/animMesh_UTF16LE.irr b/test/models/IRR/animMesh_UTF16LE.irr
index c041565ea..70f6374fa 100644
Binary files a/test/models/IRR/animMesh_UTF16LE.irr and b/test/models/IRR/animMesh_UTF16LE.irr differ
diff --git a/test/models/IRR/1.png b/test/models/IRR/assets/1.png
similarity index 100%
rename from test/models/IRR/1.png
rename to test/models/IRR/assets/1.png
diff --git a/test/models/IRR/SpiderTex.jpg b/test/models/IRR/assets/SpiderTex.jpg
similarity index 100%
rename from test/models/IRR/SpiderTex.jpg
rename to test/models/IRR/assets/SpiderTex.jpg
diff --git a/test/models/IRR/UVTransformTestImg.png b/test/models/IRR/assets/UVTransformTestImg.png
similarity index 100%
rename from test/models/IRR/UVTransformTestImg.png
rename to test/models/IRR/assets/UVTransformTestImg.png
diff --git a/test/models/IRR/axe.jpg b/test/models/IRR/assets/axe.jpg
similarity index 100%
rename from test/models/IRR/axe.jpg
rename to test/models/IRR/assets/axe.jpg
diff --git a/test/models/IRR/brownground_1-1.jpg b/test/models/IRR/assets/brownground_1-1.jpg
similarity index 100%
rename from test/models/IRR/brownground_1-1.jpg
rename to test/models/IRR/assets/brownground_1-1.jpg
diff --git a/test/models/IRR/crackedground_1-6.jpg b/test/models/IRR/assets/crackedground_1-6.jpg
similarity index 100%
rename from test/models/IRR/crackedground_1-6.jpg
rename to test/models/IRR/assets/crackedground_1-6.jpg
diff --git a/test/models/IRR/assets/default.png b/test/models/IRR/assets/default.png
new file mode 100644
index 000000000..fe9926e41
Binary files /dev/null and b/test/models/IRR/assets/default.png differ
diff --git a/test/models/IRR/assets/default_texture.png b/test/models/IRR/assets/default_texture.png
new file mode 100644
index 000000000..a1ad5979b
Binary files /dev/null and b/test/models/IRR/assets/default_texture.png differ
diff --git a/test/models/IRR/drkwood2.jpg b/test/models/IRR/assets/drkwood2.jpg
similarity index 100%
rename from test/models/IRR/drkwood2.jpg
rename to test/models/IRR/assets/drkwood2.jpg
diff --git a/test/models/IRR/dwarf.jpg b/test/models/IRR/assets/dwarf.jpg
similarity index 100%
rename from test/models/IRR/dwarf.jpg
rename to test/models/IRR/assets/dwarf.jpg
diff --git a/test/models/IRR/dwarf.x b/test/models/IRR/assets/dwarf.x
similarity index 100%
rename from test/models/IRR/dwarf.x
rename to test/models/IRR/assets/dwarf.x
diff --git a/test/models/IRR/earthSpherical.jpg b/test/models/IRR/assets/earthSpherical.jpg
similarity index 100%
rename from test/models/IRR/earthSpherical.jpg
rename to test/models/IRR/assets/earthSpherical.jpg
diff --git a/test/models/IRR/engineflare1.jpg b/test/models/IRR/assets/engineflare1.jpg
similarity index 100%
rename from test/models/IRR/engineflare1.jpg
rename to test/models/IRR/assets/engineflare1.jpg
diff --git a/test/models/IRR/assets/skybox/credits.txt b/test/models/IRR/assets/skybox/credits.txt
new file mode 100644
index 000000000..b2b601392
--- /dev/null
+++ b/test/models/IRR/assets/skybox/credits.txt
@@ -0,0 +1,11 @@
+This skybox is basing on a skydome texture from
+
+http://mikepan.homeip.net/earth
+
+Downloaded November 22th, 08
+Distribution note:
+"These royalty-free skydome textures work best when applied to a sphere or hemisphere"
+
+
+
+Thanks for your great work!
diff --git a/test/models/IRR/assets/skybox/default_skybox0.jpg b/test/models/IRR/assets/skybox/default_skybox0.jpg
new file mode 100644
index 000000000..0fe4d0890
Binary files /dev/null and b/test/models/IRR/assets/skybox/default_skybox0.jpg differ
diff --git a/test/models/IRR/assets/skybox/default_skybox1.jpg b/test/models/IRR/assets/skybox/default_skybox1.jpg
new file mode 100644
index 000000000..c4c286bff
Binary files /dev/null and b/test/models/IRR/assets/skybox/default_skybox1.jpg differ
diff --git a/test/models/IRR/assets/skybox/default_skybox2.jpg b/test/models/IRR/assets/skybox/default_skybox2.jpg
new file mode 100644
index 000000000..935f72579
Binary files /dev/null and b/test/models/IRR/assets/skybox/default_skybox2.jpg differ
diff --git a/test/models/IRR/assets/skybox/default_skybox3.jpg b/test/models/IRR/assets/skybox/default_skybox3.jpg
new file mode 100644
index 000000000..e8107ff99
Binary files /dev/null and b/test/models/IRR/assets/skybox/default_skybox3.jpg differ
diff --git a/test/models/IRR/assets/skybox/default_skyboxdn.jpg b/test/models/IRR/assets/skybox/default_skyboxdn.jpg
new file mode 100644
index 000000000..af66a6176
Binary files /dev/null and b/test/models/IRR/assets/skybox/default_skyboxdn.jpg differ
diff --git a/test/models/IRR/assets/skybox/default_skyboxup.jpg b/test/models/IRR/assets/skybox/default_skyboxup.jpg
new file mode 100644
index 000000000..7959709fa
Binary files /dev/null and b/test/models/IRR/assets/skybox/default_skyboxup.jpg differ
diff --git a/test/models/IRR/spider.mtl b/test/models/IRR/assets/spider.mtl
similarity index 100%
rename from test/models/IRR/spider.mtl
rename to test/models/IRR/assets/spider.mtl
diff --git a/test/models/IRR/wal67ar_small.jpg b/test/models/IRR/assets/wal67ar_small.jpg
similarity index 100%
rename from test/models/IRR/wal67ar_small.jpg
rename to test/models/IRR/assets/wal67ar_small.jpg
diff --git a/test/models/IRR/wal69ar_small.jpg b/test/models/IRR/assets/wal69ar_small.jpg
similarity index 100%
rename from test/models/IRR/wal69ar_small.jpg
rename to test/models/IRR/assets/wal69ar_small.jpg
diff --git a/test/models/IRR/box.irr b/test/models/IRR/box.irr
index 8a094ded6..2af68ab44 100644
--- a/test/models/IRR/box.irr
+++ b/test/models/IRR/box.irr
@@ -32,7 +32,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="default.png" />
+				<texture name="Texture1" value="assets/default.png" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
diff --git a/test/models/IRR/box_UTF16LE.irr b/test/models/IRR/box_UTF16LE.irr
index efc165d93..655517195 100644
Binary files a/test/models/IRR/box_UTF16LE.irr and b/test/models/IRR/box_UTF16LE.irr differ
diff --git a/test/models/IRR/cellar.irrmesh b/test/models/IRR/cellar.irrmesh
index 0278c9239..ee787463a 100644
--- a/test/models/IRR/cellar.irrmesh
+++ b/test/models/IRR/cellar.irrmesh
@@ -13,8 +13,8 @@
 			<float name="Shininess" value="0.750000" />
 			<float name="Param1" value="0.000000" />
 			<float name="Param2" value="0.000000" />
-			<texture name="Texture1" value="brownground_1-1.jpg" />
-			<texture name="Texture2" value="1.png" />
+			<texture name="Texture1" value="assets/brownground_1-1.jpg" />
+			<texture name="Texture2" value="assets/1.png" />
 			<texture name="Texture3" value="" />
 			<texture name="Texture4" value="" />
 			<bool name="Wireframe" value="false" />
@@ -870,8 +870,8 @@
 			<float name="Shininess" value="0.750000" />
 			<float name="Param1" value="0.000000" />
 			<float name="Param2" value="0.000000" />
-			<texture name="Texture1" value="crackedground_1-6.jpg" />
-			<texture name="Texture2" value="1.png" />
+			<texture name="Texture1" value="assets/crackedground_1-6.jpg" />
+			<texture name="Texture2" value="assets/1.png" />
 			<texture name="Texture3" value="" />
 			<texture name="Texture4" value="" />
 			<bool name="Wireframe" value="false" />
diff --git a/test/models/IRR/dawfInCellar_ChildOfCellar.irr b/test/models/IRR/dawfInCellar_ChildOfCellar.irr
index b9fa20c6a..0b57fc158 100644
--- a/test/models/IRR/dawfInCellar_ChildOfCellar.irr
+++ b/test/models/IRR/dawfInCellar_ChildOfCellar.irr
@@ -33,8 +33,8 @@
 				<float name="Shininess" value="0.750000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="brownground_1-1.jpg" />
-				<texture name="Texture2" value="1.png" />
+				<texture name="Texture1" value="assets/brownground_1-1.jpg" />
+				<texture name="Texture2" value="assets/1.png" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
 				<bool name="Wireframe" value="false" />
@@ -71,8 +71,8 @@
 				<float name="Shininess" value="0.750000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="crackedground_1-6.jpg" />
-				<texture name="Texture2" value="1.png" />
+				<texture name="Texture1" value="assets/crackedground_1-6.jpg" />
+				<texture name="Texture2" value="assets/1.png" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
 				<bool name="Wireframe" value="false" />
@@ -113,7 +113,7 @@
 				<enum name="AutomaticCulling" value="box" />
 				<int name="DebugDataVisible" value="0" />
 				<bool name="IsDebugObject" value="false" />
-				<string name="Mesh" value="dwarf.x" />
+				<string name="Mesh" value="assets/dwarf.x" />
 				<bool name="ReadOnlyMaterials" value="false" />
 			</attributes>
 
@@ -127,7 +127,7 @@
 					<float name="Shininess" value="0.000000" />
 					<float name="Param1" value="0.000000" />
 					<float name="Param2" value="0.000000" />
-					<texture name="Texture1" value="axe.jpg" />
+					<texture name="Texture1" value="assets/axe.jpg" />
 					<texture name="Texture2" value="" />
 					<texture name="Texture3" value="" />
 					<texture name="Texture4" value="" />
@@ -165,7 +165,7 @@
 					<float name="Shininess" value="0.000000" />
 					<float name="Param1" value="0.000000" />
 					<float name="Param2" value="0.000000" />
-					<texture name="Texture1" value="dwarf.jpg" />
+					<texture name="Texture1" value="assets/dwarf.jpg" />
 					<texture name="Texture2" value="" />
 					<texture name="Texture3" value="" />
 					<texture name="Texture4" value="" />
diff --git a/test/models/IRR/dawfInCellar_ChildOfCellar_UTF16LE.irr b/test/models/IRR/dawfInCellar_ChildOfCellar_UTF16LE.irr
index aba42e94d..cd7ba9752 100644
Binary files a/test/models/IRR/dawfInCellar_ChildOfCellar_UTF16LE.irr and b/test/models/IRR/dawfInCellar_ChildOfCellar_UTF16LE.irr differ
diff --git a/test/models/IRR/dawfInCellar_SameHierarchy.irr b/test/models/IRR/dawfInCellar_SameHierarchy.irr
index 424b42df8..5f6d01fe5 100644
--- a/test/models/IRR/dawfInCellar_SameHierarchy.irr
+++ b/test/models/IRR/dawfInCellar_SameHierarchy.irr
@@ -33,8 +33,8 @@
 				<float name="Shininess" value="0.750000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="brownground_1-1.jpg" />
-				<texture name="Texture2" value="1.png" />
+				<texture name="Texture1" value="assets/brownground_1-1.jpg" />
+				<texture name="Texture2" value="assets/1.png" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
 				<bool name="Wireframe" value="false" />
@@ -71,8 +71,8 @@
 				<float name="Shininess" value="0.750000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="crackedground_1-6.jpg" />
-				<texture name="Texture2" value="1.png" />
+				<texture name="Texture1" value="assets/crackedground_1-6.jpg" />
+				<texture name="Texture2" value="assets/1.png" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
 				<bool name="Wireframe" value="false" />
@@ -115,7 +115,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="ReadOnlyMaterials" value="false" />
 		</attributes>
 
@@ -129,7 +129,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -167,7 +167,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
diff --git a/test/models/IRR/dawfInCellar_SameHierarchy_UTF16LE.irr b/test/models/IRR/dawfInCellar_SameHierarchy_UTF16LE.irr
index a4e7cc951..5cc3dda87 100644
Binary files a/test/models/IRR/dawfInCellar_SameHierarchy_UTF16LE.irr and b/test/models/IRR/dawfInCellar_SameHierarchy_UTF16LE.irr differ
diff --git a/test/models/IRR/instancing.irr b/test/models/IRR/instancing.irr
index ba0e710da..18b86f6e7 100644
--- a/test/models/IRR/instancing.irr
+++ b/test/models/IRR/instancing.irr
@@ -33,7 +33,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -71,7 +71,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -153,7 +153,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="ReadOnlyMaterials" value="false" />
 		</attributes>
 
@@ -167,7 +167,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -205,7 +205,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -287,7 +287,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="ReadOnlyMaterials" value="false" />
 		</attributes>
 
@@ -301,7 +301,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -339,7 +339,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -421,7 +421,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="ReadOnlyMaterials" value="false" />
 		</attributes>
 
@@ -435,7 +435,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -473,7 +473,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -555,7 +555,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="ReadOnlyMaterials" value="false" />
 		</attributes>
 
@@ -569,7 +569,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -607,7 +607,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -689,7 +689,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="ReadOnlyMaterials" value="false" />
 		</attributes>
 
@@ -703,7 +703,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -741,7 +741,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
diff --git a/test/models/IRR/ref/README.md b/test/models/IRR/ref/README.md
new file mode 100644
index 000000000..b4860303e
--- /dev/null
+++ b/test/models/IRR/ref/README.md
@@ -0,0 +1,14 @@
+# IRR 3D model reference images
+
+## scenegraphAnimMod_UTF16LE.irr
+
+### Animation "AnimationSet0"
+Dwarf animated; primitive objects not animated
+
+<img alt="scenegraphAnimMod_UTF16LE.irr" src="screenshots/scenegraphAnimMod_UTF16LE_irr.gif" width=320 />
+<img alt="scenegraphAnimMod_UTF16LE.irr" src="screenshots/scenegraphAnimMod_UTF16LE_irr_anim_AnimationSet0.gif" width=180 />
+
+### Animation "Irr_GlobalAnimChannel"
+Primitive objects animate; dwarf not animated (Animation playback sped up significantly)
+
+<img alt="scenegraphAnimMod_UTF16LE.irr" src="screenshots/scenegraphAnimMod_UTF16LE_irr_anim_Irr_GlobalAnimChannel.gif" width=180 />
diff --git a/test/models/IRR/ref/screenshots/scenegraphAnimMod_UTF16LE_irr.gif b/test/models/IRR/ref/screenshots/scenegraphAnimMod_UTF16LE_irr.gif
new file mode 100644
index 000000000..778d7f1bf
Binary files /dev/null and b/test/models/IRR/ref/screenshots/scenegraphAnimMod_UTF16LE_irr.gif differ
diff --git a/test/models/IRR/ref/screenshots/scenegraphAnimMod_UTF16LE_irr_anim_AnimationSet0.gif b/test/models/IRR/ref/screenshots/scenegraphAnimMod_UTF16LE_irr_anim_AnimationSet0.gif
new file mode 100644
index 000000000..4db9e7042
Binary files /dev/null and b/test/models/IRR/ref/screenshots/scenegraphAnimMod_UTF16LE_irr_anim_AnimationSet0.gif differ
diff --git a/test/models/IRR/ref/screenshots/scenegraphAnimMod_UTF16LE_irr_anim_Irr_GlobalAnimChannel.gif b/test/models/IRR/ref/screenshots/scenegraphAnimMod_UTF16LE_irr_anim_Irr_GlobalAnimChannel.gif
new file mode 100644
index 000000000..fea75b2ae
Binary files /dev/null and b/test/models/IRR/ref/screenshots/scenegraphAnimMod_UTF16LE_irr_anim_Irr_GlobalAnimChannel.gif differ
diff --git a/test/models/IRR/scenegraphAnim.irr b/test/models/IRR/scenegraphAnim.irr
index 2300ea18f..dedc1c2cf 100644
--- a/test/models/IRR/scenegraphAnim.irr
+++ b/test/models/IRR/scenegraphAnim.irr
@@ -126,7 +126,7 @@
 					<float name="Shininess" value="0.000000" />
 					<float name="Param1" value="0.000000" />
 					<float name="Param2" value="0.000000" />
-					<texture name="Texture1" value="UVTransformTestImg.png" />
+					<texture name="Texture1" value="assets/UVTransformTestImg.png" />
 					<texture name="Texture2" value="" />
 					<texture name="Texture3" value="" />
 					<texture name="Texture4" value="" />
@@ -197,7 +197,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="Looping" value="true" />
 			<bool name="ReadOnlyMaterials" value="false" />
 			<float name="FramesPerSecond" value="0.025000" />
@@ -213,7 +213,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -251,7 +251,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -347,8 +347,8 @@
 				<float name="Shininess" value="0.750000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="brownground_1-1.jpg" />
-				<texture name="Texture2" value="1.png" />
+				<texture name="Texture1" value="assets/brownground_1-1.jpg" />
+				<texture name="Texture2" value="assets/1.png" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
 				<bool name="Wireframe" value="false" />
@@ -385,8 +385,8 @@
 				<float name="Shininess" value="0.750000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="crackedground_1-6.jpg" />
-				<texture name="Texture2" value="1.png" />
+				<texture name="Texture1" value="assets/crackedground_1-6.jpg" />
+				<texture name="Texture2" value="assets/1.png" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
 				<bool name="Wireframe" value="false" />
@@ -442,7 +442,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="UVTransformTestImg.png" />
+				<texture name="Texture1" value="assets/UVTransformTestImg.png" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -512,7 +512,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="UVTransformTestImg.png" />
+				<texture name="Texture1" value="assets/UVTransformTestImg.png" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
diff --git a/test/models/IRR/scenegraphAnimMod.irr b/test/models/IRR/scenegraphAnimMod.irr
index 21408b245..9f82efcb0 100644
--- a/test/models/IRR/scenegraphAnimMod.irr
+++ b/test/models/IRR/scenegraphAnimMod.irr
@@ -126,7 +126,7 @@
 					<float name="Shininess" value="0.000000" />
 					<float name="Param1" value="0.000000" />
 					<float name="Param2" value="0.000000" />
-					<texture name="Texture1" value="UVTransformTestImg.png" />
+					<texture name="Texture1" value="assets/UVTransformTestImg.png" />
 					<texture name="Texture2" value="" />
 					<texture name="Texture3" value="" />
 					<texture name="Texture4" value="" />
@@ -197,7 +197,7 @@
 			<enum name="AutomaticCulling" value="box" />
 			<int name="DebugDataVisible" value="0" />
 			<bool name="IsDebugObject" value="false" />
-			<string name="Mesh" value="dwarf.x" />
+			<string name="Mesh" value="assets/dwarf.x" />
 			<bool name="Looping" value="true" />
 			<bool name="ReadOnlyMaterials" value="false" />
 			<float name="FramesPerSecond" value="0.025000" />
@@ -213,7 +213,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="axe.jpg" />
+				<texture name="Texture1" value="assets/axe.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -251,7 +251,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="dwarf.jpg" />
+				<texture name="Texture1" value="assets/dwarf.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -347,8 +347,8 @@
 				<float name="Shininess" value="0.750000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="brownground_1-1.jpg" />
-				<texture name="Texture2" value="1.png" />
+				<texture name="Texture1" value="assets/brownground_1-1.jpg" />
+				<texture name="Texture2" value="assets/1.png" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
 				<bool name="Wireframe" value="false" />
@@ -385,8 +385,8 @@
 				<float name="Shininess" value="0.750000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="crackedground_1-6.jpg" />
-				<texture name="Texture2" value="1.png" />
+				<texture name="Texture1" value="assets/crackedground_1-6.jpg" />
+				<texture name="Texture2" value="assets/1.png" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
 				<bool name="Wireframe" value="false" />
@@ -442,7 +442,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="UVTransformTestImg.png" />
+				<texture name="Texture1" value="assets/UVTransformTestImg.png" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
@@ -512,7 +512,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="UVTransformTestImg.png" />
+				<texture name="Texture1" value="assets/UVTransformTestImg.png" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
diff --git a/test/models/IRR/scenegraphAnimMod_UTF16LE.irr b/test/models/IRR/scenegraphAnimMod_UTF16LE.irr
index 7384ae29a..a8cab1a12 100644
Binary files a/test/models/IRR/scenegraphAnimMod_UTF16LE.irr and b/test/models/IRR/scenegraphAnimMod_UTF16LE.irr differ
diff --git a/test/models/IRR/scenegraphAnim_UTF16LE.irr b/test/models/IRR/scenegraphAnim_UTF16LE.irr
index f6794351f..4b6a2a6f7 100644
Binary files a/test/models/IRR/scenegraphAnim_UTF16LE.irr and b/test/models/IRR/scenegraphAnim_UTF16LE.irr differ
diff --git a/test/models/IRR/sphere.irr b/test/models/IRR/sphere.irr
index 1e548fee5..1b1896e2a 100644
--- a/test/models/IRR/sphere.irr
+++ b/test/models/IRR/sphere.irr
@@ -34,7 +34,7 @@
 				<float name="Shininess" value="0.000000" />
 				<float name="Param1" value="0.000000" />
 				<float name="Param2" value="0.000000" />
-				<texture name="Texture1" value="earthSpherical.jpg" />
+				<texture name="Texture1" value="assets/earthSpherical.jpg" />
 				<texture name="Texture2" value="" />
 				<texture name="Texture3" value="" />
 				<texture name="Texture4" value="" />
diff --git a/test/models/IRR/sphere_UTF16LE.irr b/test/models/IRR/sphere_UTF16LE.irr
index d0f99a018..7974a4c70 100644
Binary files a/test/models/IRR/sphere_UTF16LE.irr and b/test/models/IRR/sphere_UTF16LE.irr differ
diff --git a/test/models/IRRMesh/1.png b/test/models/IRRMesh/assets/1.png
similarity index 100%
rename from test/models/IRRMesh/1.png
rename to test/models/IRRMesh/assets/1.png
diff --git a/test/models/IRRMesh/SpiderTex.jpg b/test/models/IRRMesh/assets/SpiderTex.jpg
similarity index 100%
rename from test/models/IRRMesh/SpiderTex.jpg
rename to test/models/IRRMesh/assets/SpiderTex.jpg
diff --git a/test/models/IRRMesh/assets/UVTransformTestImg.png b/test/models/IRRMesh/assets/UVTransformTestImg.png
new file mode 100644
index 000000000..b8f6f54f1
Binary files /dev/null and b/test/models/IRRMesh/assets/UVTransformTestImg.png differ
diff --git a/test/models/IRRMesh/assets/UVTransform_OffsetUV0.5-mirrorUV.png b/test/models/IRRMesh/assets/UVTransform_OffsetUV0.5-mirrorUV.png
new file mode 100644
index 000000000..447d30c32
Binary files /dev/null and b/test/models/IRRMesh/assets/UVTransform_OffsetUV0.5-mirrorUV.png differ
diff --git a/test/models/IRRMesh/assets/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72.png b/test/models/IRRMesh/assets/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72.png
new file mode 100644
index 000000000..4645a5668
Binary files /dev/null and b/test/models/IRRMesh/assets/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72.png differ
diff --git a/test/models/IRRMesh/assets/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72_mirrorU.png b/test/models/IRRMesh/assets/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72_mirrorU.png
new file mode 100644
index 000000000..9fdc6daab
Binary files /dev/null and b/test/models/IRRMesh/assets/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72_mirrorU.png differ
diff --git a/test/models/IRRMesh/assets/UVTransform_ScaleUV2x_Rotate45.png b/test/models/IRRMesh/assets/UVTransform_ScaleUV2x_Rotate45.png
new file mode 100644
index 000000000..ac15908c3
Binary files /dev/null and b/test/models/IRRMesh/assets/UVTransform_ScaleUV2x_Rotate45.png differ
diff --git a/test/models/IRRMesh/brownground_1-1.jpg b/test/models/IRRMesh/assets/brownground_1-1.jpg
similarity index 100%
rename from test/models/IRRMesh/brownground_1-1.jpg
rename to test/models/IRRMesh/assets/brownground_1-1.jpg
diff --git a/test/models/IRRMesh/crackedground_1-6.jpg b/test/models/IRRMesh/assets/crackedground_1-6.jpg
similarity index 100%
rename from test/models/IRRMesh/crackedground_1-6.jpg
rename to test/models/IRRMesh/assets/crackedground_1-6.jpg
diff --git a/test/models/IRRMesh/drkwood2.jpg b/test/models/IRRMesh/assets/drkwood2.jpg
similarity index 100%
rename from test/models/IRRMesh/drkwood2.jpg
rename to test/models/IRRMesh/assets/drkwood2.jpg
diff --git a/test/models/IRRMesh/engineflare1.jpg b/test/models/IRRMesh/assets/engineflare1.jpg
similarity index 100%
rename from test/models/IRRMesh/engineflare1.jpg
rename to test/models/IRRMesh/assets/engineflare1.jpg
diff --git a/test/models/IRRMesh/wal67ar_small.jpg b/test/models/IRRMesh/assets/wal67ar_small.jpg
similarity index 100%
rename from test/models/IRRMesh/wal67ar_small.jpg
rename to test/models/IRRMesh/assets/wal67ar_small.jpg
diff --git a/test/models/IRRMesh/wal69ar_small.jpg b/test/models/IRRMesh/assets/wal69ar_small.jpg
similarity index 100%
rename from test/models/IRRMesh/wal69ar_small.jpg
rename to test/models/IRRMesh/assets/wal69ar_small.jpg
diff --git a/test/models/IRRMesh/cellar.irrmesh b/test/models/IRRMesh/cellar.irrmesh
index 0278c9239..ee787463a 100644
--- a/test/models/IRRMesh/cellar.irrmesh
+++ b/test/models/IRRMesh/cellar.irrmesh
@@ -13,8 +13,8 @@
 			<float name="Shininess" value="0.750000" />
 			<float name="Param1" value="0.000000" />
 			<float name="Param2" value="0.000000" />
-			<texture name="Texture1" value="brownground_1-1.jpg" />
-			<texture name="Texture2" value="1.png" />
+			<texture name="Texture1" value="assets/brownground_1-1.jpg" />
+			<texture name="Texture2" value="assets/1.png" />
 			<texture name="Texture3" value="" />
 			<texture name="Texture4" value="" />
 			<bool name="Wireframe" value="false" />
@@ -870,8 +870,8 @@
 			<float name="Shininess" value="0.750000" />
 			<float name="Param1" value="0.000000" />
 			<float name="Param2" value="0.000000" />
-			<texture name="Texture1" value="crackedground_1-6.jpg" />
-			<texture name="Texture2" value="1.png" />
+			<texture name="Texture1" value="assets/crackedground_1-6.jpg" />
+			<texture name="Texture2" value="assets/1.png" />
 			<texture name="Texture3" value="" />
 			<texture name="Texture4" value="" />
 			<bool name="Wireframe" value="false" />
diff --git a/test/models/IRRMesh/cellar_UTF16LE.irrmesh b/test/models/IRRMesh/cellar_UTF16LE.irrmesh
index d8d3a661b..38ef1847c 100644
Binary files a/test/models/IRRMesh/cellar_UTF16LE.irrmesh and b/test/models/IRRMesh/cellar_UTF16LE.irrmesh differ
diff --git a/test/models/IRRMesh/spider.irrmesh b/test/models/IRRMesh/spider.irrmesh
index e446a9ec2..e94901156 100644
--- a/test/models/IRRMesh/spider.irrmesh
+++ b/test/models/IRRMesh/spider.irrmesh
@@ -13,7 +13,7 @@
 			<float name="Shininess" value="0.000000" />
 			<float name="Param1" value="0.000000" />
 			<float name="Param2" value="0.000000" />
-			<texture name="Texture1" value="wal67ar_small.jpg" />
+			<texture name="Texture1" value="assets/wal67ar_small.jpg" />
 			<texture name="Texture2" value="" />
 			<texture name="Texture3" value="" />
 			<texture name="Texture4" value="" />
@@ -354,7 +354,7 @@
 			<float name="Shininess" value="0.000000" />
 			<float name="Param1" value="0.000000" />
 			<float name="Param2" value="0.000000" />
-			<texture name="Texture1" value="SpiderTex.jpg" />
+			<texture name="Texture1" value="assets/SpiderTex.jpg" />
 			<texture name="Texture2" value="" />
 			<texture name="Texture3" value="" />
 			<texture name="Texture4" value="" />
@@ -485,7 +485,7 @@
 			<float name="Shininess" value="0.000000" />
 			<float name="Param1" value="0.000000" />
 			<float name="Param2" value="0.000000" />
-			<texture name="Texture1" value="drkwood2.jpg" />
+			<texture name="Texture1" value="assets/drkwood2.jpg" />
 			<texture name="Texture2" value="" />
 			<texture name="Texture3" value="" />
 			<texture name="Texture4" value="" />
@@ -1609,7 +1609,7 @@
 			<float name="Shininess" value="0.000000" />
 			<float name="Param1" value="0.000000" />
 			<float name="Param2" value="0.000000" />
-			<texture name="Texture1" value="engineflare1.jpg" />
+			<texture name="Texture1" value="assets/engineflare1.jpg" />
 			<texture name="Texture2" value="" />
 			<texture name="Texture3" value="" />
 			<texture name="Texture4" value="" />
diff --git a/test/models/IRRMesh/spider_UTF16LE.irrmesh b/test/models/IRRMesh/spider_UTF16LE.irrmesh
index 25fda7c27..4a3509d5b 100644
Binary files a/test/models/IRRMesh/spider_UTF16LE.irrmesh and b/test/models/IRRMesh/spider_UTF16LE.irrmesh differ
diff --git a/test/models/IRRMesh/testFormatDetection.xml b/test/models/IRRMesh/testFormatDetection.xml
index 0986eaf61..fd2e34f65 100644
--- a/test/models/IRRMesh/testFormatDetection.xml
+++ b/test/models/IRRMesh/testFormatDetection.xml
@@ -13,7 +13,7 @@
 			<float name="Shininess" value="0.100000" />
 			<float name="Param1" value="0.000000" />
 			<float name="Param2" value="0.000000" />
-			<texture name="Texture1" value="" />
+			<texture name="Texture1" value="assets/UVTransformTestImg.png" />
 			<texture name="Texture2" value="" />
 			<texture name="Texture3" value="" />
 			<texture name="Texture4" value="" />
@@ -96,7 +96,7 @@
 			<float name="Shininess" value="0.100000" />
 			<float name="Param1" value="0.000000" />
 			<float name="Param2" value="0.000000" />
-			<texture name="Texture1" value="" />
+			<texture name="Texture1" value="assets/UVTransform_OffsetUV0.5-mirrorUV.png" />
 			<texture name="Texture2" value="" />
 			<texture name="Texture3" value="" />
 			<texture name="Texture4" value="" />
@@ -179,7 +179,7 @@
 			<float name="Shininess" value="0.100000" />
 			<float name="Param1" value="0.000000" />
 			<float name="Param2" value="0.000000" />
-			<texture name="Texture1" value="" />
+			<texture name="Texture1" value="assets/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72.png" />
 			<texture name="Texture2" value="" />
 			<texture name="Texture3" value="" />
 			<texture name="Texture4" value="" />
@@ -262,7 +262,7 @@
 			<float name="Shininess" value="0.100000" />
 			<float name="Param1" value="0.000000" />
 			<float name="Param2" value="0.000000" />
-			<texture name="Texture1" value="" />
+			<texture name="Texture1" value="assets/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72_mirrorU.png" />
 			<texture name="Texture2" value="" />
 			<texture name="Texture3" value="" />
 			<texture name="Texture4" value="" />
@@ -345,7 +345,7 @@
 			<float name="Shininess" value="0.100000" />
 			<float name="Param1" value="0.170000" />
 			<float name="Param2" value="0.000000" />
-			<texture name="Texture1" value="" />
+			<texture name="Texture1" value="assets/UVTransform_ScaleUV2x_Rotate45.png" />
 			<texture name="Texture2" value="" />
 			<texture name="Texture3" value="" />
 			<texture name="Texture4" value="" />
diff --git a/test/models/IRRMesh/testFormatDetection_UTF16LE.xml b/test/models/IRRMesh/testFormatDetection_UTF16LE.xml
index aa73560d4..64891be9f 100644
Binary files a/test/models/IRRMesh/testFormatDetection_UTF16LE.xml and b/test/models/IRRMesh/testFormatDetection_UTF16LE.xml differ
diff --git a/test/models/MD2/ref/README.md b/test/models/MD2/ref/README.md
new file mode 100644
index 000000000..7f4b49c43
--- /dev/null
+++ b/test/models/MD2/ref/README.md
@@ -0,0 +1,7 @@
+# MD2 3D model reference images
+
+## faerie.md2
+<img alt="faerie.md2" src="screenshots/faerie_md2.png" width=180 />
+
+## sydney.md2
+<img alt="sydney.md2" src="screenshots/sydney_md2.png" width=180 />
diff --git a/test/models/MD2/ref/screenshots/faerie_md2.png b/test/models/MD2/ref/screenshots/faerie_md2.png
new file mode 100644
index 000000000..e2385ccea
Binary files /dev/null and b/test/models/MD2/ref/screenshots/faerie_md2.png differ
diff --git a/test/models/MD2/ref/screenshots/sydney_md2.png b/test/models/MD2/ref/screenshots/sydney_md2.png
new file mode 100644
index 000000000..b8616a8f6
Binary files /dev/null and b/test/models/MD2/ref/screenshots/sydney_md2.png differ
diff --git a/test/models/NFF/NFF/ManyEarthsNotJustOne.nff b/test/models/NFF/ManyEarthsNotJustOne.nff
similarity index 100%
rename from test/models/NFF/NFF/ManyEarthsNotJustOne.nff
rename to test/models/NFF/ManyEarthsNotJustOne.nff
diff --git a/test/models/NFF/NFF/WithCamera.nff b/test/models/NFF/WithCamera.nff
similarity index 100%
rename from test/models/NFF/NFF/WithCamera.nff
rename to test/models/NFF/WithCamera.nff
diff --git a/test/models/NFF/NFF/cone.nff b/test/models/NFF/cone.nff
similarity index 86%
rename from test/models/NFF/NFF/cone.nff
rename to test/models/NFF/cone.nff
index 20d02b259..f6f063ae4 100644
--- a/test/models/NFF/NFF/cone.nff
+++ b/test/models/NFF/cone.nff
@@ -1,6 +1,6 @@
 
 #red
-f 1.0 0.0 0.0 0.5 45.2776 0 1 cantfindme.png
+f 1.0 0.0 0.0 0.5 0.5 45.2776 0 1 cantfindme.png
 
 
 tess 4
diff --git a/test/models/NFF/NFF/cylinder.nff b/test/models/NFF/cylinder.nff
similarity index 100%
rename from test/models/NFF/NFF/cylinder.nff
rename to test/models/NFF/cylinder.nff
diff --git a/test/models/NFF/NFF/dodecahedron.nff b/test/models/NFF/dodecahedron.nff
similarity index 100%
rename from test/models/NFF/NFF/dodecahedron.nff
rename to test/models/NFF/dodecahedron.nff
diff --git a/test/models/NFF/NFF/earthCylindric.jpg b/test/models/NFF/earthCylindric.jpg
similarity index 100%
rename from test/models/NFF/NFF/earthCylindric.jpg
rename to test/models/NFF/earthCylindric.jpg
diff --git a/test/models/NFF/NFF/earthSpherical.jpg b/test/models/NFF/earthSpherical.jpg
similarity index 100%
rename from test/models/NFF/NFF/earthSpherical.jpg
rename to test/models/NFF/earthSpherical.jpg
diff --git a/test/models/NFF/NFF/hexahedron.nff b/test/models/NFF/hexahedron.nff
similarity index 100%
rename from test/models/NFF/NFF/hexahedron.nff
rename to test/models/NFF/hexahedron.nff
diff --git a/test/models/NFF/NFF/octahedron.nff b/test/models/NFF/octahedron.nff
similarity index 100%
rename from test/models/NFF/NFF/octahedron.nff
rename to test/models/NFF/octahedron.nff
diff --git a/test/models/NFF/NFF/positionTest.nff b/test/models/NFF/positionTest.nff
similarity index 100%
rename from test/models/NFF/NFF/positionTest.nff
rename to test/models/NFF/positionTest.nff
diff --git a/test/models/NFF/ref/README.md b/test/models/NFF/ref/README.md
new file mode 100644
index 000000000..ae107c4c4
--- /dev/null
+++ b/test/models/NFF/ref/README.md
@@ -0,0 +1,4 @@
+# NFF 3D model reference images
+
+## cone.nff
+<img alt="cone.nff" src="screenshots/cone_nff.png" width=180 />
diff --git a/test/models/NFF/ref/screenshots/cone_nff.png b/test/models/NFF/ref/screenshots/cone_nff.png
new file mode 100644
index 000000000..f5aff6745
Binary files /dev/null and b/test/models/NFF/ref/screenshots/cone_nff.png differ
diff --git a/test/models/NFF/NFF/spheres.nff b/test/models/NFF/spheres.nff
similarity index 100%
rename from test/models/NFF/NFF/spheres.nff
rename to test/models/NFF/spheres.nff
diff --git a/test/models/NFF/NFF/tetrahedron.nff b/test/models/NFF/tetrahedron.nff
similarity index 100%
rename from test/models/NFF/NFF/tetrahedron.nff
rename to test/models/NFF/tetrahedron.nff
diff --git a/test/models/OBJ/folder/mtl_different_folder.mtl b/test/models/OBJ/folder/mtl_different_folder.mtl
new file mode 100644
index 000000000..9fbaa3d78
--- /dev/null
+++ b/test/models/OBJ/folder/mtl_different_folder.mtl
@@ -0,0 +1,13 @@
+
+# Example for github issue #2355: {OBJ} mtllib with a path == can't find texture file
+
+newmtl Whatever
+Ka 0 0 0
+Kd 0.141176 0.184314 0.411765
+Ks 0 0 0
+Ni 1
+Ns 400
+Tf 1 1 1
+d 1
+map_Kd image.jpg
+
diff --git a/test/models/OBJ/mtl_different_folder.obj b/test/models/OBJ/mtl_different_folder.obj
new file mode 100644
index 000000000..afffa41b0
--- /dev/null
+++ b/test/models/OBJ/mtl_different_folder.obj
@@ -0,0 +1,31 @@
+#	                Vertices: 8
+#	                  Points: 0
+#	                   Lines: 0
+#	                   Faces: 6
+#	               Materials: 1
+
+o 1
+mtllib folder/mtl_different_folder.mtl
+
+# Vertex list
+
+v -0.5 -0.5 0.5
+v -0.5 -0.5 -0.5
+v -0.5 0.5 -0.5
+v -0.5 0.5 0.5
+v 0.5 -0.5 0.5
+v 0.5 -0.5 -0.5
+v 0.5 0.5 -0.5
+v 0.5 0.5 0.5
+
+# Point/Line/Face list
+
+usemtl Whatever
+f 4 3 2 1
+f 2 6 5 1
+f 3 7 6 2
+f 8 7 3 4
+f 5 8 4 1
+f 6 7 8 5
+
+# End of file
diff --git a/test/models/OpenGEX/texture/Concrete.tga b/test/models/OpenGEX/texture/Concrete.tga
new file mode 100644
index 000000000..99df7364f
Binary files /dev/null and b/test/models/OpenGEX/texture/Concrete.tga differ
diff --git a/test/models/PLY/cube_binary_starts_with_nl.ply b/test/models/PLY/cube_binary_starts_with_nl.ply
new file mode 100644
index 000000000..0eed84a5c
Binary files /dev/null and b/test/models/PLY/cube_binary_starts_with_nl.ply differ
diff --git a/test/models/PLY/payload_JVN42386607 b/test/models/PLY/payload_JVN42386607
new file mode 100644
index 000000000..e372bf324
--- /dev/null
+++ b/test/models/PLY/payload_JVN42386607
@@ -0,0 +1,31 @@
+ply
+format ascii
+element vertex 7
+property int x
+property int nx
+element vertex 9
+property float x
+property float y
+property float z
+element face 3
+property list int8 int vertex_index
+end_header
+8 8
+8 8
+8 8
+8 8
+8 8
+8 8
+8 8
+9 9 9
+9 9 9
+9 9 9
+9 9 9
+9 9 9
+9 9 9
+9 9 9
+0 2.4902982818549262e-43 0
+-3.418291644037699e+33 4.591734678053128e-41 0
+42 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+42 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767 4143600380 32767
+0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
\ No newline at end of file
diff --git a/test/models/TER/ref/README.md b/test/models/TER/ref/README.md
new file mode 100644
index 000000000..e1994ebd6
--- /dev/null
+++ b/test/models/TER/ref/README.md
@@ -0,0 +1,7 @@
+# TER 3D model reference images
+
+## RealisticTerrain.ter
+<img alt="RealisticTerrain.ter" src="screenshots/RealisticTerrain_ter.png" width=180 />
+
+## RealisticTerrain_Large.ter
+<img alt="RealisticTerrain_Large.ter" src="screenshots/RealisticTerrain_Large_ter.png" width=180 />
diff --git a/test/models/TER/ref/screenshots/RealisticTerrain_Large_ter.png b/test/models/TER/ref/screenshots/RealisticTerrain_Large_ter.png
new file mode 100644
index 000000000..e5c6ff5c2
Binary files /dev/null and b/test/models/TER/ref/screenshots/RealisticTerrain_Large_ter.png differ
diff --git a/test/models/TER/ref/screenshots/RealisticTerrain_ter.png b/test/models/TER/ref/screenshots/RealisticTerrain_ter.png
new file mode 100644
index 000000000..b39185275
Binary files /dev/null and b/test/models/TER/ref/screenshots/RealisticTerrain_ter.png differ
diff --git a/test/models/USD/MotionCaptureROM.usdc b/test/models/USD/MotionCaptureROM.usdc
new file mode 100644
index 000000000..01598ca0d
Binary files /dev/null and b/test/models/USD/MotionCaptureROM.usdc differ
diff --git a/test/models/USD/README.md b/test/models/USD/README.md
new file mode 100644
index 000000000..500a0cad1
--- /dev/null
+++ b/test/models/USD/README.md
@@ -0,0 +1,8 @@
+# USD model files
+
+## MotionCaptureROM.usdc
+Converted bundled .wrl test model:
+    https://github.com/assimp/assimp/blob/master/test/models/WRL/MotionCaptureROM.WRL
+to .usdc format via website:
+    https://imagetostl.com/convert/file/wrl/to/usd#convert
+(As of Oct 2024, animations have not been verified as present or correct)
diff --git a/test/models/USD/ref/README.md b/test/models/USD/ref/README.md
new file mode 100644
index 000000000..0da8dfa1c
--- /dev/null
+++ b/test/models/USD/ref/README.md
@@ -0,0 +1,4 @@
+# USD 3D model reference images
+
+## MotionCaptureROM.usdc
+<img alt="MotionCaptureROM.usdc" src="screenshots/MotionCaptureROM_usdc.png" width=180 />
diff --git a/test/models/USD/ref/screenshots/MotionCaptureROM_usdc.png b/test/models/USD/ref/screenshots/MotionCaptureROM_usdc.png
new file mode 100644
index 000000000..d924ccaa6
Binary files /dev/null and b/test/models/USD/ref/screenshots/MotionCaptureROM_usdc.png differ
diff --git a/test/models/WRL/HelloWorld.wrl b/test/models/WRL/HelloWorld.wrl
new file mode 100644
index 000000000..e6c71b6a5
--- /dev/null
+++ b/test/models/WRL/HelloWorld.wrl
@@ -0,0 +1,87 @@
+#VRML V2.0 utf8
+# X3D-to-VRML-97 XSL translation autogenerated by X3dToVrml97.xslt
+# https://www.web3d.org/x3d/content/X3dToVrml97.xslt
+# Generated using XSLT processor: Saxonica
+
+# [X3D] VRML V3.3 utf8
+# PROFILE Immersive
+# [X3D] version=3.3
+# [X3D] noNamespaceSchemaLocation=https://www.web3d.org/specifications/x3d-3.3.xsd
+# [head]
+
+# Alternate encodings: VRML97, X3D ClassicVRML Encoding, X3D Compressed Binary Encoding (CBE), X3DOM, JSON
+# META "title" "HelloWorld.x3d"
+# META "description" "Simple X3D model example: Hello World!"
+# META "created" "30 October 2000"
+# META "modified" "9 July 2023"
+# META "creator" "Don Brutzman"
+# META "Image" "HelloWorld.tall.png"
+# META "reference" "https://en.wikipedia.org/wiki/Hello_world"
+# META "reference" "https://en.wikipedia.org/wiki/Hello#.22Hello.2C_World.22_computer_program"
+# META "reference" "https://en.wikipedia.org/wiki/\"Hello,_World!\"_program"
+# META "reference" "https://en.wikibooks.org/w/index.php?title=Computer_Programming/Hello_world"
+# META "reference" "https://www.HelloWorldExample.net"
+# META "reference" "https://www.web3d.org"
+# META "reference" "https://www.web3d.org/realtime-3d/news/internationalization-x3d"
+# META "reference" "https://www.web3d.org/x3d/content/examples/HelloWorld.x3d"
+# META "reference" "https://www.web3d.org/x3d/content/examples/X3dForAdvancedModeling/HelloWorldScenes/HelloWorld.x3d"
+# META "identifier" "https://www.web3d.org/x3d/content/examples/X3dForWebAuthors/Chapter01TechnicalOverview/HelloWorld.x3d"
+# META "license" "https://www.web3d.org/x3d/content/examples/license.html"
+# META "generator" "X3D-Edit 4.0, https://savage.nps.edu/X3D-Edit"
+# META "reference" "HelloWorld.wrl"
+# META "reference" "HelloWorld.x3dv"
+# META "reference" "HelloWorld.x3db"
+# META "reference" "HelloWorld.xhtml"
+# META "reference" "HelloWorld.json"
+
+# [Scene] ========== ========== ==========
+
+NavigationInfo { type [ "EXAMINE" "ANY" ] } ###  Default X3D NavigationInfo
+
+# Example scene to illustrate X3D nodes and fields (XML elements and attributes)
+WorldInfo {
+  info [ "Example scene to illustrate a simple X3D model" ]
+  title "Hello World!"
+}
+Group {
+  children [
+      DEF ViewUpClose Viewpoint {
+        centerOfRotation 0 -1 0
+        description "Hello world!"
+        position 0 -1 7
+      }
+      Transform {
+        rotation 0 1 0 3
+        children [
+            Shape {
+              geometry Sphere {
+              }
+              appearance Appearance {
+                material DEF MaterialOffWhite Material {
+                  diffuseColor 0.980392 0.976471 0.964706
+                }
+                texture DEF ImageCloudlessEarth ImageTexture {
+                  url [ "earth-topo.png" "earth-topo.jpg" "earth-topo-small.gif" "https://www.web3d.org/x3d/content/examples/Basic/earth-topo.png" "https://www.web3d.org/x3d/content/examples/Basic/earth-topo.jpg" "https://www.web3d.org/x3d/content/examples/Basic/earth-topo-small.gif" ]
+                }
+              }
+            }
+        ]
+      }
+      Transform {
+        translation 0 -2 0
+        children [
+            Shape {
+              geometry DEF TextMessage Text {
+                string [ "Hello" "world!" ]
+                fontStyle FontStyle {
+                  justify [ "MIDDLE" "MIDDLE"  ] 
+                }
+              }
+              appearance Appearance {
+                material USE MaterialOffWhite
+              }
+            }
+        ]
+      }
+  ]
+}
diff --git a/test/models/WRL/README.md b/test/models/WRL/README.md
new file mode 100644
index 000000000..744d2485e
--- /dev/null
+++ b/test/models/WRL/README.md
@@ -0,0 +1,6 @@
+# WRL models
+
+X3D is a modern superset of the old (VRML) WRL format
+
+# HelloWorld.wrl
+Downloaded from [HelloWorld.wrl](http://www.web3d.org/x3d/content/examples/HelloWorld.wrl)
diff --git a/test/models/WRL/earth-topo.png b/test/models/WRL/earth-topo.png
new file mode 100644
index 000000000..1749cb835
Binary files /dev/null and b/test/models/WRL/earth-topo.png differ
diff --git a/test/models/WRL/ref/README.md b/test/models/WRL/ref/README.md
new file mode 100644
index 000000000..ff0205010
--- /dev/null
+++ b/test/models/WRL/ref/README.md
@@ -0,0 +1,4 @@
+# WRL 3D model reference images
+
+## HelloWorld.wrl
+<img alt="HelloWorld.wrl" src="screenshots/HelloWorld_wrl.png" width=180 />
diff --git a/test/models/WRL/ref/screenshots/HelloWorld_wrl.png b/test/models/WRL/ref/screenshots/HelloWorld_wrl.png
new file mode 100644
index 000000000..54cfd704c
Binary files /dev/null and b/test/models/WRL/ref/screenshots/HelloWorld_wrl.png differ
diff --git a/test/models/X/ref/README.md b/test/models/X/ref/README.md
new file mode 100644
index 000000000..4a3944ab9
--- /dev/null
+++ b/test/models/X/ref/README.md
@@ -0,0 +1,7 @@
+# X 3D model reference images
+
+## BCN_Epileptic.X
+<img alt="BCN_Epileptic.X" src="screenshots/BCN_Epileptic_X.gif" width=180 />
+
+## Testwuson.X playing animation "Wuson_Run"
+<img alt="Testwuson.X" src="screenshots/Testwuson_X_anim_Wuson_Run.gif" width=180 />
diff --git a/test/models/X/ref/screenshots/BCN_Epileptic_X.gif b/test/models/X/ref/screenshots/BCN_Epileptic_X.gif
new file mode 100644
index 000000000..fb275c7c2
Binary files /dev/null and b/test/models/X/ref/screenshots/BCN_Epileptic_X.gif differ
diff --git a/test/models/X/ref/screenshots/Testwuson_X_anim_Wuson_Run.gif b/test/models/X/ref/screenshots/Testwuson_X_anim_Wuson_Run.gif
new file mode 100644
index 000000000..4f25c0bac
Binary files /dev/null and b/test/models/X/ref/screenshots/Testwuson_X_anim_Wuson_Run.gif differ
diff --git a/test/models/X3D/HelloWorld.x3d b/test/models/X3D/HelloWorld.x3d
new file mode 100644
index 000000000..030e2f36c
--- /dev/null
+++ b/test/models/X3D/HelloWorld.x3d
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.3//EN" "https://www.web3d.org/specifications/x3d-3.3.dtd">
+<X3D profile='Immersive' version='3.3' xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance' xsd:noNamespaceSchemaLocation='https://www.web3d.org/specifications/x3d-3.3.xsd'>
+  <head>
+    <!-- Alternate encodings: VRML97, X3D ClassicVRML Encoding, X3D Compressed Binary Encoding (CBE), X3DOM, JSON -->
+    <meta content='HelloWorld.x3d' name='title'/>
+    <meta content='Simple X3D model example: Hello World!' name='description'/>
+    <meta content='30 October 2000' name='created'/>
+    <meta content='9 July 2023' name='modified'/>
+    <meta content='Don Brutzman' name='creator'/>
+    <meta content='HelloWorld.tall.png' name='Image'/>
+    <meta content='https://en.wikipedia.org/wiki/Hello_world' name='reference'/>
+    <meta content='https://en.wikipedia.org/wiki/Hello#.22Hello.2C_World.22_computer_program' name='reference'/>
+    <meta content='https://en.wikipedia.org/wiki/"Hello,_World!"_program' name='reference'/>
+    <meta content='https://en.wikibooks.org/w/index.php?title=Computer_Programming/Hello_world' name='reference'/>
+    <meta content='https://www.HelloWorldExample.net' name='reference'/>
+    <meta content='https://www.web3d.org' name='reference'/>
+    <meta content='https://www.web3d.org/realtime-3d/news/internationalization-x3d' name='reference'/>
+    <meta content='https://www.web3d.org/x3d/content/examples/HelloWorld.x3d' name='reference'/>
+    <meta content='https://www.web3d.org/x3d/content/examples/X3dForAdvancedModeling/HelloWorldScenes/HelloWorld.x3d' name='reference'/>
+    <meta content='https://www.web3d.org/x3d/content/examples/X3dForWebAuthors/Chapter01TechnicalOverview/HelloWorld.x3d' name='identifier'/>
+    <meta content='https://www.web3d.org/x3d/content/examples/license.html' name='license'/>
+    <meta content='X3D-Edit 4.0, https://savage.nps.edu/X3D-Edit' name='generator'/>
+    <meta content='HelloWorld.wrl' name='reference'/>
+    <meta content='HelloWorld.x3dv' name='reference'/>
+    <meta content='HelloWorld.x3db' name='reference'/>
+    <meta content='HelloWorld.xhtml' name='reference'/>
+    <meta content='HelloWorld.json' name='reference'/>
+  </head>
+  <Scene>
+    <!-- Example scene to illustrate X3D nodes and fields (XML elements and attributes) -->
+    <WorldInfo info='"Example scene to illustrate a simple X3D model"' title='Hello World!'/>
+    <Group>
+      <Viewpoint DEF='ViewUpClose' centerOfRotation='0 -1 0' description='Hello world!' position='0 -1 7'/>
+      <Transform rotation='0 1 0 3'>
+        <Shape>
+          <Sphere/>
+          <Appearance>
+            <!-- https://htmlcolorcodes.com/colors/off-white -->
+            <Material DEF='MaterialOffWhite' diffuseColor='0.980392 0.976471 0.964706'/>
+            <ImageTexture DEF='ImageCloudlessEarth' url='"earth-topo.png" "earth-topo.jpg" "earth-topo-small.gif" "https://www.web3d.org/x3d/content/examples/Basic/earth-topo.png" "https://www.web3d.org/x3d/content/examples/Basic/earth-topo.jpg" "https://www.web3d.org/x3d/content/examples/Basic/earth-topo-small.gif"'/>
+          </Appearance>
+        </Shape>
+      </Transform>
+      <Transform translation='0 -2 0'>
+        <Shape>
+          <Text DEF='TextMessage' string='"Hello" "world!"'>
+            <FontStyle justify='"MIDDLE" "MIDDLE"'/>
+          </Text>
+          <Appearance>
+            <Material USE='MaterialOffWhite'/>
+          </Appearance>
+        </Shape>
+      </Transform>
+    </Group>
+  </Scene>
+</X3D>
\ No newline at end of file
diff --git a/test/models/X3D/IndexedLineSet.x3d b/test/models/X3D/IndexedLineSet.x3d
new file mode 100644
index 000000000..ed865ebb7
--- /dev/null
+++ b/test/models/X3D/IndexedLineSet.x3d
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.0//EN" "http://www.web3d.org/specifications/x3d-3.0.dtd">
+<X3D profile='Interchange' version='3.0' xmlns:xsd='http://www.w3.org/2001/XMLSchema-instance' xsd:noNamespaceSchemaLocation='http://www.web3d.org/specifications/x3d-3.0.xsd'>
+  <head>
+  </head>
+  <Scene>
+    <WorldInfo title='vertices.x3d'/>
+    <NavigationInfo type='"EXAMINE" "WALK" "FLY" "ANY"'/>
+    <Viewpoint description='vertices' position='0 0 10'/>
+    <Shape>
+      <Appearance>
+        <Material emissiveColor='1 0 0'/>
+      </Appearance>
+      <IndexedLineSet coordIndex='0 1 2 3 0 -1'>
+        <Coordinate point='1 0 0 1 1 0 0 1 0 0 0 0'/>
+      </IndexedLineSet>
+    </Shape>
+  </Scene>
+</X3D>
diff --git a/test/models/X3D/README.md b/test/models/X3D/README.md
new file mode 100644
index 000000000..dd843871e
--- /dev/null
+++ b/test/models/X3D/README.md
@@ -0,0 +1,4 @@
+# X3D models
+
+# HelloWorld.x3d
+Downloaded from [HelloWorld.x3d](http://www.web3d.org/x3d/content/examples/HelloWorld.x3d)
diff --git a/test/models/X3D/earth-topo.png b/test/models/X3D/earth-topo.png
new file mode 100644
index 000000000..1749cb835
Binary files /dev/null and b/test/models/X3D/earth-topo.png differ
diff --git a/test/models/X3D/ref/README.md b/test/models/X3D/ref/README.md
new file mode 100644
index 000000000..dc80e3064
--- /dev/null
+++ b/test/models/X3D/ref/README.md
@@ -0,0 +1,17 @@
+# X3D 3D model reference images
+
+## ComputerKeyboard.x3d
+
+### Working (using IRR xml parser)
+ComputerKeyboard as of 29 Sep 2020 git commit `6a4c338`, using IRR xml parsing, renders OK:
+
+<img alt="ComputerKeyboard.x3d (IRR xml)" src="screenshots/ComputerKeyboard_x3d_irr_xml.png" width=320 />
+
+### Broken (using pugi xml parser)
+ComputerKeyboard as of 1 Dec 2021 git commit `1614934`, using pugi xml parsing, renders with 
+missing meshes and obvious artifacts:
+
+<img alt="ComputerKeyboard.x3d (pugi xml)" src="screenshots/ComputerKeyboard_x3d_pugi_xml.png" width=320 />
+
+## HelloWorld.x3d
+<img alt="HelloWorld.x3d" src="screenshots/HelloWorld_x3d.png" width=180 />
diff --git a/test/models/X3D/ref/screenshots/ComputerKeyboard_x3d_irr_xml.png b/test/models/X3D/ref/screenshots/ComputerKeyboard_x3d_irr_xml.png
new file mode 100644
index 000000000..787e8e7f6
Binary files /dev/null and b/test/models/X3D/ref/screenshots/ComputerKeyboard_x3d_irr_xml.png differ
diff --git a/test/models/X3D/ref/screenshots/ComputerKeyboard_x3d_pugi_xml.png b/test/models/X3D/ref/screenshots/ComputerKeyboard_x3d_pugi_xml.png
new file mode 100644
index 000000000..aaa45fb6d
Binary files /dev/null and b/test/models/X3D/ref/screenshots/ComputerKeyboard_x3d_pugi_xml.png differ
diff --git a/test/models/X3D/ref/screenshots/HelloWorld_x3d.png b/test/models/X3D/ref/screenshots/HelloWorld_x3d.png
new file mode 100644
index 000000000..581a2988d
Binary files /dev/null and b/test/models/X3D/ref/screenshots/HelloWorld_x3d.png differ
diff --git a/test/models/X3DB/HelloWorld.x3db b/test/models/X3DB/HelloWorld.x3db
new file mode 100644
index 000000000..ba2f5c67c
Binary files /dev/null and b/test/models/X3DB/HelloWorld.x3db differ
diff --git a/test/models/X3DB/README.md b/test/models/X3DB/README.md
new file mode 100644
index 000000000..9e83c8dd0
--- /dev/null
+++ b/test/models/X3DB/README.md
@@ -0,0 +1,6 @@
+# X3DB models
+
+X3DB models are compressed X3D models
+
+# HelloWorld.x3db
+Downloaded from [HelloWorld.x3db](http://www.web3d.org/x3d/content/examples/HelloWorld.x3db)
diff --git a/test/models/X3DB/earth-topo.png b/test/models/X3DB/earth-topo.png
new file mode 100644
index 000000000..1749cb835
Binary files /dev/null and b/test/models/X3DB/earth-topo.png differ
diff --git a/test/models/X3DV/HelloWorld.x3dv b/test/models/X3DV/HelloWorld.x3dv
new file mode 100644
index 000000000..1da5c4fb5
--- /dev/null
+++ b/test/models/X3DV/HelloWorld.x3dv
@@ -0,0 +1,86 @@
+#X3D V3.3 utf8
+# X3D-to-ClassicVRML XSL translation autogenerated by X3dToVrml97.xslt
+# https://www.web3d.org/x3d/content/X3dToVrml97.xslt
+# Generated using XSLT processor: Saxonica
+
+PROFILE Immersive
+# [X3D] version=3.3
+# [X3D] noNamespaceSchemaLocation=https://www.web3d.org/specifications/x3d-3.3.xsd
+# [head]
+
+# Alternate encodings: VRML97, X3D ClassicVRML Encoding, X3D Compressed Binary Encoding (CBE), X3DOM, JSON
+META "title" "HelloWorld.x3d"
+META "description" "Simple X3D model example: Hello World!"
+META "created" "30 October 2000"
+META "modified" "9 July 2023"
+META "creator" "Don Brutzman"
+META "Image" "HelloWorld.tall.png"
+META "reference" "https://en.wikipedia.org/wiki/Hello_world"
+META "reference" "https://en.wikipedia.org/wiki/Hello#.22Hello.2C_World.22_computer_program"
+META "reference" "https://en.wikipedia.org/wiki/\"Hello,_World!\"_program"
+META "reference" "https://en.wikibooks.org/w/index.php?title=Computer_Programming/Hello_world"
+META "reference" "https://www.HelloWorldExample.net"
+META "reference" "https://www.web3d.org"
+META "reference" "https://www.web3d.org/realtime-3d/news/internationalization-x3d"
+META "reference" "https://www.web3d.org/x3d/content/examples/HelloWorld.x3d"
+META "reference" "https://www.web3d.org/x3d/content/examples/X3dForAdvancedModeling/HelloWorldScenes/HelloWorld.x3d"
+META "identifier" "https://www.web3d.org/x3d/content/examples/X3dForWebAuthors/Chapter01TechnicalOverview/HelloWorld.x3d"
+META "license" "https://www.web3d.org/x3d/content/examples/license.html"
+META "generator" "X3D-Edit 4.0, https://savage.nps.edu/X3D-Edit"
+META "reference" "HelloWorld.wrl"
+META "reference" "HelloWorld.x3dv"
+META "reference" "HelloWorld.x3db"
+META "reference" "HelloWorld.xhtml"
+META "reference" "HelloWorld.json"
+
+# [Scene] ========== ========== ==========
+
+NavigationInfo { type [ "EXAMINE" "ANY" ] } ###  Default X3D NavigationInfo
+
+# Example scene to illustrate X3D nodes and fields (XML elements and attributes)
+WorldInfo {
+  info [ "Example scene to illustrate a simple X3D model" ]
+  title "Hello World!"
+}
+Group {
+  children [
+      DEF ViewUpClose Viewpoint {
+        centerOfRotation 0 -1 0
+        description "Hello world!"
+        position 0 -1 7
+      }
+      Transform {
+        rotation 0 1 0 3
+        children [
+            Shape {
+              geometry Sphere {
+              }
+              appearance Appearance {
+                material DEF MaterialOffWhite Material {
+                  diffuseColor 0.980392 0.976471 0.964706
+                }
+                texture DEF ImageCloudlessEarth ImageTexture {
+                  url [ "earth-topo.png" "earth-topo.jpg" "earth-topo-small.gif" "https://www.web3d.org/x3d/content/examples/Basic/earth-topo.png" "https://www.web3d.org/x3d/content/examples/Basic/earth-topo.jpg" "https://www.web3d.org/x3d/content/examples/Basic/earth-topo-small.gif" ]
+                }
+              }
+            }
+        ]
+      }
+      Transform {
+        translation 0 -2 0
+        children [
+            Shape {
+              geometry DEF TextMessage Text {
+                string [ "Hello" "world!" ]
+                fontStyle FontStyle {
+                  justify [ "MIDDLE" "MIDDLE"  ] 
+                }
+              }
+              appearance Appearance {
+                material USE MaterialOffWhite
+              }
+            }
+        ]
+      }
+  ]
+}
diff --git a/test/models/X3DV/README.md b/test/models/X3DV/README.md
new file mode 100644
index 000000000..83c951c6a
--- /dev/null
+++ b/test/models/X3DV/README.md
@@ -0,0 +1,6 @@
+# X3DV models
+
+X3DV models are as simple WRL (VRML) models with the version number upgraded from `2` to `3`
+
+# HelloWorld.x3dv
+Downloaded from [HelloWorld.x3dv](http://www.web3d.org/x3d/content/examples/HelloWorld.x3dv)
diff --git a/test/models/X3DV/earth-topo.png b/test/models/X3DV/earth-topo.png
new file mode 100644
index 000000000..1749cb835
Binary files /dev/null and b/test/models/X3DV/earth-topo.png differ
diff --git a/test/models/X3DV/ref/README.md b/test/models/X3DV/ref/README.md
new file mode 100644
index 000000000..25f3e93d9
--- /dev/null
+++ b/test/models/X3DV/ref/README.md
@@ -0,0 +1,4 @@
+# X3DV 3D model reference images
+
+## HelloWorld.x3dv
+<img alt="HelloWorld.x3dv" src="screenshots/HelloWorld_x3dv.png" width=180 />
diff --git a/test/models/X3DV/ref/screenshots/HelloWorld_x3dv.png b/test/models/X3DV/ref/screenshots/HelloWorld_x3dv.png
new file mode 100644
index 000000000..0860c7a85
Binary files /dev/null and b/test/models/X3DV/ref/screenshots/HelloWorld_x3dv.png differ
diff --git a/test/models/fuzzer_data/clusterfuzz-testcase-minimized-assimp_fuzzer-4751812606885888 b/test/models/fuzzer_data/clusterfuzz-testcase-minimized-assimp_fuzzer-4751812606885888
new file mode 100644
index 000000000..36861a7e3
Binary files /dev/null and b/test/models/fuzzer_data/clusterfuzz-testcase-minimized-assimp_fuzzer-4751812606885888 differ
diff --git a/test/models/glTF2/AnimatedMorphCube/LICENSE.md b/test/models/glTF2/AnimatedMorphCube/LICENSE.md
new file mode 100644
index 000000000..f480b9838
--- /dev/null
+++ b/test/models/glTF2/AnimatedMorphCube/LICENSE.md
@@ -0,0 +1,15 @@
+# LICENSE file for the model: Animated Morph Cube
+
+All files in this directory tree are licensed as indicated below.
+
+* All files directly associated with the model including all text, image and binary files:
+
+  * [CC0 1.0 Universal]("https://creativecommons.org/publicdomain/zero/1.0/legalcode") [SPDX license identifier: "CC0-1.0"]
+
+* This file and all other metadocumentation files including "metadata.json":
+
+  * [Creative Commons Attribtution 4.0 International]("https://creativecommons.org/licenses/by/4.0/legalcode") [SPDX license identifier: "CC-BY-4.0"]
+
+Full license text of these licenses are available at the links above
+
+#### Generated by modelmetadata
\ No newline at end of file
diff --git a/test/models/glTF2/AnimatedMorphCube/README.body.md b/test/models/glTF2/AnimatedMorphCube/README.body.md
new file mode 100644
index 000000000..b6a21c084
--- /dev/null
+++ b/test/models/glTF2/AnimatedMorphCube/README.body.md
@@ -0,0 +1,12 @@
+## Screenshot
+
+![screenshot](screenshot/screenshot.gif)
+
+## Description
+
+The cube contains two morph targets in it:
+
+  * **`thin`** : moves the vertices so that it becomes super-thin 
+  * **`angle`** : moves the vertices so that it forms a ramp
+
+The animation loops, morphing between these two states.
\ No newline at end of file
diff --git a/test/models/glTF2/AnimatedMorphCube/README.md b/test/models/glTF2/AnimatedMorphCube/README.md
new file mode 100644
index 000000000..ca314920e
--- /dev/null
+++ b/test/models/glTF2/AnimatedMorphCube/README.md
@@ -0,0 +1,36 @@
+# Animated Morph Cube
+
+## Tags
+
+[core](../../Models-core.md), [testing](../../Models-testing.md)
+
+## Summary
+
+Demonstrates a simple cube with two simple morph targets and an animation that transitions between them both.
+
+## Operations
+
+* [Display](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/AnimatedMorphCube/glTF-Binary/AnimatedMorphCube.glb) in SampleViewer
+* [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/AnimatedMorphCube/glTF-Binary/AnimatedMorphCube.glb)
+* [Model Directory](./)
+
+## Screenshot
+
+![screenshot](screenshot/screenshot.gif)
+
+## Description
+
+The cube contains two morph targets in it:
+
+  * **`thin`** : moves the vertices so that it becomes super-thin 
+  * **`angle`** : moves the vertices so that it forms a ramp
+
+The animation loops, morphing between these two states.
+
+## Legal
+
+&copy; 2017, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
+
+ - Microsoft for Everything
+
+#### Assembled by modelmetadata
\ No newline at end of file
diff --git a/test/models/glTF2/AnimatedMorphCube/glTF/AnimatedMorphCube.bin b/test/models/glTF2/AnimatedMorphCube/glTF/AnimatedMorphCube.bin
new file mode 100644
index 000000000..7b14a1793
Binary files /dev/null and b/test/models/glTF2/AnimatedMorphCube/glTF/AnimatedMorphCube.bin differ
diff --git a/test/models/glTF2/AnimatedMorphCube/glTF/AnimatedMorphCube.gltf b/test/models/glTF2/AnimatedMorphCube/glTF/AnimatedMorphCube.gltf
new file mode 100644
index 000000000..b1b720147
--- /dev/null
+++ b/test/models/glTF2/AnimatedMorphCube/glTF/AnimatedMorphCube.gltf
@@ -0,0 +1,282 @@
+{
+  "accessors": [
+    {
+      "bufferView": 0,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3"
+    },
+    {
+      "bufferView": 1,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC4"
+    },
+    {
+      "bufferView": 2,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3",
+      "max": [
+        0.0100000035,
+        0.0100000035,
+        0.01
+      ],
+      "min": [
+        -0.0100000044,
+        -0.0100000054,
+        -0.01
+      ]
+    },
+    {
+      "bufferView": 3,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3",
+      "name": "thin"
+    },
+    {
+      "bufferView": 4,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3",
+      "max": [
+        0.0,
+        0.01893253,
+        0.0
+      ],
+      "min": [
+        0.0,
+        0.0,
+        0.0
+      ],
+      "name": "thin"
+    },
+    {
+      "bufferView": 5,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3",
+      "name": "thin"
+    },
+    {
+      "bufferView": 6,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3",
+      "name": "angle"
+    },
+    {
+      "bufferView": 7,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3",
+      "max": [
+        0.0,
+        0.0198908355,
+        0.0
+      ],
+      "min": [
+        0.0,
+        0.0,
+        0.0
+      ],
+      "name": "angle"
+    },
+    {
+      "bufferView": 8,
+      "componentType": 5126,
+      "count": 24,
+      "type": "VEC3",
+      "name": "angle"
+    },
+    {
+      "bufferView": 9,
+      "componentType": 5123,
+      "count": 36,
+      "type": "SCALAR"
+    },
+    {
+      "bufferView": 10,
+      "componentType": 5126,
+      "count": 127,
+      "type": "SCALAR",
+      "max": [
+        4.19999743
+      ],
+      "min": [
+        0.0
+      ]
+    },
+    {
+      "bufferView": 11,
+      "componentType": 5126,
+      "count": 254,
+      "type": "SCALAR"
+    }
+  ],
+  "animations": [
+    {
+      "channels": [
+        {
+          "sampler": 0,
+          "target": {
+            "node": 0,
+            "path": "weights"
+          }
+        }
+      ],
+      "samplers": [
+        {
+          "input": 10,
+          "interpolation": "LINEAR",
+          "output": 11
+        }
+      ],
+      "name": "Square"
+    }
+  ],
+  "asset": {
+    "generator": "glTF Tools for Unity",
+    "version": "2.0"
+  },
+  "bufferViews": [
+    {
+      "buffer": 0,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 288,
+      "byteLength": 384
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 672,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 960,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 1248,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 1536,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 1824,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 2112,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 2400,
+      "byteLength": 288
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 2688,
+      "byteLength": 72
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 2760,
+      "byteLength": 508
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 3268,
+      "byteLength": 1016
+    }
+  ],
+  "buffers": [
+    {
+      "uri": "AnimatedMorphCube.bin",
+      "byteLength": 4284
+    }
+  ],
+  "meshes": [
+    {
+      "primitives": [
+        {
+          "attributes": {
+            "NORMAL": 0,
+            "TANGENT": 1,
+            "POSITION": 2
+          },
+          "indices": 9,
+          "material": 0,
+          "targets": [
+            {
+              "NORMAL": 3,
+              "POSITION": 4,
+              "TANGENT": 5
+            },
+            {
+              "NORMAL": 6,
+              "POSITION": 7,
+              "TANGENT": 8
+            }
+          ]
+        }
+      ],
+      "weights": [
+        0.0,
+        0.0
+      ],
+      "name": "Cube"
+    }
+  ],
+  "materials": [
+    {
+      "pbrMetallicRoughness": {
+        "baseColorFactor": [
+          0.6038274,
+          0.6038274,
+          0.6038274,
+          1.0
+        ],
+        "metallicFactor": 0.0,
+        "roughnessFactor": 0.5
+      },
+      "name": "Material"
+    }
+  ],
+  "nodes": [
+    {
+      "mesh": 0,
+      "rotation": [
+        0.0,
+        0.7071067,
+        -0.7071068,
+        0.0
+      ],
+      "scale": [
+        100.0,
+        100.0,
+        100.0
+      ],
+      "name": "AnimatedMorphCube"
+    }
+  ],
+  "scene": 0,
+  "scenes": [
+    {
+      "nodes": [
+        0
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/models/glTF2/AnimatedMorphSphere/README.md b/test/models/glTF2/AnimatedMorphSphere/README.md
new file mode 100644
index 000000000..d626d5cab
--- /dev/null
+++ b/test/models/glTF2/AnimatedMorphSphere/README.md
@@ -0,0 +1,20 @@
+# Animated Morph Sphere
+
+## Screenshot
+
+![screenshot](screenshot/screenshot.gif)
+
+## Description
+
+The sphere contains two morph targets in it:
+
+  * **`blob`** : moves the vertices so that it becomes a somewhat amorphous fat, blob shape.
+  * **`ship`** : moves the vertices so that it looks a bit like a spaceship, the goal being
+    to just make it a much more complicated morph example than the [cube](../AnimatedMorphCube/README.md).
+
+The animation loops, morphing between these two states.
+
+## License Information
+
+[![CC0](http://i.creativecommons.org/p/zero/1.0/88x31.png)](http://creativecommons.org/publicdomain/zero/1.0/)  
+To the extent possible under law, Microsoft has waived all copyright and related or neighboring rights to this asset.
diff --git a/test/models/glTF2/AnimatedMorphSphere/glTF/AnimatedMorphSphere.bin b/test/models/glTF2/AnimatedMorphSphere/glTF/AnimatedMorphSphere.bin
new file mode 100644
index 000000000..5bc8fc640
--- /dev/null
+++ b/test/models/glTF2/AnimatedMorphSphere/glTF/AnimatedMorphSphere.bin
@@ -0,0 +1,185 @@
+†ô=½uñ>f‡a¿†ô=½uñ>f‡a¿†ô=½uñ>f‡a¿†ô=½uñ>f‡a¿å7±½Çì`?9sð>å7±½Çì`?9sð>å7±½Çì`?9sð>å7±½Çì`?9sð>nk½±"?k�E¿nk½±"?k�E¿nk½±"?k�E¿nk½±"?k�E¿Õw›½ßQE?•ï!?Õw›½ßQE?•ï!?Õw›½ßQE?•ï!?Õw›½ßQE?•ï!?Õw›½ßQE?•ï!¿Õw›½ßQE?•ï!¿Õw›½ßQE?•ï!¿Õw›½ßQE?•ï!¿¹k½°"?j�E?¹k½°"?j�E?¹k½°"?j�E?¹k½°"?j�E?ð7±½Çì`?6sð¾ð7±½Çì`?6sð¾ð7±½Çì`?6sð¾ð7±½Çì`?6sð¾ˆô=½ñ>d‡a?ˆô=½ñ>d‡a?ˆô=½ñ>d‡a?ˆô=½ñ>d‡a?‹*À½_ås?4ø“¾‹*À½_ås?4ø“¾‹*À½_ås?4ø“¾‹*À½_ås?4ø“¾ê¼¢�”>màt?ê¼¢�”>màt?ê¼¢�”>màt?ê¼¢�”>màt?ãÅǽe�}?IÈǽãÅǽe�}?IÈǽãÅǽe�}?IÈǽãÅǽe�}?IÈǽ�¼ËºÈ=dÁ~¿�¼ËºÈ=dÁ~¿�¼ËºÈ=dÁ~¿Î5ê¼÷Á=bÁ~¿A+>½Pâ±=bÁ~¿ù5ê<Á=bÁ~¿f+>=fâ±=bÁ~¿R罪ê›=fÁ~¿R罪ê›=fÁ~¿[뛽Cê=bÁ~¿íà±½u)>=hÁ~¿�Á½Ò3ê<bÁ~¿�Á½Ò3ê<bÁ~¿ZºÈ½)<dÁ~¿Q»È½+)¼bÁ~¿
Á½4ê¼fÁ~¿
Á½4ê¼fÁ~¿ã±½™)>½bÁ~¿\雽vê½fÁ~¿·ë½Ê꛽bÁ~¿·ë½Ê꛽bÁ~¿E'>½xâ±½dÁ~¿ª-ê¼#Á½dÁ~¿!<¼çºÈ½bÁ~¿!<¼çºÈ½bÁ~¿#<<éºÈ½bÁ~¿¾-ê<'Á½dÁ~¿T'>=‚â±½dÁ~¿T'>=‚â±½dÁ~¿×ë=Õ꛽bÁ~¿~ê›=‚ê½dÁ~¿1â±=°)>½dÁ~¿1â±=°)>½dÁ~¿ÂÁ=þ3ê¼aÁ~¿_»È=+)¼bÁ~¿qºÈ=M)<dÁ~¿qºÈ=M)<dÁ~¿CÁ=4ê<aÁ~¿á±=¡)>=fÁ~¿wë›=rê=bÁ~¿wë›=rê=bÁ~¿Šç=Äê›=fÁ~¿”#¼ÂºÈ=dÁ~?”#¼ÂºÈ=dÁ~?”#¼ÂºÈ=dÁ~?Y1ê¼ñÁ=dÁ~?{+>½Râ±=bÁ~?s1ê<þÁ=dÁ~?Š+>=Yâ±=bÁ~?«è½ªê›=dÁ~?«è½ªê›=dÁ~?ø꛽;ê=bÁ~?¯â±½l)>=bÁ~?¾Á½É3ê<aÁ~?¾Á½É3ê<aÁ~?qºÈ½+)<dÁ~?{»È½))¼aÁ~?¶Á½Ü3ê¼dÁ~?¶Á½Ü3ê¼dÁ~?¬â±½{)>½bÁ~?¾ê›½Kê½dÁ~?µè½¬ê›½dÁ~?µè½¬ê›½dÁ~?„+>½Vâ±½bÁ~?f1ê¼üÁ½dÁ~?´&¼½ºÈ½dÁ~?´&¼½ºÈ½dÁ~?='<ÀºÈ½dÁ~?ò1ê<úÁ½dÁ~?Š+>=Vâ±½bÁ~?Š+>=Vâ±½bÁ~?½è=®ê›½dÁ~?Ãê›=Kê½bÁ~?½â±=t)>½bÁ~?½â±=t)>½bÁ~?ÇÁ=á3ê¼dÁ~?Œ»È=7)¼aÁ~?‚ºÈ=8)<dÁ~?‚ºÈ=8)<dÁ~?ÓÁ=á3ê<aÁ~?>â±=ƒ)>=dÁ~?Äê›=Mê=bÁ~?Äê›=Mê=bÁ~?Áè=³ê›=dÁ~?ÎÅǽe�}?FÈÇ=ÎÅǽe�}?FÈÇ=ÎÅǽe�}?FÈÇ=ÎÅǽe�}?FÈÇ=ê¼³�”>kàt¿ê¼³�”>kàt¿ê¼³�”>kàt¿ê¼³�”>kàt¿e*À½cås?'ø“>e*À½cås?'ø“>e*À½cås?'ø“>e*À½cås?'ø“>Æ꓾îÎs?FÈÇ=Æ꓾îÎs?FÈÇ=Æ꓾îÎs?FÈÇ=Æ꓾îÎs?FÈÇ=òV­½ÛŽ>màt¿òV­½ÛŽ>màt¿òV­½ÛŽ>màt¿òV­½ÛŽ>màt¿£HŽ¾è…j?Dø“>£HŽ¾è…j?Dø“>£HŽ¾è…j?Dø“>£HŽ¾è…j?Dø“>\¦¾ŽÔç>f‡a¿\¦¾ŽÔç>f‡a¿\¦¾ŽÔç>f‡a¿\¦¾ŽÔç>f‡a¿m7ƒ¾ûGX?sð>m7ƒ¾ûGX?sð>m7ƒ¾ûGX?sð>m7ƒ¾ûGX?sð>E=¾Ü?g�E¿E=¾Ü?g�E¿E=¾Ü?g�E¿E=¾Ü?g�E¿o9f¾™¼=? ï!?o9f¾™¼=? ï!?o9f¾™¼=? ï!?o9f¾™¼=? ï!?s9f¾š¼=?žï!¿s9f¾š¼=?žï!¿s9f¾š¼=?žï!¿s9f¾š¼=?žï!¿==¾Ü?j�E?==¾Ü?j�E?==¾Ü?j�E?==¾Ü?j�E?j7ƒ¾øGX?(sð¾j7ƒ¾øGX?(sð¾j7ƒ¾øGX?(sð¾j7ƒ¾øGX?(sð¾[¦¾�Ôç>d‡a?[¦¾�Ôç>d‡a?[¦¾�Ôç>d‡a?[¦¾�Ôç>d‡a?ŸHŽ¾è…j?Iø“¾ŸHŽ¾è…j?Iø“¾ŸHŽ¾è…j?Iø“¾ŸHŽ¾è…j?Iø“¾«W­½ÛŽ>kàt?«W­½ÛŽ>kàt?«W­½ÛŽ>kàt?«W­½ÛŽ>kàt?À꓾îÎs?FÈǽÀ꓾îÎs?FÈǽÀ꓾îÎs?FÈǽÀ꓾îÎs?FÈǽ.Ž™¾¤?i�E?.Ž™¾¤?i�E?.Ž™¾¤?i�E?.Ž™¾¤?i�E?tÕ¾nSG?sð¾tÕ¾nSG?sð¾tÕ¾nSG?sð¾tÕ¾nSG?sð¾xgd¾í§Õ>b‡a?xgd¾í§Õ>b‡a?xgd¾í§Õ>b‡a?xgd¾í§Õ>b‡a?Zç¾<#X?\ø“¾Zç¾<#X?\ø“¾Zç¾<#X?\ø“¾Zç¾<#X?\ø“¾r¾¾¨ƒ>màt?r¾¾¨ƒ>màt?r¾¾¨ƒ>màt?r¾¾¨ƒ>màt?@4ð¾ï±`?öÇǽ@4ð¾ï±`?öÇǽ@4ð¾ï±`?öÇǽ@4ð¾ï±`?öÇǽ@4ð¾ï±`?öÇÇ=@4ð¾ï±`?öÇÇ=@4ð¾ï±`?öÇÇ=@4ð¾ï±`?öÇÇ=l¾¾¨ƒ>màt¿l¾¾¨ƒ>màt¿l¾¾¨ƒ>màt¿l¾¾¨ƒ>màt¿\ç¾=#X?Pø“>\ç¾=#X?Pø“>\ç¾=#X?Pø“>\ç¾=#X?Pø“>Igd¾ë§Õ>d‡a¿Igd¾ë§Õ>d‡a¿Igd¾ë§Õ>d‡a¿Igd¾ë§Õ>d‡a¿~Õ¾qSG?sð>~Õ¾qSG?sð>~Õ¾qSG?sð>~Õ¾qSG?sð>1Ž™¾¤?g�E¿1Ž™¾¤?g�E¿1Ž™¾¤?g�E¿1Ž™¾¤?g�E¿ƒîº¾ÇÜ.?Ÿï!?ƒîº¾ÇÜ.?Ÿï!?ƒîº¾ÇÜ.?Ÿï!?ƒîº¾ÇÜ.?Ÿï!?�ÆÜ.?¢ï!¿�ÆÜ.?¢ï!¿�ÆÜ.?¢ï!¿�ÆÜ.?¢ï!¿{y¿Cr=?Eø“>{y¿Cr=?Eø“>{y¿Cr=?Eø“>{y¿Cr=?Eø“>z°™¾gE»>f‡a¿z°™¾gE»>f‡a¿z°™¾gE»>f‡a¿z°™¾gE»>f‡a¿ža¿éµ.?!sð>ža¿éµ.?!sð>ža¿éµ.?!sð>ža¿éµ.?!sð>¦¦Î¾Îû>f�E¿¦¦Î¾Îû>f�E¿¦¦Î¾Îû>f�E¿¦¦Î¾Îû>f�E¿b‘û¾©D?šï!?b‘û¾©D?šï!?b‘û¾©D?šï!?b‘û¾©D?šï!?b‘û¾¨D?�ï!¿b‘û¾¨D?�ï!¿b‘û¾¨D?�ï!¿b‘û¾¨D?�ï!¿§¦Î¾Îû>j�E?§¦Î¾Îû>j�E?§¦Î¾Îû>j�E?§¦Î¾Îû>j�E?�a¿éµ.?sð¾�a¿éµ.?sð¾�a¿éµ.?sð¾�a¿éµ.?sð¾g°™¾iE»>i‡a?g°™¾iE»>i‡a?g°™¾iE»>i‡a?g°™¾iE»>i‡a?zy¿?r=?Oø“¾zy¿?r=?Oø“¾zy¿?r=?Oø“¾zy¿?r=?Oø“¾i=¾¨Ëf>kàt?i=¾¨Ëf>kàt?i=¾¨Ëf>kàt?i=¾¨Ëf>kàt?O¡!¿eòD?dÈǽO¡!¿eòD?dÈǽO¡!¿eòD?dÈǽO¡!¿eòD?dÈǽN¡!¿fòD?eÈÇ=N¡!¿fòD?eÈÇ=N¡!¿fòD?eÈÇ=N¡!¿fòD?eÈÇ=i=¾ÅËf>jàt¿i=¾ÅËf>jàt¿i=¾ÅËf>jàt¿i=¾ÅËf>jàt¿]E»¾}°™>f‡a?]E»¾}°™>f‡a?]E»¾}°™>f‡a?]E»¾}°™>f‡a?Cr=¿{y?Bø“¾Cr=¿{y?Bø“¾Cr=¿{y?Bø“¾Cr=¿{y?Bø“¾vËf¾Ãh=>sàt?vËf¾Ãh=>sàt?vËf¾Ãh=>sàt?vËf¾Ãh=>sàt?hòD¿K¡!?uÈǽhòD¿K¡!?uÈǽhòD¿K¡!?uÈǽhòD¿K¡!?uÈǽhòD¿J¡!?sÈÇ=hòD¿J¡!?sÈÇ=hòD¿J¡!?sÈÇ=hòD¿J¡!?sÈÇ=œËf¾Ïh=>oàt¿œËf¾Ïh=>oàt¿œËf¾Ïh=>oàt¿œËf¾Ïh=>oàt¿Br=¿{y?Bø“>Br=¿{y?Bø“>Br=¿{y?Bø“>Br=¿{y?Bø“>kE»¾}°™>b‡a¿kE»¾}°™>b‡a¿kE»¾}°™>b‡a¿kE»¾}°™>b‡a¿êµ.¿�a?sð>êµ.¿�a?sð>êµ.¿�a?sð>êµ.¿�a?sð>Îû¾�¦Î>g�E¿Îû¾�¦Î>g�E¿Îû¾�¦Î>g�E¿Îû¾�¦Î>g�E¿¦D¿]‘û>žï!?¦D¿]‘û>žï!?¦D¿]‘û>žï!?¦D¿]‘û>žï!?¦D¿]‘û>žï!¿¦D¿]‘û>žï!¿¦D¿]‘û>žï!¿¦D¿]‘û>žï!¿Îû¾˜¦Î>i�E?Îû¾˜¦Î>i�E?Îû¾˜¦Î>i�E?Îû¾˜¦Î>i�E?êµ.¿—a?*sð¾êµ.¿—a?*sð¾êµ.¿—a?*sð¾êµ.¿—a?*sð¾ô§Õ¾0gd>d‡a¿ô§Õ¾0gd>d‡a¿ô§Õ¾0gd>d‡a¿ô§Õ¾0gd>d‡a¿qSG¿mÕ>sð>qSG¿mÕ>sð>qSG¿mÕ>sð>qSG¿mÕ>sð>¤¿1Ž™>k�E¿¤¿1Ž™>k�E¿¤¿1Ž™>k�E¿¤¿1Ž™>k�E¿ÊÜ.¿�îº>›ï!?ÊÜ.¿�îº>›ï!?ÊÜ.¿�îº>›ï!?ÊÜ.¿�îº>›ï!?ÊÜ.¿„îº>�ï!¿ÊÜ.¿„îº>�ï!¿ÊÜ.¿„îº>�ï!¿ÊÜ.¿„îº>�ï!¿¤¿8Ž™>k�E?¤¿8Ž™>k�E?¤¿8Ž™>k�E?¤¿8Ž™>k�E?nSG¿tÕ>sð¾nSG¿tÕ>sð¾nSG¿tÕ>sð¾nSG¿tÕ>sð¾÷§Õ¾+gd>b‡a?÷§Õ¾+gd>b‡a?÷§Õ¾+gd>b‡a?÷§Õ¾+gd>b‡a?F#X¿Fç>Cø“¾F#X¿Fç>Cø“¾F#X¿Fç>Cø“¾F#X¿Fç>Cø“¾¨ƒ¾a¾>màt?¨ƒ¾a¾>màt?¨ƒ¾a¾>màt?¨ƒ¾a¾>màt?ò±`¿04ð>~Èǽò±`¿04ð>~Èǽò±`¿04ð>~Èǽò±`¿04ð>~Èǽò±`¿.4ð>~ÈÇ=ò±`¿.4ð>~ÈÇ=ò±`¿.4ð>~ÈÇ=ò±`¿.4ð>~ÈÇ=¨ƒ¾i¾>màt¿¨ƒ¾i¾>màt¿¨ƒ¾i¾>màt¿¨ƒ¾i¾>màt¿G#X¿Gç>=ø“>G#X¿Gç>=ø“>G#X¿Gç>=ø“>G#X¿Gç>=ø“>é…j¿ŸHŽ>Aø“¾é…j¿ŸHŽ>Aø“¾é…j¿ŸHŽ>Aø“¾é…j¿ŸHŽ>Aø“¾ÿÚŽ¾ÉV­=qàt?ÿÚŽ¾ÉV­=qàt?ÿÚŽ¾ÉV­=qàt?ÿÚŽ¾ÉV­=qàt?îÎs¿¼ê“>�ÈǽîÎs¿¼ê“>�ÈǽîÎs¿¼ê“>�ÈǽîÎs¿¼ê“>�ÈǽîÎs¿¼ê“>�ÈÇ=îÎs¿¼ê“>�ÈÇ=îÎs¿¼ê“>�ÈÇ=îÎs¿¼ê“>�ÈÇ=ÛŽ¾ÅV­=kàt¿ÛŽ¾ÅV­=kàt¿ÛŽ¾ÅV­=kàt¿ÛŽ¾ÅV­=kàt¿é…j¿ŸHŽ>@ø“>é…j¿ŸHŽ>@ø“>é…j¿ŸHŽ>@ø“>é…j¿ŸHŽ>@ø“>’Ôç¾N¦>f‡a¿’Ôç¾N¦>f‡a¿’Ôç¾N¦>f‡a¿’Ôç¾N¦>f‡a¿ÿGX¿b7ƒ>sð>ÿGX¿b7ƒ>sð>ÿGX¿b7ƒ>sð>ÿGX¿b7ƒ>sð>Ü¿1=>i�E¿Ü¿1=>i�E¿Ü¿1=>i�E¿Ü¿1=>i�E¿�¼=¿H9f>Ÿï!?�¼=¿H9f>Ÿï!?�¼=¿H9f>Ÿï!?�¼=¿H9f>Ÿï!?�¼=¿H9f>Ÿï!¿�¼=¿H9f>Ÿï!¿�¼=¿H9f>Ÿï!¿�¼=¿H9f>Ÿï!¿Ü¿>=>g�E?Ü¿>=>g�E?Ü¿>=>g�E?Ü¿>=>g�E?ÿGX¿[7ƒ>sð¾ÿGX¿[7ƒ>sð¾ÿGX¿[7ƒ>sð¾ÿGX¿[7ƒ>sð¾‹Ôç¾Z¦>f‡a?‹Ôç¾Z¦>f‡a?‹Ôç¾Z¦>f‡a?‹Ôç¾Z¦>f‡a?Ìì`¿›9±=sð>Ìì`¿›9±=sð>Ìì`¿›9±=sð>Ìì`¿›9±=sð>²"¿ðm=f�E¿²"¿ðm=f�E¿²"¿ðm=f�E¿²"¿ðm=f�E¿ÒQE¿yy›=Ÿï!?ÒQE¿yy›=Ÿï!?ÒQE¿yy›=Ÿï!?ÒQE¿yy›=Ÿï!?ÒQE¿yy›=Ÿï!¿ÒQE¿yy›=Ÿï!¿ÒQE¿yy›=Ÿï!¿ÒQE¿yy›=Ÿï!¿²"¿•m=f�E?²"¿•m=f�E?²"¿•m=f�E?²"¿•m=f�E?Çì`¿¢9±=#sð¾Çì`¿¢9±=#sð¾Çì`¿¢9±=#sð¾Çì`¿¢9±=#sð¾ñ¾
÷==a‡a?ñ¾
÷==a‡a?ñ¾
÷==a‡a?ñ¾
÷==a‡a?Zås¿:,À==ø“¾Zås¿:,À==ø“¾Zås¿:,À==ø“¾Zås¿:,À==ø“¾›�”¾Æê<oàt?›�”¾Æê<oàt?›�”¾Æê<oàt?›�”¾Æê<oàt?]�}¿óÇÇ=´Èǽ]�}¿óÇÇ=´Èǽ]�}¿óÇÇ=´Èǽ]�}¿óÇÇ=´Èǽ]�}¿óÇÇ=´ÈÇ=]�}¿óÇÇ=´ÈÇ=]�}¿óÇÇ=´ÈÇ=]�}¿óÇÇ=´ÈÇ=®�”¾ê<kàt¿®�”¾ê<kàt¿®�”¾ê<kàt¿®�”¾ê<kàt¿Zås¿:,À=<ø“>Zås¿:,À=<ø“>Zås¿:,À=<ø“>Zås¿:,À=<ø“>qñ¾÷==d‡a¿qñ¾÷==d‡a¿qñ¾÷==d‡a¿qñ¾÷==d‡a¿›�”¾#ê¼oàt?›�”¾#ê¼oàt?›�”¾#ê¼oàt?›�”¾#ê¼oàt?[�}¿(ÈǽÛÈǽ[�}¿(ÈǽÛÈǽ[�}¿(ÈǽÛÈǽ[�}¿(ÈǽÛÈǽ[�}¿(ÈǽÛÈÇ=[�}¿(ÈǽÛÈÇ=[�}¿(ÈǽÛÈÇ=[�}¿(ÈǽÛÈÇ=®�”¾ê¼kàt¿®�”¾ê¼kàt¿®�”¾ê¼kàt¿®�”¾ê¼kàt¿Zås¿q,À½7ø“>Zås¿q,À½7ø“>Zås¿q,À½7ø“>Zås¿q,À½7ø“>nñ¾¸÷=½f‡a¿nñ¾¸÷=½f‡a¿nñ¾¸÷=½f‡a¿nñ¾¸÷=½f‡a¿Êì`¿Õ9±½sð>Êì`¿Õ9±½sð>Êì`¿Õ9±½sð>Êì`¿Õ9±½sð>­"¿ým½k�E¿­"¿ým½k�E¿­"¿ým½k�E¿­"¿ým½k�E¿ÕQE¿wy›½�ï!?ÕQE¿wy›½�ï!?ÕQE¿wy›½�ï!?ÕQE¿wy›½�ï!?ÕQE¿wy›½�ï!¿ÕQE¿wy›½�ï!¿ÕQE¿wy›½�ï!¿ÕQE¿wy›½�ï!¿¬"¿Bn½k�E?¬"¿Bn½k�E?¬"¿Bn½k�E?¬"¿Bn½k�E?Çì`¿¢9±½#sð¾Çì`¿¢9±½#sð¾Çì`¿¢9±½#sð¾Çì`¿¢9±½#sð¾sñ¾H÷=½d‡a?sñ¾H÷=½d‡a?sñ¾H÷=½d‡a?sñ¾H÷=½d‡a?Zås¿p,À½6ø“¾Zås¿p,À½6ø“¾Zås¿p,À½6ø“¾Zås¿p,À½6ø“¾Ü¿4=¾i�E¿Ü¿4=¾i�E¿Ü¿4=¾i�E¿Ü¿4=¾i�E¿ž¼=¿h9f¾šï!?ž¼=¿h9f¾šï!?ž¼=¿h9f¾šï!?ž¼=¿h9f¾šï!?ž¼=¿h9f¾šï!¿ž¼=¿h9f¾šï!¿ž¼=¿h9f¾šï!¿ž¼=¿h9f¾šï!¿Ü¿B=¾j�E?Ü¿B=¾j�E?Ü¿B=¾j�E?Ü¿B=¾j�E?øGX¿i7ƒ¾(sð¾øGX¿i7ƒ¾(sð¾øGX¿i7ƒ¾(sð¾øGX¿i7ƒ¾(sð¾‘Ôç¾g¦¾b‡a?‘Ôç¾g¦¾b‡a?‘Ôç¾g¦¾b‡a?‘Ôç¾g¦¾b‡a?ë…j¿ŸHŽ¾3ø“¾ë…j¿ŸHŽ¾3ø“¾ë…j¿ŸHŽ¾3ø“¾ë…j¿ŸHŽ¾3ø“¾ÛŽ¾àV­½kàt?ÛŽ¾àV­½kàt?ÛŽ¾àV­½kàt?ÛŽ¾àV­½kàt?ìÎs¿»ê“¾àÈǽìÎs¿»ê“¾àÈǽìÎs¿»ê“¾àÈǽìÎs¿»ê“¾àÈǽìÎs¿»ê“¾àÈÇ=ìÎs¿»ê“¾àÈÇ=ìÎs¿»ê“¾àÈÇ=ìÎs¿»ê“¾àÈÇ=
ÛŽ¾ùV­½oàt¿
ÛŽ¾ùV­½oàt¿
ÛŽ¾ùV­½oàt¿
ÛŽ¾ùV­½oàt¿é…j¿¡HŽ¾6ø“>é…j¿¡HŽ¾6ø“>é…j¿¡HŽ¾6ø“>é…j¿¡HŽ¾6ø“>ŽÔç¾\¦¾f‡a¿ŽÔç¾\¦¾f‡a¿ŽÔç¾\¦¾f‡a¿ŽÔç¾\¦¾f‡a¿þGX¿c7ƒ¾sð>þGX¿c7ƒ¾sð>þGX¿c7ƒ¾sð>þGX¿c7ƒ¾sð>ì±`¿?4ð¾ÛÈǽì±`¿?4ð¾ÛÈǽì±`¿?4ð¾ÛÈǽì±`¿?4ð¾ÛÈǽì±`¿=4ð¾ÙÈÇ=ì±`¿=4ð¾ÙÈÇ=ì±`¿=4ð¾ÙÈÇ=ì±`¿=4ð¾ÙÈÇ=,¨ƒ¾n¾¾jàt¿,¨ƒ¾n¾¾jàt¿,¨ƒ¾n¾¾jàt¿,¨ƒ¾n¾¾jàt¿B#X¿cç¾4ø“>B#X¿cç¾4ø“>B#X¿cç¾4ø“>B#X¿cç¾4ø“>ó§Õ¾5gd¾d‡a¿ó§Õ¾5gd¾d‡a¿ó§Õ¾5gd¾d‡a¿ó§Õ¾5gd¾d‡a¿mSG¿xÕ¾sð>mSG¿xÕ¾sð>mSG¿xÕ¾sð>mSG¿xÕ¾sð> ¤¿?Ž™¾e�E¿ ¤¿?Ž™¾e�E¿ ¤¿?Ž™¾e�E¿ ¤¿?Ž™¾e�E¿ÈÜ.¿“˜ï!?ÈÜ.¿“˜ï!?ÈÜ.¿“˜ï!?ÈÜ.¿“˜ï!?ÈÜ.¿“šï!¿ÈÜ.¿“šï!¿ÈÜ.¿“šï!¿ÈÜ.¿“šï!¿¤¿1Ž™¾k�E?¤¿1Ž™¾k�E?¤¿1Ž™¾k�E?¤¿1Ž™¾k�E?kSG¿tÕ¾+sð¾kSG¿tÕ¾+sð¾kSG¿tÕ¾+sð¾kSG¿tÕ¾+sð¾ð§Õ¾0gd¾d‡a?ð§Õ¾0gd¾d‡a?ð§Õ¾0gd¾d‡a?ð§Õ¾0gd¾d‡a?B#X¿cç¾2ø“¾B#X¿cç¾2ø“¾B#X¿cç¾2ø“¾B#X¿cç¾2ø“¾¨ƒ¾e¾¾qàt?¨ƒ¾e¾¾qàt?¨ƒ¾e¾¾qàt?¨ƒ¾e¾¾qàt?§D¿k‘û¾šï!?§D¿k‘û¾šï!?§D¿k‘û¾šï!?§D¿k‘û¾šï!?¤D¿l‘û¾œï!¿¤D¿l‘û¾œï!¿¤D¿l‘û¾œï!¿¤D¿l‘û¾œï!¿Îû¾¨¦Î¾k�E?Îû¾¨¦Î¾k�E?Îû¾¨¦Î¾k�E?Îû¾¨¦Î¾k�E?çµ.¿›a¿-sð¾çµ.¿›a¿-sð¾çµ.¿›a¿-sð¾çµ.¿›a¿-sð¾kE»¾„°™¾b‡a?kE»¾„°™¾b‡a?kE»¾„°™¾b‡a?kE»¾„°™¾b‡a?Hr=¿vy¿8ø“¾Hr=¿vy¿8ø“¾Hr=¿vy¿8ø“¾Hr=¿vy¿8ø“¾Ìf¾¾h=¾jàt?Ìf¾¾h=¾jàt?Ìf¾¾h=¾jàt?Ìf¾¾h=¾jàt?bòD¿P¡!¿ËÈǽbòD¿P¡!¿ËÈǽbòD¿P¡!¿ËÈǽbòD¿P¡!¿ËÈǽbòD¿P¡!¿ËÈÇ=bòD¿P¡!¿ËÈÇ=bòD¿P¡!¿ËÈÇ=bòD¿P¡!¿ËÈÇ=ËËf¾Ðh=¾kàt¿ËËf¾Ðh=¾kàt¿ËËf¾Ðh=¾kàt¿ËËf¾Ðh=¾kàt¿Hr=¿wy¿5ø“>Hr=¿wy¿5ø“>Hr=¿wy¿5ø“>Hr=¿wy¿5ø“>^E»¾{°™¾g‡a¿^E»¾{°™¾g‡a¿^E»¾{°™¾g‡a¿^E»¾{°™¾g‡a¿ëµ.¿›a¿"sð>ëµ.¿›a¿"sð>ëµ.¿›a¿"sð>ëµ.¿›a¿"sð>Îû¾¦¦Î¾f�E¿Îû¾¦¦Î¾f�E¿Îû¾¦¦Î¾f�E¿Îû¾¦¦Î¾f�E¿O¡!¿dòD¿¶ÈÇ=O¡!¿dòD¿¶ÈÇ=O¡!¿dòD¿¶ÈÇ=O¡!¿dòD¿¶ÈÇ=¿h=¾ÒËf¾màt¿¿h=¾ÒËf¾màt¿¿h=¾ÒËf¾màt¿¿h=¾ÒËf¾màt¿zy¿Fr=¿8ø“>zy¿Fr=¿8ø“>zy¿Fr=¿8ø“>zy¿Fr=¿8ø“>z°™¾lE»¾d‡a¿z°™¾lE»¾d‡a¿z°™¾lE»¾d‡a¿z°™¾lE»¾d‡a¿›a¿çµ.¿,sð>›a¿çµ.¿,sð>›a¿çµ.¿,sð>›a¿çµ.¿,sð>¯¦Î¾Îû¾e�E¿¯¦Î¾Îû¾e�E¿¯¦Î¾Îû¾e�E¿¯¦Î¾Îû¾e�E¿\‘û¾ªD¿œï!?\‘û¾ªD¿œï!?\‘û¾ªD¿œï!?\‘û¾ªD¿œï!?]‘û¾ªD¿šï!¿]‘û¾ªD¿šï!¿]‘û¾ªD¿šï!¿]‘û¾ªD¿šï!¿Ÿ¦Î¾Îû¾j�E?Ÿ¦Î¾Îû¾j�E?Ÿ¦Î¾Îû¾j�E?Ÿ¦Î¾Îû¾j�E?˜a¿çµ.¿3sð¾˜a¿çµ.¿3sð¾˜a¿çµ.¿3sð¾˜a¿çµ.¿3sð¾b°™¾rE»¾g‡a?b°™¾rE»¾g‡a?b°™¾rE»¾g‡a?b°™¾rE»¾g‡a?zy¿Fr=¿8ø“¾zy¿Fr=¿8ø“¾zy¿Fr=¿8ø“¾zy¿Fr=¿8ø“¾Äh=¾»Ëf¾màt?Äh=¾»Ëf¾màt?Äh=¾»Ëf¾màt?Äh=¾»Ëf¾màt?O¡!¿dòD¿¶ÈǽO¡!¿dòD¿¶ÈǽO¡!¿dòD¿¶ÈǽO¡!¿dòD¿¶Èǽ/Ž™¾¤¿g�E?/Ž™¾¤¿g�E?/Ž™¾¤¿g�E?/Ž™¾¤¿g�E?bÕ¾mSG¿3sð¾bÕ¾mSG¿3sð¾bÕ¾mSG¿3sð¾bÕ¾mSG¿3sð¾gd¾ù§Õ¾d‡a?gd¾ù§Õ¾d‡a?gd¾ù§Õ¾d‡a?gd¾ù§Õ¾d‡a?Sç¾D#X¿7ø“¾Sç¾D#X¿7ø“¾Sç¾D#X¿7ø“¾Sç¾D#X¿7ø“¾y¾¾¨ƒ¾màt?y¾¾¨ƒ¾màt?y¾¾¨ƒ¾màt?y¾¾¨ƒ¾màt?/4ð¾ñ±`¿ËÈǽ/4ð¾ñ±`¿ËÈǽ/4ð¾ñ±`¿ËÈǽ/4ð¾ñ±`¿ËÈǽ14ð¾ñ±`¿ËÈÇ=14ð¾ñ±`¿ËÈÇ=14ð¾ñ±`¿ËÈÇ=14ð¾ñ±`¿ËÈÇ=y¾¾¨ƒ¾kàt¿y¾¾¨ƒ¾kàt¿y¾¾¨ƒ¾kàt¿y¾¾¨ƒ¾kàt¿Qç¾D#X¿>ø“>Qç¾D#X¿>ø“>Qç¾D#X¿>ø“>Qç¾D#X¿>ø“>Ngd¾î§Õ¾b‡a¿Ngd¾î§Õ¾b‡a¿Ngd¾î§Õ¾b‡a¿Ngd¾î§Õ¾b‡a¿fÕ¾nSG¿+sð>fÕ¾nSG¿+sð>fÕ¾nSG¿+sð>fÕ¾nSG¿+sð>5Ž™¾¤¿g�E¿5Ž™¾¤¿g�E¿5Ž™¾¤¿g�E¿5Ž™¾¤¿g�E¿‚ÌÜ.¿™ï!?‚ÌÜ.¿™ï!?‚ÌÜ.¿™ï!?‚ÌÜ.¿™ï!?{ËÜ.¿šï!¿{ËÜ.¿šï!¿{ËÜ.¿šï!¿{ËÜ.¿šï!¿­W­½ÛŽ¾jàt¿­W­½ÛŽ¾jàt¿­W­½ÛŽ¾jàt¿­W­½ÛŽ¾jàt¿˜HŽ¾í…j¿2ø“>˜HŽ¾í…j¿2ø“>˜HŽ¾í…j¿2ø“>˜HŽ¾í…j¿2ø“>^¦¾‹Ôç¾f‡a¿^¦¾‹Ôç¾f‡a¿^¦¾‹Ôç¾f‡a¿^¦¾‹Ôç¾f‡a¿V7ƒ¾ùGX¿0sð>V7ƒ¾ùGX¿0sð>V7ƒ¾ùGX¿0sð>V7ƒ¾ùGX¿0sð>:=¾Ü¿c�E¿:=¾Ü¿c�E¿:=¾Ü¿c�E¿:=¾Ü¿c�E¿_9f¾ ¼=¿—ï!?_9f¾ ¼=¿—ï!?_9f¾ ¼=¿—ï!?_9f¾ ¼=¿—ï!?_9f¾ ¼=¿—ï!¿_9f¾ ¼=¿—ï!¿_9f¾ ¼=¿—ï!¿_9f¾ ¼=¿—ï!¿0=¾Ü¿i�E?0=¾Ü¿i�E?0=¾Ü¿i�E?0=¾Ü¿i�E?U7ƒ¾øGX¿3sð¾U7ƒ¾øGX¿3sð¾U7ƒ¾øGX¿3sð¾U7ƒ¾øGX¿3sð¾_¦¾“Ôç¾d‡a?_¦¾“Ôç¾d‡a?_¦¾“Ôç¾d‡a?_¦¾“Ôç¾d‡a?™HŽ¾í…j¿2ø“¾™HŽ¾í…j¿2ø“¾™HŽ¾í…j¿2ø“¾™HŽ¾í…j¿2ø“¾W­½
ÛŽ¾màt?W­½
ÛŽ¾màt?W­½
ÛŽ¾màt?W­½
ÛŽ¾màt?·ê“¾ìÎs¿&Éǽ·ê“¾ìÎs¿&Éǽ·ê“¾ìÎs¿&Éǽ·ê“¾ìÎs¿&Éǽ·ê“¾ìÎs¿&ÉÇ=·ê“¾ìÎs¿&ÉÇ=·ê“¾ìÎs¿&ÉÇ=·ê“¾ìÎs¿&ÉÇ=£9±½Äì`¿-sð¾£9±½Äì`¿-sð¾£9±½Äì`¿-sð¾£9±½Äì`¿-sð¾ó÷=½rñ¾b‡a?ó÷=½rñ¾b‡a?ó÷=½rñ¾b‡a?ó÷=½rñ¾b‡a??,À½Xås¿Bø“¾?,À½Xås¿Bø“¾?,À½Xås¿Bø“¾?,À½Xås¿Bø“¾þ꼟�”¾oàt?þ꼟�”¾oàt?þ꼟�”¾oàt?þ꼟�”¾oàt?ãÇǽ]�}¿ÇÈǽãÇǽ]�}¿ÇÈǽãÇǽ]�}¿ÇÈǽãÇǽ]�}¿ÇÈǽãÇǽ]�}¿ÇÈÇ=ãÇǽ]�}¿ÇÈÇ=ãÇǽ]�}¿ÇÈÇ=ãÇǽ]�}¿ÇÈÇ=ýê¼®�”¾kàt¿ýê¼®�”¾kàt¿ýê¼®�”¾kàt¿ýê¼®�”¾kàt¿G,À½Xås¿Bø“>G,À½Xås¿Bø“>G,À½Xås¿Bø“>G,À½Xås¿Bø“>÷=½kñ¾g‡a¿÷=½kñ¾g‡a¿÷=½kñ¾g‡a¿÷=½kñ¾g‡a¿«9±½Çì`¿#sð>«9±½Çì`¿#sð>«9±½Çì`¿#sð>«9±½Çì`¿#sð>úm½±"¿i�E¿úm½±"¿i�E¿úm½±"¿i�E¿úm½±"¿i�E¿<y›½ÛQE¿•ï!?<y›½ÛQE¿•ï!?<y›½ÛQE¿•ï!?<y›½ÛQE¿•ï!?<y›½ÛQE¿•ï!¿<y›½ÛQE¿•ï!¿<y›½ÛQE¿•ï!¿<y›½ÛQE¿•ï!¿šm½¬"¿l�E?šm½¬"¿l�E?šm½¬"¿l�E?šm½¬"¿l�E?l,À=Xås¿<ø“>l,À=Xås¿<ø“>l,À=Xås¿<ø“>l,À=Xås¿<ø“>÷==fñ¾i‡a¿÷==fñ¾i‡a¿÷==fñ¾i‡a¿÷==fñ¾i‡a¿Â9±=Âì`¿4sð>Â9±=Âì`¿4sð>Â9±=Âì`¿4sð>Â9±=Âì`¿4sð>
n=¶"¿a�E¿
n=¶"¿a�E¿
n=¶"¿a�E¿
n=¶"¿a�E¿ƒy›=ÞQE¿�ï!?ƒy›=ÞQE¿�ï!?ƒy›=ÞQE¿�ï!?ƒy›=ÞQE¿�ï!?ƒy›=ÞQE¿�ï!¿ƒy›=ÞQE¿�ï!¿ƒy›=ÞQE¿�ï!¿ƒy›=ÞQE¿�ï!¿An=®"¿i�E?An=®"¿i�E?An=®"¿i�E?An=®"¿i�E?¾9±=¿ì`¿Asð¾¾9±=¿ì`¿Asð¾¾9±=¿ì`¿Asð¾¾9±=¿ì`¿Asð¾÷==wñ¾b‡a?÷==wñ¾b‡a?÷==wñ¾b‡a?÷==wñ¾b‡a?l,À=Xås¿<ø“¾l,À=Xås¿<ø“¾l,À=Xås¿<ø“¾l,À=Xås¿<ø“¾Óê<��”¾oàt?Óê<��”¾oàt?Óê<��”¾oàt?Óê<��”¾oàt?6ÈÇ=[�}¿ÕÈǽ6ÈÇ=[�}¿ÕÈǽ6ÈÇ=[�}¿ÕÈǽ6ÈÇ=[�}¿ÕÈǽ4ÈÇ=[�}¿ÕÈÇ=4ÈÇ=[�}¿ÕÈÇ=4ÈÇ=[�}¿ÕÈÇ=4ÈÇ=[�}¿ÕÈÇ=Îê<«�”¾kàt¿Îê<«�”¾kàt¿Îê<«�”¾kàt¿Îê<«�”¾kàt¿^¦>ŽÔç¾d‡a?^¦>ŽÔç¾d‡a?^¦>ŽÔç¾d‡a?^¦>ŽÔç¾d‡a?ŸHŽ>ï…j¿#ø“¾ŸHŽ>ï…j¿#ø“¾ŸHŽ>ï…j¿#ø“¾ŸHŽ>ï…j¿#ø“¾W­=ÛŽ¾màt?W­=ÛŽ¾màt?W­=ÛŽ¾màt?W­=ÛŽ¾màt?Âê“>ìÎs¿ÉǽÂê“>ìÎs¿ÉǽÂê“>ìÎs¿ÉǽÂê“>ìÎs¿ÉǽÂê“>ìÎs¿ÉÇ=Âê“>ìÎs¿ÉÇ=Âê“>ìÎs¿ÉÇ=Âê“>ìÎs¿ÉÇ=W­=ÛŽ¾kàt¿W­=ÛŽ¾kàt¿W­=ÛŽ¾kàt¿W­=ÛŽ¾kàt¿ŸHŽ>ï…j¿#ø“>ŸHŽ>ï…j¿#ø“>ŸHŽ>ï…j¿#ø“>ŸHŽ>ï…j¿#ø“>\¦>ŠÔç¾g‡a¿\¦>ŠÔç¾g‡a¿\¦>ŠÔç¾g‡a¿\¦>ŠÔç¾g‡a¿h7ƒ>ôGX¿;sð>h7ƒ>ôGX¿;sð>h7ƒ>ôGX¿;sð>h7ƒ>ôGX¿;sð>:=>Ü¿e�E¿:=>Ü¿e�E¿:=>Ü¿e�E¿:=>Ü¿e�E¿u9f> ¼=¿–ï!?u9f> ¼=¿–ï!?u9f> ¼=¿–ï!?u9f> ¼=¿–ï!?u9f> ¼=¿–ï!¿u9f> ¼=¿–ï!¿u9f> ¼=¿–ï!¿u9f> ¼=¿–ï!¿G=>Ü¿g�E?G=>Ü¿g�E?G=>Ü¿g�E?G=>Ü¿g�E?e7ƒ>ïGX¿Msð¾e7ƒ>ïGX¿Msð¾e7ƒ>ïGX¿Msð¾e7ƒ>ïGX¿Msð¾Hgd>å§Õ¾g‡a¿Hgd>å§Õ¾g‡a¿Hgd>å§Õ¾g‡a¿Hgd>å§Õ¾g‡a¿rÕ>cSG¿Csð>rÕ>cSG¿Csð>rÕ>cSG¿Csð>rÕ>cSG¿Csð>EŽ™>"¤¿c�E¿EŽ™>"¤¿c�E¿EŽ™>"¤¿c�E¿EŽ™>"¤¿c�E¿žîº>ÒÜ.¿‹ï!?žîº>ÒÜ.¿‹ï!?žîº>ÒÜ.¿‹ï!?žîº>ÒÜ.¿‹ï!?žîº>ÒÜ.¿‹ï!¿žîº>ÒÜ.¿‹ï!¿žîº>ÒÜ.¿‹ï!¿žîº>ÒÜ.¿‹ï!¿3Ž™>¤¿i�E?3Ž™>¤¿i�E?3Ž™>¤¿i�E?3Ž™>¤¿i�E?lÕ>`SG¿Tsð¾lÕ>`SG¿Tsð¾lÕ>`SG¿Tsð¾lÕ>`SG¿Tsð¾…gd>ï§Õ¾a‡a?…gd>ï§Õ¾a‡a?…gd>ï§Õ¾a‡a?…gd>ï§Õ¾a‡a?bç>D#X¿&ø“¾bç>D#X¿&ø“¾bç>D#X¿&ø“¾bç>D#X¿&ø“¾×¾>
¨ƒ¾kàt?×¾>
¨ƒ¾kàt?×¾>
¨ƒ¾kàt?×¾>
¨ƒ¾kàt??4ð>ì±`¿Éǽ?4ð>ì±`¿Éǽ?4ð>ì±`¿Éǽ?4ð>ì±`¿Éǽ?4ð>ì±`¿ÉÇ=?4ð>ì±`¿ÉÇ=?4ð>ì±`¿ÉÇ=?4ð>ì±`¿ÉÇ=Ö¾>¨ƒ¾hàt¿Ö¾>¨ƒ¾hàt¿Ö¾>¨ƒ¾hàt¿Ö¾>¨ƒ¾hàt¿]ç>D#X¿$ø“>]ç>D#X¿$ø“>]ç>D#X¿$ø“>]ç>D#X¿$ø“>„y?>r=¿.ø“¾„y?>r=¿.ø“¾„y?>r=¿.ø“¾„y?>r=¿.ø“¾Ëh=>½Ëf¾màt?Ëh=>½Ëf¾màt?Ëh=>½Ëf¾màt?Ëh=>½Ëf¾màt?S¡!?`òD¿ãÈǽS¡!?`òD¿ãÈǽS¡!?`òD¿ãÈǽS¡!?`òD¿ãÈǽS¡!?`òD¿ãÈÇ=S¡!?`òD¿ãÈÇ=S¡!?`òD¿ãÈÇ=S¡!?`òD¿ãÈÇ=Èh=>ØËf¾kàt¿Èh=>ØËf¾kàt¿Èh=>ØËf¾kàt¿Èh=>ØËf¾kàt¿ƒy?=r=¿3ø“>ƒy?=r=¿3ø“>ƒy?=r=¿3ø“>ƒy?=r=¿3ø“>u°™>^E»¾i‡a¿u°™>^E»¾i‡a¿u°™>^E»¾i‡a¿u°™>^E»¾i‡a¿™a?âµ.¿=sð>™a?âµ.¿=sð>™a?âµ.¿=sð>™a?âµ.¿=sð>§¦Î>Îû¾c�E¿§¦Î>Îû¾c�E¿§¦Î>Îû¾c�E¿§¦Î>Îû¾c�E¿t‘û>®D¿�ï!?t‘û>®D¿�ï!?t‘û>®D¿�ï!?t‘û>®D¿�ï!?t‘û>®D¿�ï!¿t‘û>®D¿�ï!¿t‘û>®D¿�ï!¿t‘û>®D¿�ï!¿ ¦Î>Îû¾k�E? ¦Î>Îû¾k�E? ¦Î>Îû¾k�E? ¦Î>Îû¾k�E?˜a?àµ.¿Fsð¾˜a?àµ.¿Fsð¾˜a?àµ.¿Fsð¾˜a?àµ.¿Fsð¾o°™>gE»¾g‡a?o°™>gE»¾g‡a?o°™>gE»¾g‡a?o°™>gE»¾g‡a?âµ.?˜a¿Asð>âµ.?˜a¿Asð>âµ.?˜a¿Asð>âµ.?˜a¿Asð>Îû>ž¦Î¾i�E¿Îû>ž¦Î¾i�E¿Îû>ž¦Î¾i�E¿Îû>ž¦Î¾i�E¿¯D?n‘û¾’ï!?¯D?n‘û¾’ï!?¯D?n‘û¾’ï!?¯D?n‘û¾’ï!?­D?j‘û¾”ï!¿­D?j‘û¾”ï!¿­D?j‘û¾”ï!¿­D?j‘û¾”ï!¿Îû>—¦Î¾j�E?Îû>—¦Î¾j�E?Îû>—¦Î¾j�E?Îû>—¦Î¾j�E?áµ.?‘a¿Ssð¾áµ.?‘a¿Ssð¾áµ.?‘a¿Ssð¾áµ.?‘a¿Ssð¾rE»>€°™¾b‡a?rE»>€°™¾b‡a?rE»>€°™¾b‡a?rE»>€°™¾b‡a?Cr=?�y¿$ø“¾Cr=?�y¿$ø“¾Cr=?�y¿$ø“¾Cr=?�y¿$ø“¾´Ëf>Æh=¾oàt?´Ëf>Æh=¾oàt?´Ëf>Æh=¾oàt?´Ëf>Æh=¾oàt?fòD?K¡!¿úÈǽfòD?K¡!¿úÈǽfòD?K¡!¿úÈǽfòD?K¡!¿úÈǽfòD?K¡!¿úÈÇ=fòD?K¡!¿úÈÇ=fòD?K¡!¿úÈÇ=fòD?K¡!¿úÈÇ=µËf>Óh=¾màt¿µËf>Óh=¾màt¿µËf>Óh=¾màt¿µËf>Óh=¾màt¿Er=?€y¿!ø“>Er=?€y¿!ø“>Er=?€y¿!ø“>Er=?€y¿!ø“>kE»>s°™¾f‡a¿kE»>s°™¾f‡a¿kE»>s°™¾f‡a¿kE»>s°™¾f‡a¿ø§ƒ>a¾¾qàt?ø§ƒ>a¾¾qàt?ø§ƒ>a¾¾qàt?ø§ƒ>a¾¾qàt?ò±`?'4ð¾ñÈǽò±`?'4ð¾ñÈǽò±`?'4ð¾ñÈǽò±`?'4ð¾ñÈǽò±`?'4ð¾ñÈÇ=ò±`?'4ð¾ñÈÇ=ò±`?'4ð¾ñÈÇ=ò±`?'4ð¾ñÈÇ="¨ƒ>n¾¾kàt¿"¨ƒ>n¾¾kàt¿"¨ƒ>n¾¾kàt¿"¨ƒ>n¾¾kàt¿I#X?\ç¾ø“>I#X?\ç¾ø“>I#X?\ç¾ø“>I#X?\ç¾ø“>ñ§Õ>gd¾g‡a¿ñ§Õ>gd¾g‡a¿ñ§Õ>gd¾g‡a¿ñ§Õ>gd¾g‡a¿fSG?eÕ¾Esð>fSG?eÕ¾Esð>fSG?eÕ¾Esð>fSG?eÕ¾Esð>¤?5Ž™¾g�E¿¤?5Ž™¾g�E¿¤?5Ž™¾g�E¿¤?5Ž™¾g�E¿ÏÜ.?•îº¾�ï!?ÏÜ.?•îº¾�ï!?ÏÜ.?•îº¾�ï!?ÏÜ.?•îº¾�ï!?ÑÜ.?•îº¾�ï!¿ÑÜ.?•îº¾�ï!¿ÑÜ.?•îº¾�ï!¿ÑÜ.?•îº¾�ï!¿¤?CŽ™¾f�E?¤?CŽ™¾f�E?¤?CŽ™¾f�E?¤?CŽ™¾f�E?bSG?kÕ¾Msð¾bSG?kÕ¾Msð¾bSG?kÕ¾Msð¾bSG?kÕ¾Msð¾ú§Õ>gd¾d‡a?ú§Õ>gd¾d‡a?ú§Õ>gd¾d‡a?ú§Õ>gd¾d‡a?I#X?\ç¾ø“¾I#X?\ç¾ø“¾I#X?\ç¾ø“¾I#X?\ç¾ø“¾ª¼=?Z9f¾Žï!?ª¼=?Z9f¾Žï!?ª¼=?Z9f¾Žï!?ª¼=?Z9f¾Žï!?ª¼=?Z9f¾Žï!¿ª¼=?Z9f¾Žï!¿ª¼=?Z9f¾Žï!¿ª¼=?Z9f¾Žï!¿
Ü?=¾o�E?
Ü?=¾o�E?
Ü?=¾o�E?
Ü?=¾o�E?ïGX?U7ƒ¾Tsð¾ïGX?U7ƒ¾Tsð¾ïGX?U7ƒ¾Tsð¾ïGX?U7ƒ¾Tsð¾œÔç>k¦¾b‡a?œÔç>k¦¾b‡a?œÔç>k¦¾b‡a?œÔç>k¦¾b‡a?ð…j?•HŽ¾ø“¾ð…j?•HŽ¾ø“¾ð…j?•HŽ¾ø“¾ð…j?•HŽ¾ø“¾ÛŽ>½V­½màt?ÛŽ>½V­½màt?ÛŽ>½V­½màt?ÛŽ>½V­½màt?îÎs?²ê“¾ñÈǽîÎs?²ê“¾ñÈǽîÎs?²ê“¾ñÈǽîÎs?²ê“¾ñÈǽîÎs?²ê“¾îÈÇ=îÎs?²ê“¾îÈÇ=îÎs?²ê“¾îÈÇ=îÎs?²ê“¾îÈÇ=&ÛŽ>çV­½jàt¿&ÛŽ>çV­½jàt¿&ÛŽ>çV­½jàt¿&ÛŽ>çV­½jàt¿ð…j?˜HŽ¾ø“>ð…j?˜HŽ¾ø“>ð…j?˜HŽ¾ø“>ð…j?˜HŽ¾ø“>‹Ôç>[¦¾f‡a¿‹Ôç>[¦¾f‡a¿‹Ôç>[¦¾f‡a¿‹Ôç>[¦¾f‡a¿òGX?^7ƒ¾Fsð>òGX?^7ƒ¾Fsð>òGX?^7ƒ¾Fsð>òGX?^7ƒ¾Fsð>Ü?6=¾i�E¿Ü?6=¾i�E¿Ü?6=¾i�E¿Ü?6=¾i�E¿]�}?öÇǽÝÈÇ=]�}?öÇǽÝÈÇ=]�}?öÇǽÝÈÇ=]�}?öÇǽÝÈÇ=°�”>Ýê¼kàt¿°�”>Ýê¼kàt¿°�”>Ýê¼kàt¿°�”>Ýê¼kàt¿]ås?D,À½ø“>]ås?D,À½ø“>]ås?D,À½ø“>]ås?D,À½ø“>hñ>÷=½g‡a¿hñ>÷=½g‡a¿hñ>÷=½g‡a¿hñ>÷=½g‡a¿¿ì`?”9±½Asð>¿ì`?”9±½Asð>¿ì`?”9±½Asð>¿ì`?”9±½Asð>®"?úm½i�E¿®"?úm½i�E¿®"?úm½i�E¿®"?úm½i�E¿âQE?Cy›½�ï!?âQE?Cy›½�ï!?âQE?Cy›½�ï!?âQE?Cy›½�ï!?âQE?Cy›½�ï!¿âQE?Cy›½�ï!¿âQE?Cy›½�ï!¿âQE?Cy›½�ï!¿¬"?žm½l�E?¬"?žm½l�E?¬"?žm½l�E?¬"?žm½l�E?¼ì`?ž9±½Msð¾¼ì`?ž9±½Msð¾¼ì`?ž9±½Msð¾¼ì`?ž9±½Msð¾nñ>÷=½f‡a?nñ>÷=½f‡a?nñ>÷=½f‡a?nñ>÷=½f‡a?_ås?C,À½ø“¾_ås?C,À½ø“¾_ås?C,À½ø“¾_ås?C,À½ø“¾ �”>“ê¼màt? �”>“ê¼màt? �”>“ê¼màt? �”>“ê¼màt?]�}?ùÇǽáÈǽ]�}?ùÇǽáÈǽ]�}?ùÇǽáÈǽ]�}?ùÇǽáÈǽáQE?Šy›=Žï!¿áQE?Šy›=Žï!¿áQE?Šy›=Žï!¿áQE?Šy›=Žï!¿®"?ëm=i�E?®"?ëm=i�E?®"?ëm=i�E?®"?ëm=i�E?¼ì`?ž9±=Msð¾¼ì`?ž9±=Msð¾¼ì`?ž9±=Msð¾¼ì`?ž9±=Msð¾nñ>Q÷==f‡a?nñ>Q÷==f‡a?nñ>Q÷==f‡a?nñ>Q÷==f‡a?]ås?°,À=ø“¾]ås?°,À=ø“¾]ås?°,À=ø“¾]ås?°,À=ø“¾©�”>’ê<kàt?©�”>’ê<kàt?©�”>’ê<kàt?©�”>’ê<kàt?[�}?bÈÇ=ÛÈǽ[�}?bÈÇ=ÛÈǽ[�}?bÈÇ=ÛÈǽ[�}?bÈÇ=ÛÈǽ[�}?bÈÇ=ÛÈÇ=[�}?bÈÇ=ÛÈÇ=[�}?bÈÇ=ÛÈÇ=[�}?bÈÇ=ÛÈÇ=ª�”>áê<màt¿ª�”>áê<màt¿ª�”>áê<màt¿ª�”>áê<màt¿]ås?°,À=ø“>]ås?°,À=ø“>]ås?°,À=ø“>]ås?°,À=ø“>fñ>P÷==g‡a¿fñ>P÷==g‡a¿fñ>P÷==g‡a¿fñ>P÷==g‡a¿¾ì`?Ò9±=Csð>¾ì`?Ò9±=Csð>¾ì`?Ò9±=Csð>¾ì`?Ò9±=Csð>²"?En=e�E¿²"?En=e�E¿²"?En=e�E¿²"?En=e�E¿áQE?Šy›=Žï!?áQE?Šy›=Žï!?áQE?Šy›=Žï!?áQE?Šy›=Žï!?ìÎs?Áê“>ÞÈÇ=ìÎs?Áê“>ÞÈÇ=ìÎs?Áê“>ÞÈÇ=ìÎs?Áê“>ÞÈÇ=ÛŽ>þV­=màt¿ÛŽ>þV­=màt¿ÛŽ>þV­=màt¿ÛŽ>þV­=màt¿ð…j?™HŽ>ø“>ð…j?™HŽ>ø“>ð…j?™HŽ>ø“>ð…j?™HŽ>ø“>ƒÔç>b¦>i‡a¿ƒÔç>b¦>i‡a¿ƒÔç>b¦>i‡a¿ƒÔç>b¦>i‡a¿ñGX?a7ƒ>Hsð>ñGX?a7ƒ>Hsð>ñGX?a7ƒ>Hsð>ñGX?a7ƒ>Hsð>Ü?E=>i�E¿Ü?E=>i�E¿Ü?E=>i�E¿Ü?E=>i�E¿¨¼=?€9f>�ï!?¨¼=?€9f>�ï!?¨¼=?€9f>�ï!?¨¼=?€9f>�ï!?¨¼=?€9f>�ï!¿¨¼=?€9f>�ï!¿¨¼=?€9f>�ï!¿¨¼=?€9f>�ï!¿Ü?-=>m�E?Ü?-=>m�E?Ü?-=>m�E?Ü?-=>m�E?ïGX?e7ƒ>Osð¾ïGX?e7ƒ>Osð¾ïGX?e7ƒ>Osð¾ïGX?e7ƒ>Osð¾–Ôç>n¦>b‡a?–Ôç>n¦>b‡a?–Ôç>n¦>b‡a?–Ôç>n¦>b‡a?ð…j?šHŽ>ø“¾ð…j?šHŽ>ø“¾ð…j?šHŽ>ø“¾ð…j?šHŽ>ø“¾ÛŽ>ÔV­=màt?ÛŽ>ÔV­=màt?ÛŽ>ÔV­=màt?ÛŽ>ÔV­=màt?ìÎs?Áê“>âÈǽìÎs?Áê“>âÈǽìÎs?Áê“>âÈǽìÎs?Áê“>âÈǽ¤?AŽ™>j�E?¤?AŽ™>j�E?¤?AŽ™>j�E?¤?AŽ™>j�E?`SG?oÕ>Rsð¾`SG?oÕ>Rsð¾`SG?oÕ>Rsð¾`SG?oÕ>Rsð¾ô§Õ>Egd>b‡a?ô§Õ>Egd>b‡a?ô§Õ>Egd>b‡a?ô§Õ>Egd>b‡a?D#X?iç>ø“¾D#X?iç>ø“¾D#X?iç>ø“¾D#X?iç>ø“¾¨ƒ>s¾>màt?¨ƒ>s¾>màt?¨ƒ>s¾>màt?¨ƒ>s¾>màt?é±`?M4ð>ÑÈǽé±`?M4ð>ÑÈǽé±`?M4ð>ÑÈǽé±`?M4ð>ÑÈǽé±`?K4ð>ÎÈÇ=é±`?K4ð>ÎÈÇ=é±`?K4ð>ÎÈÇ=é±`?K4ð>ÎÈÇ=#¨ƒ>|¾>kàt¿#¨ƒ>|¾>kàt¿#¨ƒ>|¾>kàt¿#¨ƒ>|¾>kàt¿D#X?kç>ø“>D#X?kç>ø“>D#X?kç>ø“>D#X?kç>ø“>Ó§Õ>?gd>l‡a¿Ó§Õ>?gd>l‡a¿Ó§Õ>?gd>l‡a¿Ó§Õ>?gd>l‡a¿bSG?rÕ>Gsð>bSG?rÕ>Gsð>bSG?rÕ>Gsð>bSG?rÕ>Gsð>¤?3Ž™>g�E¿¤?3Ž™>g�E¿¤?3Ž™>g�E¿¤?3Ž™>g�E¿ÒÜ.?�îº>Šï!?ÒÜ.?�îº>Šï!?ÒÜ.?�îº>Šï!?ÒÜ.?�îº>Šï!?ÒÜ.?�îº>‹ï!¿ÒÜ.?�îº>‹ï!¿ÒÜ.?�îº>‹ï!¿ÒÜ.?�îº>‹ï!¿ºËf>âh=>màt¿ºËf>âh=>màt¿ºËf>âh=>màt¿ºËf>âh=>màt¿Fr=?‚y?ø“>Fr=?‚y?ø“>Fr=?‚y?ø“>Fr=?‚y?ø“>aE»>�°™>d‡a¿aE»>�°™>d‡a¿aE»>�°™>d‡a¿aE»>�°™>d‡a¿ßµ.?™a?Csð>ßµ.?™a?Csð>ßµ.?™a?Csð>ßµ.?™a?Csð>ñÍû>¢¦Î>q�E¿ñÍû>¢¦Î>q�E¿ñÍû>¢¦Î>q�E¿ñÍû>¢¦Î>q�E¿³D?{‘û>Šï!?³D?{‘û>Šï!?³D?{‘û>Šï!?³D?{‘û>Šï!?³D?{‘û>Šï!¿³D?{‘û>Šï!¿³D?{‘û>Šï!¿³D?{‘û>Šï!¿
Îû>›¦Î>o�E?
Îû>›¦Î>o�E?
Îû>›¦Î>o�E?
Îû>›¦Î>o�E?ݵ.?–a?Osð¾Ýµ.?–a?Osð¾Ýµ.?–a?Osð¾Ýµ.?–a?Osð¾jE»>‚°™>b‡a?jE»>‚°™>b‡a?jE»>‚°™>b‡a?jE»>‚°™>b‡a?Fr=?‚y?ø“¾Fr=?‚y?ø“¾Fr=?‚y?ø“¾Fr=?‚y?ø“¾ëËf>Âh=>kàt?ëËf>Âh=>kàt?ëËf>Âh=>kàt?ëËf>Âh=>kàt?aòD?R¡!?ÇÈǽaòD?R¡!?ÇÈǽaòD?R¡!?ÇÈǽaòD?R¡!?ÇÈǽaòD?R¡!?ÇÈÇ=aòD?R¡!?ÇÈÇ=aòD?R¡!?ÇÈÇ=aòD?R¡!?ÇÈÇ=�a?ãµ.?Osð¾�a?ãµ.?Osð¾�a?ãµ.?Osð¾�a?ãµ.?Osð¾}°™>jE»>b‡a?}°™>jE»>b‡a?}°™>jE»>b‡a?}°™>jE»>b‡a?|y?Nr=?ø“¾|y?Nr=?ø“¾|y?Nr=?ø“¾|y?Nr=?ø“¾Îh=>ÃËf>màt?Îh=>ÃËf>màt?Îh=>ÃËf>màt?Îh=>ÃËf>màt?G¡!?jòD?ÈÈǽG¡!?jòD?ÈÈǽG¡!?jòD?ÈÈǽG¡!?jòD?ÈÈǽG¡!?jòD?ÈÈÇ=G¡!?jòD?ÈÈÇ=G¡!?jòD?ÈÈÇ=G¡!?jòD?ÈÈÇ=Óh=>ÙËf>kàt¿Óh=>ÙËf>kàt¿Óh=>ÙËf>kàt¿Óh=>ÙËf>kàt¿{y?Mr=?ø“>{y?Mr=?ø“>{y?Mr=?ø“>{y?Mr=?ø“>}°™>dE»>f‡a¿}°™>dE»>f‡a¿}°™>dE»>f‡a¿}°™>dE»>f‡a¿’a?æµ.?Bsð>’a?æµ.?Bsð>’a?æµ.?Bsð>’a?æµ.?Bsð>¥¦Î>
Îû>g�E¿¥¦Î>
Îû>g�E¿¥¦Î>
Îû>g�E¿¥¦Î>
Îû>g�E¿m‘û>µD?Šï!?m‘û>µD?Šï!?m‘û>µD?Šï!?m‘û>µD?Šï!?i‘û>¶D?‹ï!¿i‘û>¶D?‹ï!¿i‘û>¶D?‹ï!¿i‘û>¶D?‹ï!¿™¦Î>Îû>l�E?™¦Î>Îû>l�E?™¦Î>Îû>l�E?™¦Î>Îû>l�E?Zç>L#X?ø“>Zç>L#X?ø“>Zç>L#X?ø“>Zç>L#X?ø“>"gd>í§Õ>g‡a¿"gd>í§Õ>g‡a¿"gd>í§Õ>g‡a¿"gd>í§Õ>g‡a¿`Õ>bSG?Ssð>`Õ>bSG?Ssð>`Õ>bSG?Ssð>`Õ>bSG?Ssð>7Ž™>¤?j�E¿7Ž™>¤?j�E¿7Ž™>¤?j�E¿7Ž™>¤?j�E¿—îº>ØÜ.?Šï!?—îº>ØÜ.?Šï!?—îº>ØÜ.?Šï!?—îº>ØÜ.?Šï!?•îº>ÖÜ.?‹ï!¿•îº>ÖÜ.?‹ï!¿•îº>ÖÜ.?‹ï!¿•îº>ÖÜ.?‹ï!¿/Ž™>¤?k�E?/Ž™>¤?k�E?/Ž™>¤?k�E?/Ž™>¤?k�E?YÕ>cSG?Wsð¾YÕ>cSG?Wsð¾YÕ>cSG?Wsð¾YÕ>cSG?Wsð¾ gd>ú§Õ>d‡a? gd>ú§Õ>d‡a? gd>ú§Õ>d‡a? gd>ú§Õ>d‡a?]ç>L#X?ø“¾]ç>L#X?ø“¾]ç>L#X?ø“¾]ç>L#X?ø“¾‚¾>¨ƒ>màt?‚¾>¨ƒ>màt?‚¾>¨ƒ>màt?‚¾>¨ƒ>màt?/4ð>ñ±`?»Èǽ/4ð>ñ±`?»Èǽ/4ð>ñ±`?»Èǽ/4ð>ñ±`?»Èǽ/4ð>ñ±`?»ÈÇ=/4ð>ñ±`?»ÈÇ=/4ð>ñ±`?»ÈÇ=/4ð>ñ±`?»ÈÇ=ܾ>#¨ƒ>hàt¿Ü¾>#¨ƒ>hàt¿Ü¾>#¨ƒ>hàt¿Ü¾>#¨ƒ>hàt¿f¦>œÔç>b‡a?f¦>œÔç>b‡a?f¦>œÔç>b‡a?f¦>œÔç>b‡a?œHŽ>ô…j?
ø“¾œHŽ>ô…j?
ø“¾œHŽ>ô…j?
ø“¾œHŽ>ô…j?
ø“¾W­=ÛŽ>màt?W­=ÛŽ>màt?W­=ÛŽ>màt?W­=ÛŽ>màt?­ê“>ðÎs?¶Èǽ­ê“>ðÎs?¶Èǽ­ê“>ðÎs?¶Èǽ­ê“>ðÎs?¶Èǽ®ê“>ðÎs?µÈÇ=®ê“>ðÎs?µÈÇ=®ê“>ðÎs?µÈÇ=®ê“>ðÎs?µÈÇ=	W­=ÛŽ>jàt¿	W­=ÛŽ>jàt¿	W­=ÛŽ>jàt¿	W­=ÛŽ>jàt¿œHŽ>ô…j?
ø“>œHŽ>ô…j?
ø“>œHŽ>ô…j?
ø“>œHŽ>ô…j?
ø“>,¦>“Ôç>f‡a¿,¦>“Ôç>f‡a¿,¦>“Ôç>f‡a¿,¦>“Ôç>f‡a¿X7ƒ>ñGX?Jsð>X7ƒ>ñGX?Jsð>X7ƒ>ñGX?Jsð>X7ƒ>ñGX?Jsð>1=>
Ü?l�E¿1=>
Ü?l�E¿1=>
Ü?l�E¿1=>
Ü?l�E¿e9f>°¼=?†ï!?e9f>°¼=?†ï!?e9f>°¼=?†ï!?e9f>°¼=?†ï!?e9f>°¼=?†ï!¿e9f>°¼=?†ï!¿e9f>°¼=?†ï!¿e9f>°¼=?†ï!¿)=>Ü?o�E?)=>Ü?o�E?)=>Ü?o�E?)=>Ü?o�E?W7ƒ>íGX?]sð¾W7ƒ>íGX?]sð¾W7ƒ>íGX?]sð¾W7ƒ>íGX?]sð¾‰9±=¿ì`?Dsð>‰9±=¿ì`?Dsð>‰9±=¿ì`?Dsð>‰9±=¿ì`?Dsð>Nm=ª"?m�E¿Nm=ª"?m�E¿Nm=ª"?m�E¿Nm=ª"?m�E¿Hy›=çQE?ˆï!?Hy›=çQE?ˆï!?Hy›=çQE?ˆï!?Hy›=çQE?ˆï!?Hy›=çQE?ˆï!¿Hy›=çQE?ˆï!¿Hy›=çQE?ˆï!¿Hy›=çQE?ˆï!¿šm=©"?o�E?šm=©"?o�E?šm=©"?o�E?šm=©"?o�E?�9±=¼ì`?Msð¾�9±=¼ì`?Msð¾�9±=¼ì`?Msð¾�9±=¼ì`?Msð¾"÷==}ñ>b‡a?"÷==}ñ>b‡a?"÷==}ñ>b‡a?"÷==}ñ>b‡a?2,À=aås?ø“¾2,À=aås?ø“¾2,À=aås?ø“¾2,À=aås?ø“¾ßê<¢�”>màt?ßê<¢�”>màt?ßê<¢�”>màt?ßê<¢�”>màt?ëÇÇ=]�}?fÈǽëÇÇ=]�}?fÈǽëÇÇ=]�}?fÈǽëÇÇ=]�}?fÈǽêÇÇ=]�}?fÈÇ=êÇÇ=]�}?fÈÇ=êÇÇ=]�}?fÈÇ=êÇÇ=]�}?fÈÇ=
+ê<±�”>kàt¿
+ê<±�”>kàt¿
+ê<±�”>kàt¿
+ê<±�”>kàt¿=,À=aås?ø“>=,À=aås?ø“>=,À=aås?ø“>=,À=aås?ø“>ý÷==oñ>f‡a¿ý÷==oñ>f‡a¿ý÷==oñ>f‡a¿ý÷==oñ>f‡a¿€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?€?€€?ÑΔ°�¶;]:¼uŽº�²;]:¼¶Cºùùu;P^¼²W°ŒËz;P^¼@;±T:<›¶;;�ÔºCœ<›¶;ƒ>캽u<™Ëz;[¼.°K^<™Ëz;u?Ò°a´ç;j´ç»Aдºª@ã;j´ç»uŽº�²;]:¼ÑΔ°�¶;]:¼u?Ò°a´ç;j´ç;Aдºª@ã;j´ç;;�ÔºCœ<›¶;@;±T:<›¶;@;±T:<›¶»;�ÔºCœ<›¶»Aдºª@ã;j´ç»u?Ò°a´ç;j´ç»³I©°Ž¶;]:<tŽº�²;]:<Aдºª@ã;j´ç;u?Ò°a´ç;j´ç;[¼.°K^< Ëz»‚>캽u< Ëz»;�ÔºCœ<›¶»@;±T:<›¶»²W°ŠËz;R^<
¶Cºòùu;R^<tŽº�²;]:<³I©°Ž¶;]:<ÏÍ0±± <uµÿº¥Ëúº­š<uµÿº‚>캽u< Ëz»[¼.°K^< Ëz»Šv&¯Pµÿ:± <›‹Ç¹‹Ëú:± <
¶Cºòùu;R^<²W°ŠËz;R^<@;±
×#<ì†O°xµÿº± <ì†O°¥Ëúº­š<uµÿºÏÍ0±± <uµÿºŒίaµÿ:± ¼ª‹Ç¹ Ëú:± ¼uÍø0Nͱ
+×#¼¶Cº}>ì:± ¼Žº0�Ô:± ¼’‹Ç9�Ëú:± ¼
+¶C:n>ì:± ¼Pдº4д:± ¼uÍø0Nͱ
+×#¼K�ÔºbŽ:± ¼—>ìºâµC:± ¼¹Ëúº8‹Ç9± ¼uÍø0Nͱ
+×#¼‹µÿºfv`±± ¼¸ËúºŒÇ¹± ¼“>ìºP¶Cº± ¼uÍø0Nͱ
+×#¼F�Ôº—Žº± ¼Jдºgдº± ¼yŽºa�Ôº± ¼uÍø0Nͱ
+×#¼¶Cº«>캱 ¼¡‹Ç¹ÎËúº± ¼
+˜ž. µÿº± ¼uÍø0Nͱ
+×#¼¥‹Ç9ËËúº± ¼¶C:§>캱 ¼wŽ:\�Ôº± ¼uÍø0Nͱ
+×#¼Fд:aдº± ¼@�Ô:‘Žº± ¼Š>ì:F¶Cº± ¼uÍø0Nͱ
+×#¼¬Ëú:
+ŒÇ¹± ¼~µÿ:õ8V±± ¼«Ëú:2‹Ç9± ¼uÍø0Nͱ
+×#¼‰>ì:صC:± ¼=�Ô:YŽ:± ¼Bд:)д:± ¼uÍø0Nͱ
+×#¼sŽ:"�Ô:± ¼žê_±
+×#<›‹Ç¹‹Ëú:± <Šv&¯Pµÿ:± <¶Cºi>ì:± <rŽº �Ô:± <Š‹Ç9~Ëú:± <þµC:]>ì:± <žê_±
+×#<@дº&д:± <9�ÔºWŽ:± <‚>ìºÕµC:± <žê_±
+×#<£Ëúº.‹Ç9± <wµÿº™©S±± <£ËúºŒÇ¹± <žê_±
+×#<�>ìº>¶Cº± <7�ÔºŒŽº± <=дºYдº± <žê_±
+×#<pŽºR�Ôº± <	¶Cº›>캱 <—‹Ç¹¼Ëúº± <žê_±
+×#<
+U.®Žµÿº± <“‹Ç9»Ëúº± <¶C:—>캱 <žê_±
+×#<lŽ:L�Ôº± <8д:Tдº± <0�Ô:‡Žº± <žê_±
+×#<x>ì:7¶Cº± <™Ëú:ü‹Ç¹± <lµÿ:RÈX±± <žê_±
+×#<™Ëú:"‹Ç9± <x>ì:ʵC:± </�Ô:OŽ:± <žê_±
+×#<7д:д:± <jŽ:�Ô:± <ÏÍ0±± <iµÿ:¦Ëúº­š<iµÿ:xµÿº± <ì†O°@;±
×#<ì†O°²W°ŒËz;P^¼¶Cºùùu;P^¼ª‹Ç¹ Ëú:± ¼Œίaµÿ:± ¼[¼.°K^<™Ëz;ƒ>캽u<™Ëz;¦Ëúº­š<iµÿ:ÏÍ0±± <iµÿ:¦Ëúº­š<iµÿ:ýùu»¼u<iµÿ:¥Ëz»P^<ì†O°xµÿº± <ì†O°¶Cºùùu;P^¼^ó¿ºk´g;P^¼¶Cº}>ì:± ¼ª‹Ç¹ Ëú:± ¼ƒ>캽u<™Ëz;o´g»ŸØ<™Ëz;ýùu»¼u<iµÿ:¦Ëúº­š<iµÿ:uŽº�²;]:¼¥U»
+1¨;]:¼^ó¿ºk´g;P^¼¶Cºùùu;P^¼;�ÔºCœ<›¶;b‡P»j·û;›¶;o´g»ŸØ<™Ëz;ƒ>캽u<™Ëz;Aдºª@ã;j´ç»×V1»7Ö;j´ç»¥U»
+1¨;]:¼uŽº�²;]:¼Aдºª@ã;j´ç;×V1»7Ö;j´ç;b‡P»j·û;›¶;;�ÔºCœ<›¶;;�ÔºCœ<›¶»b‡P»j·û;›¶»×V1»7Ö;j´ç»Aдºª@ã;j´ç»tŽº�²;]:<¤U»	1¨;]:<×V1»7Ö;j´ç;Aдºª@ã;j´ç;‚>캽u< Ëz»n´g»ŸØ< Ëz»b‡P»j·û;›¶»;�ÔºCœ<›¶»
¶Cºòùu;R^<Yó¿ºd´g;R^<¤U»	1¨;]:<tŽº�²;]:<¥Ëúº­š<uµÿºýùu»¼u<uµÿºn´g»ŸØ< Ëz»‚>캽u< Ëz»›‹Ç¹‹Ëú:± <¶Cºi>ì:± <Yó¿ºd´g;R^<
¶Cºòùu;R^<xµÿº± <ì†O°¥Ëz»P^<ì†O°ýùu»¼u<uµÿº¥Ëúº­š<uµÿº¤U»	1¨;]:<JHJ»N^—;]:<sº€»Ê§À;j´ç;×V1»7Ö;j´ç;n´g»ŸØ< Ëz»1¨»i·û; Ëz»T^—»ð‰â;›¶»b‡P»j·û;›¶»Yó¿ºd´g;R^<¤U»U‡P;R^<JHJ»N^—;]:<¤U»	1¨;]:<ýùu»¼u<uµÿº �²»Aœ<uµÿº1¨»i·û; Ëz»n´g»ŸØ< Ëz»¶Cºi>ì:± <rŽº �Ô:± <¤U»U‡P;R^<Yó¿ºd´g;R^<¥Ëz»P^<ì†O° ¶»[:<ì†O° �²»Aœ<uµÿºýùu»¼u<uµÿºýùu»¼u<iµÿ: �²»Aœ<iµÿ: ¶»[:<ì†O°¥Ëz»P^<ì†O°^ó¿ºk´g;P^¼§U»\‡P;P^¼Žº0�Ô:± ¼¶Cº}>ì:± ¼o´g»ŸØ<™Ëz;1¨»j·û;™Ëz; �²»Aœ<iµÿ:ýùu»¼u<iµÿ:¥U»
+1¨;]:¼KHJ»O^—;]:¼§U»\‡P;P^¼^ó¿ºk´g;P^¼b‡P»j·û;›¶;T^—»ð‰â;›¶;1¨»j·û;™Ëz;o´g»ŸØ<™Ëz;×V1»7Ö;j´ç»sº€»Ê§À;j´ç»KHJ»O^—;]:¼¥U»
+1¨;]:¼×V1»7Ö;j´ç;sº€»Ê§À;j´ç;T^—»ð‰â;›¶;b‡P»j·û;›¶;b‡P»j·û;›¶»T^—»ð‰â;›¶»sº€»Ê§À;j´ç»×V1»7Ö;j´ç»1¨»j·û;™Ëz;<Ö»7Ö;™Ëz;®@㻦@ã;iµÿ: �²»Aœ<iµÿ:KHJ»O^—;]:¼tº€»mº€;]:¼ÜV1»ÎV1;P^¼§U»\‡P;P^¼T^—»ð‰â;›¶;ЧÀ»É§À;›¶;<Ö»7Ö;™Ëz;1¨»j·û;™Ëz;sº€»Ê§À;j´ç»×£»×£;j´ç»tº€»mº€;]:¼KHJ»O^—;]:¼sº€»Ê§À;j´ç;×£»×£;j´ç;ЧÀ»É§À;›¶;T^—»ð‰â;›¶;T^—»ð‰â;›¶»Ð§À»É§À;›¶»×£»×£;j´ç»sº€»Ê§À;j´ç»JHJ»N^—;]:<sº€»kº€;]:<×£»×£;j´ç;sº€»Ê§À;j´ç;1¨»i·û; Ëz»<Ö»5Ö; Ëz»Ð§À»É§À;›¶»T^—»ð‰â;›¶»¤U»U‡P;R^<×V1»ÊV1;R^<sº€»kº€;]:<JHJ»N^—;]:< �²»Aœ<uµÿº®@㻦@ã;uµÿº<Ö»5Ö; Ëz»1¨»i·û; Ëz»rŽº �Ô:± <@дº&д:± <×V1»ÊV1;R^<¤U»U‡P;R^< ¶»[:<ì†O°o´ç»f´ç;ì†O°®@㻦@ã;uµÿº �²»Aœ<uµÿº �²»Aœ<iµÿ:®@㻦@ã;iµÿ:o´ç»f´ç;ì†O° ¶»[:<ì†O°§U»\‡P;P^¼ÜV1»ÎV1;P^¼Pдº4д:± ¼Žº0�Ô:± ¼×V1»ÊV1;R^<d‡P»—U;R^<T^—»;HJ;]:<sº€»kº€;]:<®@㻦@ã;uµÿºDœ¼�²;uµÿºo·û»1¨; Ëz»<Ö»5Ö; Ëz»@дº&д:± <9�ÔºWŽ:± <d‡P»—U;R^<×V1»ÊV1;R^<o´ç»f´ç;ì†O°_:¼—¶;ì†O°Dœ¼�²;uµÿº®@㻦@ã;uµÿº®@㻦@ã;iµÿ:Dœ¼�²;iµÿ:_:¼—¶;ì†O°o´ç»f´ç;ì†O°ÜV1»ÎV1;P^¼i‡P»šU;P^¼K�ÔºbŽ:± ¼Pдº4д:± ¼<Ö»7Ö;™Ëz;o·û»	1¨;™Ëz;Dœ¼�²;iµÿ:®@㻦@ã;iµÿ:tº€»mº€;]:¼V^—»=HJ;]:¼i‡P»šU;P^¼ÜV1»ÎV1;P^¼Ð§À»É§À;›¶;÷‰â»M^—;›¶;o·û»	1¨;™Ëz;<Ö»7Ö;™Ëz;×£»×£;j´ç»Ð§À»kº€;j´ç»V^—»=HJ;]:¼tº€»mº€;]:¼×£»×£;j´ç;ЧÀ»kº€;j´ç;÷‰â»M^—;›¶;ЧÀ»É§À;›¶;ЧÀ»É§À;›¶»÷‰â»M^—;›¶»Ð§À»kº€;j´ç»×£»×£;j´ç»sº€»kº€;]:<T^—»;HJ;]:<ЧÀ»kº€;j´ç;×£»×£;j´ç;<Ö»5Ö; Ëz»o·û»1¨; Ëz»÷‰â»M^—;›¶»Ð§À»É§À;›¶»V^—»=HJ;]:¼1¨»—U;]:¼w´g»Dó¿:P^¼i‡P»šU;P^¼÷‰â»M^—;›¶;p·û»R‡P;›¶;¡Ø¼d´g;™Ëz;o·û»	1¨;™Ëz;ЧÀ»kº€;j´ç»=Ö»ÇV1;j´ç»1¨»—U;]:¼V^—»=HJ;]:¼Ð§À»kº€;j´ç;=Ö»ÇV1;j´ç;p·û»R‡P;›¶;÷‰â»M^—;›¶;÷‰â»M^—;›¶»p·û»R‡P;›¶»=Ö»ÇV1;j´ç»Ð§À»kº€;j´ç»T^—»;HJ;]:<1¨»”U;]:<=Ö»ÇV1;j´ç;ЧÀ»kº€;j´ç;o·û»1¨; Ëz»¡Ø¼a´g; Ëz»p·û»R‡P;›¶»÷‰â»M^—;›¶»d‡P»—U;R^<p´g»@ó¿:R^<1¨»”U;]:<T^—»;HJ;]:<Dœ¼�²;uµÿº¾u¼éùu;uµÿº¡Ø¼a´g; Ëz»o·û»1¨; Ëz»9�ÔºWŽ:± <‚>ìºÕµC:± <p´g»@ó¿:R^<d‡P»—U;R^<_:¼—¶;ì†O°S^¼”Ëz;ì†O°¾u¼éùu;uµÿºDœ¼�²;uµÿºDœ¼�²;iµÿ:¾u¼éùu;iµÿ:S^¼”Ëz;ì†O°_:¼—¶;ì†O°i‡P»šU;P^¼w´g»Dó¿:P^¼—>ìºâµC:± ¼K�ÔºbŽ:± ¼o·û»	1¨;™Ëz;¡Ø¼d´g;™Ëz;¾u¼éùu;iµÿ:Dœ¼�²;iµÿ:¾u¼éùu;uµÿº®š¼€Ëú:uµÿº¿u¼i>ì: Ëz»¡Ø¼a´g; Ëz»‚>ìºÕµC:± <£Ëúº.‹Ç9± <þùu»×µC:R^<p´g»@ó¿:R^<S^¼”Ëz;ì†O° ± ¼Wµÿ:ì†O°®š¼€Ëú:uµÿº¾u¼éùu;uµÿº¾u¼éùu;iµÿ:®š¼€Ëú:iµÿ: ± ¼Wµÿ:ì†O°S^¼”Ëz;ì†O°w´g»Dó¿:P^¼úu»ÙµC:P^¼¹Ëúº8‹Ç9± ¼—>ìºâµC:± ¼¡Ø¼d´g;™Ëz;¿u¼n>ì:™Ëz;®š¼€Ëú:iµÿ:¾u¼éùu;iµÿ:1¨»—U;]:¼"�²»XŽ:]:¼úu»ÙµC:P^¼w´g»Dó¿:P^¼p·û»R‡P;›¶;Eœ¼�Ô:›¶;¿u¼n>ì:™Ëz;¡Ø¼d´g;™Ëz;=Ö»ÇV1;j´ç»¯@ã»%д:j´ç»"�²»XŽ:]:¼1¨»—U;]:¼=Ö»ÇV1;j´ç;¯@ã»%д:j´ç;Eœ¼�Ô:›¶;p·û»R‡P;›¶;p·û»R‡P;›¶»Eœ¼�Ô:›¶»¯@ã»%д:j´ç»=Ö»ÇV1;j´ç»1¨»”U;]:<!�²»TŽ:]:<¯@ã»%д:j´ç;=Ö»ÇV1;j´ç;¡Ø¼a´g; Ëz»¿u¼i>ì: Ëz»Eœ¼�Ô:›¶»p·û»R‡P;›¶»p´g»@ó¿:R^<þùu»×µC:R^<!�²»TŽ:]:<1¨»”U;]:<Eœ¼�Ô:›¶;_:¼•e±›¶;R^¼
+ç±™Ëz;¿u¼n>ì:™Ëz;¯@ã»%д:j´ç»n´ç»®W[±j´ç»¡¶»õ8V±]:¼"�²»XŽ:]:¼¯@ã»%д:j´ç;n´ç»®W[±j´ç;_:¼•e±›¶;Eœ¼�Ô:›¶;Eœ¼�Ô:›¶»_:¼•e±›¶»n´ç»®W[±j´ç»¯@ã»%д:j´ç»!�²»TŽ:]:<ž¶»×³j±]:<n´ç»®W[±j´ç;¯@ã»%д:j´ç;¿u¼i>ì: Ëz»R^¼\Ÿ<± Ëz»_:¼•e±›¶»Eœ¼�Ô:›¶»þùu»×µC:R^<¥Ëz»=Q±R^<ž¶»×³j±]:<!�²»TŽ:]:<®š¼€Ëú:uµÿº± ¼pE‡±uµÿºR^¼\Ÿ<± Ëz»¿u¼i>ì: Ëz»£Ëúº.‹Ç9± <wµÿº™©S±± <¥Ëz»=Q±R^<þùu»×µC:R^< ± ¼Wµÿ:ì†O°
×#¼¸&‚±ì†O°± ¼pE‡±uµÿº®š¼€Ëú:uµÿº®š¼€Ëú:iµÿ:± ¼pE‡±iµÿ:
×#¼¸&‚±ì†O° ± ¼Wµÿ:ì†O°úu»ÙµC:P^¼«Ëz»®W[±P^¼‹µÿºfv`±± ¼¹Ëúº8‹Ç9± ¼¿u¼n>ì:™Ëz;R^¼
+ç±™Ëz;± ¼pE‡±iµÿ:®š¼€Ëú:iµÿ:"�²»XŽ:]:¼¡¶»õ8V±]:¼«Ëz»®W[±P^¼úu»ÙµC:P^¼wµÿº™©S±± <£ËúºŒÇ¹± <ýùu»>¶CºR^<¥Ëz»=Q±R^<
×#¼¸&‚±ì†O° ± ¼—µÿºì†O°­š¼ÁËúºuµÿº± ¼pE‡±uµÿº± ¼pE‡±iµÿ:­š¼ÁËúºiµÿ: ± ¼—µÿºì†O°
×#¼¸&‚±ì†O°«Ëz»®W[±P^¼úu»F¶CºP^¼¸ËúºŒÇ¹± ¼‹µÿºfv`±± ¼R^¼
+ç±™Ëz;¿u¼”>캙Ëz;­š¼ÁËúºiµÿ:± ¼pE‡±iµÿ:¡¶»õ8V±]:¼"�²»ŽŽº]:¼úu»F¶CºP^¼«Ëz»®W[±P^¼_:¼•e±›¶;Dœ¼S�Ôº›¶;¿u¼”>캙Ëz;R^¼
+ç±™Ëz;n´ç»®W[±j´ç»®@ã»Yдºj´ç»"�²»ŽŽº]:¼¡¶»õ8V±]:¼n´ç»®W[±j´ç;®@ã»Yдºj´ç;Dœ¼S�Ôº›¶;_:¼•e±›¶;_:¼•e±›¶»Dœ¼S�Ôº›¶»®@ã»Yдºj´ç»n´ç»®W[±j´ç»ž¶»×³j±]:< �²»�Žº]:<®@ã»Yдºj´ç;n´ç»®W[±j´ç;R^¼\Ÿ<± Ëz»¿u¼˜>캠Ëz»Dœ¼S�Ôº›¶»_:¼•e±›¶»¥Ëz»=Q±R^<ýùu»>¶CºR^< �²»�Žº]:<ž¶»×³j±]:<± ¼pE‡±uµÿº­š¼ÁËúºuµÿº¿u¼˜>캠Ëz»R^¼\Ÿ<± Ëz»®@ã»Yдºj´ç»<Ö»áV1»j´ç»1¨»°U»]:¼"�²»ŽŽº]:¼®@ã»Yдºj´ç;<Ö»áV1»j´ç;l·û»n‡P»›¶;Dœ¼S�Ôº›¶;Dœ¼S�Ôº›¶»l·û»n‡P»›¶»<Ö»áV1»j´ç»®@ã»Yдºj´ç» �²»�Žº]:<
1¨»°U»]:<<Ö»áV1»j´ç;®@ã»Yдºj´ç;¿u¼˜>캠Ëz»¡Ø¼x´g» Ëz»l·û»n‡P»›¶»Dœ¼S�Ôº›¶»ýùu»>¶CºR^<n´g»ró¿ºR^<
1¨»°U»]:< �²»�Žº]:<­š¼ÁËúºuµÿº¼u¼úu»uµÿº¡Ø¼x´g» Ëz»¿u¼˜>캠Ëz»£ËúºŒÇ¹± <�>ìº>¶Cº± <n´g»ró¿ºR^<ýùu»>¶CºR^< ± ¼—µÿºì†O°R^¼³Ëz»ì†O°¼u¼úu»uµÿº­š¼ÁËúºuµÿº­š¼ÁËúºiµÿ:¼u¼úu»iµÿ:R^¼³Ëz»ì†O° ± ¼—µÿºì†O°úu»F¶CºP^¼t´g»wó¿ºP^¼“>ìºP¶Cº± ¼¸ËúºŒÇ¹± ¼¿u¼”>캙Ëz;¡Ø¼u´g»™Ëz;¼u¼úu»iµÿ:­š¼ÁËúºiµÿ:"�²»ŽŽº]:¼1¨»°U»]:¼t´g»wó¿ºP^¼úu»F¶CºP^¼Dœ¼S�Ôº›¶;l·û»n‡P»›¶;¡Ø¼u´g»™Ëz;¿u¼”>캙Ëz;R^¼³Ëz»ì†O°^:¼¥¶»ì†O°Bœ¼$�²»uµÿº¼u¼úu»uµÿº¼u¼úu»iµÿ:Bœ¼$�²»iµÿ:^:¼¥¶»ì†O°R^¼³Ëz»ì†O°t´g»wó¿ºP^¼f‡P»²U»P^¼F�Ôº—Žº± ¼“>ìºP¶Cº± ¼¡Ø¼u´g»™Ëz;n·û»1¨»™Ëz;Bœ¼$�²»iµÿ:¼u¼úu»iµÿ:1¨»°U»]:¼T^—»UHJ»]:¼f‡P»²U»P^¼t´g»wó¿ºP^¼l·û»n‡P»›¶;ó‰â»Y^—»›¶;n·û»1¨»™Ëz;¡Ø¼u´g»™Ëz;<Ö»áV1»j´ç»Ï§À»wº€»j´ç»T^—»UHJ»]:¼1¨»°U»]:¼<Ö»áV1»j´ç;ϧÀ»wº€»j´ç;ó‰â»Y^—»›¶;l·û»n‡P»›¶;l·û»n‡P»›¶»ó‰â»Y^—»›¶»Ï§À»wº€»j´ç»<Ö»áV1»j´ç»
1¨»°U»]:<R^—»THJ»]:<ϧÀ»wº€»j´ç;<Ö»áV1»j´ç;¡Ø¼x´g» Ëz»n·û»1¨» Ëz»ó‰â»Y^—»›¶»l·û»n‡P»›¶»n´g»ró¿ºR^<`‡P»¯U»R^<R^—»THJ»]:<
1¨»°U»]:<¼u¼úu»uµÿºBœ¼$�²»uµÿºn·û»1¨» Ëz»¡Ø¼x´g» Ëz»�>ìº>¶Cº± <7�ÔºŒŽº± <`‡P»¯U»R^<n´g»ró¿ºR^<ϧÀ»wº€»j´ç;×£»×£»j´ç;˧À»Ô§À»›¶;ó‰â»Y^—»›¶;ó‰â»Y^—»›¶»Ë§À»Ô§À»›¶»×£»×£»j´ç»Ï§À»wº€»j´ç»R^—»THJ»]:<pº€»wº€»]:<×£»×£»j´ç;ϧÀ»wº€»j´ç;n·û»1¨» Ëz»<Ö»@Ö» Ëz»Ë§À»Ô§À»›¶»ó‰â»Y^—»›¶»`‡P»¯U»R^<ÓV1»áV1»R^<pº€»wº€»]:<R^—»THJ»]:<Bœ¼$�²»uµÿº©@ã»°@ã»uµÿº<Ö»@Ö» Ëz»n·û»1¨» Ëz»7�ÔºŒŽº± <=дºYдº± <ÓV1»áV1»R^<`‡P»¯U»R^<^:¼¥¶»ì†O°k´ç»t´ç»ì†O°©@ã»°@ã»uµÿºBœ¼$�²»uµÿºBœ¼$�²»iµÿ:©@ã»°@ã»iµÿ:k´ç»t´ç»ì†O°^:¼¥¶»ì†O°f‡P»²U»P^¼ÙV1»åV1»P^¼Jдºgдº± ¼F�Ôº—Žº± ¼n·û»1¨»™Ëz;<Ö»@Ö»™Ëz;©@ã»°@ã»iµÿ:Bœ¼$�²»iµÿ:T^—»UHJ»]:¼rº€»xº€»]:¼ÙV1»åV1»P^¼f‡P»²U»P^¼ó‰â»Y^—»›¶;˧À»Ô§À»›¶;<Ö»@Ö»™Ëz;n·û»1¨»™Ëz;ϧÀ»wº€»j´ç»×£»×£»j´ç»rº€»xº€»]:¼T^—»UHJ»]:¼©@ã»°@ã»iµÿ:�²»Fœ¼iµÿ:œ¶»b:¼ì†O°k´ç»t´ç»ì†O°ÙV1»åV1»P^¼¥U»p‡P»P^¼yŽºa�Ôº± ¼Jдºgдº± ¼<Ö»@Ö»™Ëz;1¨»s·û»™Ëz;�²»Fœ¼iµÿ:©@ã»°@ã»iµÿ:rº€»xº€»]:¼GHJ»Y^—»]:¼¥U»p‡P»P^¼ÙV1»åV1»P^¼Ë§À»Ô§À»›¶;P^—»ù‰â»›¶;1¨»s·û»™Ëz;<Ö»@Ö»™Ëz;×£»×£»j´ç»pº€»Ô§À»j´ç»GHJ»Y^—»]:¼rº€»xº€»]:¼×£»×£»j´ç;pº€»Ô§À»j´ç;P^—»ù‰â»›¶;˧À»Ô§À»›¶;˧À»Ô§À»›¶»P^—»ù‰â»›¶»pº€»Ô§À»j´ç»×£»×£»j´ç»pº€»wº€»]:<DHJ»X^—»]:<pº€»Ô§À»j´ç;×£»×£»j´ç;<Ö»@Ö» Ëz»1¨»s·û» Ëz»P^—»ù‰â»›¶»Ë§À»Ô§À»›¶»ÓV1»áV1»R^< U»k‡P»R^<DHJ»X^—»]:<pº€»wº€»]:<©@ã»°@ã»uµÿº�²»Fœ¼uµÿº1¨»s·û» Ëz»<Ö»@Ö» Ëz»=дºYдº± <pŽºR�Ôº± < U»k‡P»R^<ÓV1»áV1»R^<k´ç»t´ç»ì†O°œ¶»b:¼ì†O°�²»Fœ¼uµÿº©@ã»°@ã»uµÿºDHJ»X^—»]:<ŸU»1¨»]:<ÐV1»@Ö»j´ç;pº€»Ô§À»j´ç;1¨»s·û» Ëz»n´g»£Ø¼ Ëz»Y‡P»r·û»›¶»P^—»ù‰â»›¶» U»k‡P»R^<Tó¿ºx´g»R^<ŸU»1¨»]:<DHJ»X^—»]:<�²»Fœ¼uµÿºóùu»¿u¼uµÿºn´g»£Ø¼ Ëz»1¨»s·û» Ëz»pŽºR�Ôº± <	¶Cº›>캱 <Tó¿ºx´g»R^< U»k‡P»R^<œ¶»b:¼ì†O°žËz»V^¼ì†O°óùu»¿u¼uµÿº�²»Fœ¼uµÿº�²»Fœ¼iµÿ:óùu»¿u¼iµÿ:žËz»V^¼ì†O°œ¶»b:¼ì†O°¥U»p‡P»P^¼\ó¿º}´g»P^¼¶Cº«>캱 ¼yŽºa�Ôº± ¼1¨»s·û»™Ëz;n´g»£Ø¼™Ëz;óùu»¿u¼iµÿ:�²»Fœ¼iµÿ:GHJ»Y^—»]:¼¢U»1¨»]:¼\ó¿º}´g»P^¼¥U»p‡P»P^¼P^—»ù‰â»›¶;Y‡P»r·û»›¶;n´g»£Ø¼™Ëz;1¨»s·û»™Ëz;pº€»Ô§À»j´ç»ÐV1»@Ö»j´ç»¢U»1¨»]:¼GHJ»Y^—»]:¼pº€»Ô§À»j´ç;ÐV1»@Ö»j´ç;Y‡P»r·û»›¶;P^—»ù‰â»›¶;P^—»ù‰â»›¶»Y‡P»r·û»›¶»ÐV1»@Ö»j´ç»pº€»Ô§À»j´ç»\ó¿º}´g»P^¼¶Cºúu»P^¼¡‹Ç¹ÎËúº± ¼¶Cº«>캱 ¼n´g»£Ø¼™Ëz;ƒ>ìºÀu¼™Ëz;—Ëúº¯š¼iµÿ:óùu»¿u¼iµÿ:¢U»1¨»]:¼sŽº&�²»]:¼¶Cºúu»P^¼\ó¿º}´g»P^¼Y‡P»r·û»›¶;+�ÔºEœ¼›¶;ƒ>ìºÀu¼™Ëz;n´g»£Ø¼™Ëz;ÐV1»@Ö»j´ç»9дº²@ã»j´ç»sŽº&�²»]:¼¢U»1¨»]:¼ÐV1»@Ö»j´ç;9дº²@ã»j´ç;+�ÔºEœ¼›¶;Y‡P»r·û»›¶;Y‡P»r·û»›¶»+�ÔºEœ¼›¶»9дº²@ã»j´ç»ÐV1»@Ö»j´ç»ŸU»1¨»]:<mŽº$�²»]:<9дº²@ã»j´ç;ÐV1»@Ö»j´ç;n´g»£Ø¼ Ëz»ƒ>ìºÀu¼ Ëz»+�ÔºEœ¼›¶»Y‡P»r·û»›¶»Tó¿ºx´g»R^<¶Cºúu»R^<mŽº$�²»]:<ŸU»1¨»]:<óùu»¿u¼uµÿº—Ëúº¯š¼uµÿºƒ>ìºÀu¼ Ëz»n´g»£Ø¼ Ëz»	¶Cº›>캱 <—‹Ç¹¼Ëúº± <¶Cºúu»R^<Tó¿ºx´g»R^<žËz»V^¼ì†O°lµÿº"± ¼ì†O°—Ëúº¯š¼uµÿºóùu»¿u¼uµÿºóùu»¿u¼iµÿ:—Ëúº¯š¼iµÿ:lµÿº"± ¼ì†O°žËz»V^¼ì†O°ƒ>ìºÀu¼ Ëz»[¼.°T^¼ Ëz»>Ýj0^:¼›¶»+�ÔºEœ¼›¶»¶Cºúu»R^<
+U.®¬Ëz»R^<�ƒð.¡¶»]:<mŽº$�²»]:<—Ëúº¯š¼uµÿº>Ýj0± ¼uµÿº[¼.°T^¼ Ëz»ƒ>ìºÀu¼ Ëz»—‹Ç¹¼Ëúº± <
+U.®Žµÿº± <
+U.®¬Ëz»R^<¶Cºúu»R^<lµÿº"± ¼ì†O°€é‰0×#¼ì†O°>Ýj0± ¼uµÿº—Ëúº¯š¼uµÿº—Ëúº¯š¼iµÿ:>Ýj0± ¼iµÿ:€é‰0×#¼ì†O°lµÿº"± ¼ì†O°¶Cºúu»P^¼n—⯲Ëz»P^¼
+˜ž. µÿº± ¼¡‹Ç¹ÎËúº± ¼ƒ>ìºÀu¼™Ëz;[¼.°T^¼™Ëz;>Ýj0± ¼iµÿ:—Ëúº¯š¼iµÿ:sŽº&�²»]:¼é«�¯¥¶»]:¼n—⯲Ëz»P^¼¶Cºúu»P^¼+�ÔºEœ¼›¶;>Ýj0^:¼›¶;[¼.°T^¼™Ëz;ƒ>ìºÀu¼™Ëz;9дº²@ã»j´ç»iŽ/p´ç»j´ç»é«�¯¥¶»]:¼sŽº&�²»]:¼9дº²@ã»j´ç;iŽ/p´ç»j´ç;>Ýj0^:¼›¶;+�ÔºEœ¼›¶;+�ÔºEœ¼›¶»>Ýj0^:¼›¶»iŽ/p´ç»j´ç»9дº²@ã»j´ç»mŽº$�²»]:<�ƒð.¡¶»]:<iŽ/p´ç»j´ç;9дº²@ã»j´ç;[¼.°T^¼™Ëz;y>ì:Àu¼™Ëz;£Ëú:®š¼iµÿ:>Ýj0± ¼iµÿ:é«�¯¥¶»]:¼nŽ:&�²»]:¼¶C:	úu»P^¼n—⯲Ëz»P^¼>Ýj0^:¼›¶;9�Ô:Dœ¼›¶;y>ì:Àu¼™Ëz;[¼.°T^¼™Ëz;iŽ/p´ç»j´ç»>д:°@ã»j´ç»nŽ:&�²»]:¼é«�¯¥¶»]:¼iŽ/p´ç»j´ç;>д:°@ã»j´ç;9�Ô:Dœ¼›¶;>Ýj0^:¼›¶;>Ýj0^:¼›¶»9�Ô:Dœ¼›¶»>д:°@ã»j´ç»iŽ/p´ç»j´ç»�ƒð.¡¶»]:<nŽ:"�²»]:<>д:°@ã»j´ç;iŽ/p´ç»j´ç;[¼.°T^¼ Ëz»y>ì:Àu¼ Ëz»9�Ô:Dœ¼›¶»>Ýj0^:¼›¶»
+U.®¬Ëz»R^<¶C:úu»R^<nŽ:"�²»]:<�ƒð.¡¶»]:<>Ýj0± ¼uµÿº£Ëú:®š¼uµÿºy>ì:Àu¼ Ëz»[¼.°T^¼ Ëz»
+U.®Žµÿº± <“‹Ç9»Ëúº± <¶C:úu»R^<
+U.®¬Ëz»R^<€é‰0×#¼ì†O°}µÿ:!± ¼ì†O°£Ëú:®š¼uµÿº>Ýj0± ¼uµÿº>Ýj0± ¼iµÿ:£Ëú:®š¼iµÿ:}µÿ:!± ¼ì†O°€é‰0×#¼ì†O°n—⯲Ëz»P^¼¶C:	úu»P^¼¥‹Ç9ËËúº± ¼
+˜ž. µÿº± ¼¶C:úu»R^<Ró¿:t´g»R^<ŸU;1¨»]:<nŽ:"�²»]:<£Ëú:®š¼uµÿºøùu;½u¼uµÿºg´g;£Ø¼ Ëz»y>ì:Àu¼ Ëz»“‹Ç9»Ëúº± <¶C:—>캱 <Ró¿:t´g»R^<¶C:úu»R^<}µÿ:!± ¼ì†O°¦Ëz;T^¼ì†O°øùu;½u¼uµÿº£Ëú:®š¼uµÿº£Ëú:®š¼iµÿ:øùu;½u¼iµÿ:¦Ëz;T^¼ì†O°}µÿ:!± ¼ì†O°¶C:	úu»P^¼Só¿:y´g»P^¼¶C:§>캱 ¼¥‹Ç9ËËúº± ¼y>ì:Àu¼™Ëz;g´g;£Ø¼™Ëz;øùu;½u¼iµÿ:£Ëú:®š¼iµÿ:nŽ:&�²»]:¼ U;1¨»]:¼Só¿:y´g»P^¼¶C:	úu»P^¼9�Ô:Dœ¼›¶;]‡P;k·û»›¶;g´g;£Ø¼™Ëz;y>ì:Àu¼™Ëz;>д:°@ã»j´ç»ÒV1;>Ö»j´ç» U;1¨»]:¼nŽ:&�²»]:¼>д:°@ã»j´ç;ÒV1;>Ö»j´ç;]‡P;k·û»›¶;9�Ô:Dœ¼›¶;9�Ô:Dœ¼›¶»]‡P;k·û»›¶»ÒV1;>Ö»j´ç»>д:°@ã»j´ç»nŽ:"�²»]:<ŸU;1¨»]:<ÒV1;>Ö»j´ç;>д:°@ã»j´ç;y>ì:Àu¼ Ëz»g´g;£Ø¼ Ëz»]‡P;k·û»›¶»9�Ô:Dœ¼›¶» U;1¨»]:¼EHJ;Y^—»]:¼ŸU;k‡P»P^¼Só¿:y´g»P^¼]‡P;k·û»›¶;O^—;ò‰â»›¶;
+1¨;r·û»™Ëz;g´g;£Ø¼™Ëz;ÒV1;>Ö»j´ç»oº€;Ò§À»j´ç»EHJ;Y^—»]:¼ U;1¨»]:¼ÒV1;>Ö»j´ç;oº€;Ò§À»j´ç;O^—;ò‰â»›¶;]‡P;k·û»›¶;]‡P;k·û»›¶»O^—;ò‰â»›¶»oº€;Ò§À»j´ç»ÒV1;>Ö»j´ç»ŸU;1¨»]:<BHJ;V^—»]:<oº€;Ò§À»j´ç;ÒV1;>Ö»j´ç;g´g;£Ø¼ Ëz»
+1¨;r·û» Ëz»O^—;ò‰â»›¶»]‡P;k·û»›¶»Ró¿:t´g»R^<�U;f‡P»R^<BHJ;V^—»]:<ŸU;1¨»]:<øùu;½u¼uµÿº�²;Cœ¼uµÿº
+1¨;r·û» Ëz»g´g;£Ø¼ Ëz»¶C:—>캱 <lŽ:L�Ôº± <�U;f‡P»R^<Ró¿:t´g»R^<¦Ëz;T^¼ì†O°ž¶;_:¼ì†O°�²;Cœ¼uµÿºøùu;½u¼uµÿºøùu;½u¼iµÿ:�²;Cœ¼iµÿ:ž¶;_:¼ì†O°¦Ëz;T^¼ì†O°Só¿:y´g»P^¼ŸU;k‡P»P^¼wŽ:\�Ôº± ¼¶C:§>캱 ¼g´g;£Ø¼™Ëz;
+1¨;r·û»™Ëz;�²;Cœ¼iµÿ:øùu;½u¼iµÿ:�²;Cœ¼uµÿº§@ã;ª@ã»uµÿº7Ö;>Ö» Ëz»
+1¨;r·û» Ëz»lŽ:L�Ôº± <8д:Tдº± <ÏV1;ÛV1»R^<�U;f‡P»R^<ž¶;_:¼ì†O°l´ç;n´ç»ì†O°§@ã;ª@ã»uµÿº�²;Cœ¼uµÿº�²;Cœ¼iµÿ:§@ã;ª@ã»iµÿ:l´ç;n´ç»ì†O°ž¶;_:¼ì†O°ŸU;k‡P»P^¼ÒV1;ÞV1»P^¼Fд:aдº± ¼wŽ:\�Ôº± ¼
+1¨;r·û»™Ëz;7Ö;>Ö»™Ëz;§@ã;ª@ã»iµÿ:�²;Cœ¼iµÿ:EHJ;Y^—»]:¼pº€;wº€»]:¼ÒV1;ÞV1»P^¼ŸU;k‡P»P^¼O^—;ò‰â»›¶;ɧÀ;˧À»›¶;7Ö;>Ö»™Ëz;
+1¨;r·û»™Ëz;oº€;Ò§À»j´ç»
+×£;×£»j´ç»pº€;wº€»]:¼EHJ;Y^—»]:¼oº€;Ò§À»j´ç;
+×£;×£»j´ç;ɧÀ;˧À»›¶;O^—;ò‰â»›¶;O^—;ò‰â»›¶»É§À;˧À»›¶»
+×£;×£»j´ç»oº€;Ò§À»j´ç»BHJ;V^—»]:<nº€;tº€»]:<
+×£;×£»j´ç;oº€;Ò§À»j´ç;
+1¨;r·û» Ëz»7Ö;>Ö» Ëz»É§À;˧À»›¶»O^—;ò‰â»›¶»�U;f‡P»R^<ÏV1;ÛV1»R^<nº€;tº€»]:<BHJ;V^—»]:<ɧÀ;˧À»›¶;î‰â;Q^—»›¶;j·û;1¨»™Ëz;7Ö;>Ö»™Ëz;
+×£;×£»j´ç»Ë§À;tº€»j´ç»Q^—;SHJ»]:¼pº€;wº€»]:¼
+×£;×£»j´ç;˧À;tº€»j´ç;î‰â;Q^—»›¶;ɧÀ;˧À»›¶;ɧÀ;˧À»›¶»î‰â;Q^—»›¶»Ë§À;tº€»j´ç»
+×£;×£»j´ç»nº€;tº€»]:<O^—;MHJ»]:<˧À;tº€»j´ç;
+×£;×£»j´ç;7Ö;>Ö» Ëz»j·û;1¨» Ëz»î‰â;Q^—»›¶»É§À;˧À»›¶»ÏV1;ÛV1»R^<Y‡P;§U»R^<O^—;MHJ»]:<nº€;tº€»]:<§@ã;ª@ã»uµÿº@œ<�²»uµÿºj·û;1¨» Ëz»7Ö;>Ö» Ëz»8д:Tдº± <0�Ô:‡Žº± <Y‡P;§U»R^<ÏV1;ÛV1»R^<l´ç;n´ç»ì†O°]:<ž¶»ì†O°@œ<�²»uµÿº§@ã;ª@ã»uµÿº§@ã;ª@ã»iµÿ:@œ<�²»iµÿ:]:<ž¶»ì†O°l´ç;n´ç»ì†O°ÒV1;ÞV1»P^¼]‡P;«U»P^¼@�Ô:‘Žº± ¼Fд:aдº± ¼7Ö;>Ö»™Ëz;j·û;1¨»™Ëz;@œ<�²»iµÿ:§@ã;ª@ã»iµÿ:pº€;wº€»]:¼Q^—;SHJ»]:¼]‡P;«U»P^¼ÒV1;ÞV1»P^¼0�Ô:‡Žº± <x>ì:7¶Cº± <e´g;eó¿ºR^<Y‡P;§U»R^<]:<ž¶»ì†O°P^<¥Ëz»ì†O°ºu<÷ùu»uµÿº@œ<�²»uµÿº@œ<�²»iµÿ:ºu<÷ùu»iµÿ:P^<¥Ëz»ì†O°]:<ž¶»ì†O°]‡P;«U»P^¼i´g;jó¿ºP^¼Š>ì:F¶Cº± ¼@�Ô:‘Žº± ¼j·û;1¨»™Ëz;ŸØ<x´g»™Ëz;ºu<÷ùu»iµÿ:@œ<�²»iµÿ:Q^—;SHJ»]:¼1¨;­U»]:¼i´g;jó¿ºP^¼]‡P;«U»P^¼î‰â;Q^—»›¶;e·û;^‡P»›¶;ŸØ<x´g»™Ëz;j·û;1¨»™Ëz;˧À;tº€»j´ç»8Ö;ÛV1»j´ç»1¨;­U»]:¼Q^—;SHJ»]:¼Ë§À;tº€»j´ç;8Ö;ÛV1»j´ç;e·û;^‡P»›¶;î‰â;Q^—»›¶;î‰â;Q^—»›¶»e·û;^‡P»›¶»8Ö;ÛV1»j´ç»Ë§À;tº€»j´ç»O^—;MHJ»]:<	1¨;©U»]:<8Ö;ÛV1»j´ç;˧À;tº€»j´ç;j·û;1¨» Ëz»ŸØ<x´g» Ëz»e·û;^‡P»›¶»î‰â;Q^—»›¶»Y‡P;§U»R^<e´g;eó¿ºR^<	1¨;©U»]:<O^—;MHJ»]:<@œ<�²»uµÿººu<÷ùu»uµÿºŸØ<x´g» Ëz»j·û;1¨» Ëz»8Ö;ÛV1»j´ç;ª@ã;Mдºj´ç;?œ<;�Ôº›¶;e·û;^‡P»›¶;e·û;^‡P»›¶»?œ<;�Ôº›¶»ª@ã;Mдºj´ç»8Ö;ÛV1»j´ç»	1¨;©U»]:<�²;„Žº]:<ª@ã;Mдºj´ç;8Ö;ÛV1»j´ç;ŸØ<x´g» Ëz»½u<™>캠Ëz»?œ<;�Ôº›¶»e·û;^‡P»›¶»e´g;eó¿ºR^<òùu;-¶CºR^<�²;„Žº]:<	1¨;©U»]:<ºu<÷ùu»uµÿº©š<¢Ëúºuµÿº½u<™>캠Ëz»ŸØ<x´g» Ëz»x>ì:7¶Cº± <™Ëú:ü‹Ç¹± <òùu;-¶CºR^<e´g;eó¿ºR^<P^<¥Ëz»ì†O°± <}µÿºì†O°©š<¢Ëúºuµÿººu<÷ùu»uµÿººu<÷ùu»iµÿ:©š<¢Ëúºiµÿ:± <}µÿºì†O°P^<¥Ëz»ì†O°i´g;jó¿ºP^¼õùu;4¶CºP^¼¬Ëú:
+ŒÇ¹± ¼Š>ì:F¶Cº± ¼ŸØ<x´g»™Ëz;½u<™>캙Ëz;©š<¢Ëúºiµÿ:ºu<÷ùu»iµÿ:1¨;­U»]:¼�²;‡Žº]:¼õùu;4¶CºP^¼i´g;jó¿ºP^¼e·û;^‡P»›¶;?œ<;�Ôº›¶;½u<™>캙Ëz;ŸØ<x´g»™Ëz;8Ö;ÛV1»j´ç»ª@ã;Mдºj´ç»�²;‡Žº]:¼1¨;­U»]:¼©š<¢Ëúºiµÿ:± <)|ƒ°iµÿ:×#<ÍìÀ°ì†O°± <}µÿºì†O°õùu;4¶CºP^¼�Ëz;¾A±P^¼~µÿ:õ8V±± ¼¬Ëú:
+ŒÇ¹± ¼½u<™>캙Ëz;P^<®W[±™Ëz;± <)|ƒ°iµÿ:©š<¢Ëúºiµÿ:�²;‡Žº]:¼›¶;¾A±]:¼�Ëz;¾A±P^¼õùu;4¶CºP^¼?œ<;�Ôº›¶;Y:<ÍìÀ°›¶;P^<®W[±™Ëz;½u<™>캙Ëz;ª@ã;Mдºj´ç»i´ç;p]þ°j´ç»›¶;¾A±]:¼�²;‡Žº]:¼ª@ã;Mдºj´ç;i´ç;p]þ°j´ç;Y:<ÍìÀ°›¶;?œ<;�Ôº›¶;?œ<;�Ôº›¶»Y:<ÍìÀ°›¶»i´ç;p]þ°j´ç»ª@ã;Mдºj´ç»�²;„Žº]:<˜¶;ëa2±]:<i´ç;p]þ°j´ç;ª@ã;Mдºj´ç;½u<™>캠Ëz»P^<®W[± Ëz»Y:<ÍìÀ°›¶»?œ<;�Ôº›¶»òùu;-¶CºR^<˜Ëz;3C-±R^<˜¶;ëa2±]:<�²;„Žº]:<©š<¢Ëúºuµÿº± <)|ƒ°uµÿºP^<®W[± Ëz»½u<™>캠Ëz»™Ëú:ü‹Ç¹± <lµÿ:RÈX±± <˜Ëz;3C-±R^<òùu;-¶CºR^<± <}µÿºì†O°×#<ÍìÀ°ì†O°± <)|ƒ°uµÿº©š<¢ËúºuµÿºY:<ÍìÀ°›¶»>œ<"�Ô:›¶»©@ã;+д:j´ç»i´ç;p]þ°j´ç»˜¶;ëa2±]:<�²;VŽ:]:<©@ã;+д:j´ç;i´ç;p]þ°j´ç;P^<®W[± Ëz»¼u<b>ì: Ëz»>œ<"�Ô:›¶»Y:<ÍìÀ°›¶»˜Ëz;3C-±R^<ðùu;ÔµC:R^<�²;VŽ:]:<˜¶;ëa2±]:<± <)|ƒ°uµÿº§š<�Ëú:uµÿº¼u<b>ì: Ëz»P^<®W[± Ëz»lµÿ:RÈX±± <™Ëú:"‹Ç9± <ðùu;ÔµC:R^<˜Ëz;3C-±R^<×#<ÍìÀ°ì†O°± <eµÿ:ì†O°§š<�Ëú:uµÿº± <)|ƒ°uµÿº± <)|ƒ°iµÿ:§š<�Ëú:iµÿ:± <eµÿ:ì†O°×#<ÍìÀ°ì†O°�Ëz;¾A±P^¼õùu;ÓµC:P^¼«Ëú:2‹Ç9± ¼~µÿ:õ8V±± ¼P^<®W[±™Ëz;¼u<b>ì:™Ëz;§š<�Ëú:iµÿ:± <)|ƒ°iµÿ:›¶;¾A±]:¼�²;VŽ:]:¼õùu;ÓµC:P^¼�Ëz;¾A±P^¼Y:<ÍìÀ°›¶;>œ<"�Ô:›¶;¼u<b>ì:™Ëz;P^<®W[±™Ëz;i´ç;p]þ°j´ç»©@ã;+д:j´ç»�²;VŽ:]:¼›¶;¾A±]:¼i´ç;p]þ°j´ç;©@ã;+д:j´ç;>œ<"�Ô:›¶;Y:<ÍìÀ°›¶;§š<�Ëú:iµÿ:·u<ëùu;iµÿ:M^<—Ëz;ì†O°± <eµÿ:ì†O°õùu;ÓµC:P^¼g´g;9ó¿:P^¼‰>ì:صC:± ¼«Ëú:2‹Ç9± ¼¼u<b>ì:™Ëz;ŸØ<\´g;™Ëz;·u<ëùu;iµÿ:§š<�Ëú:iµÿ:�²;VŽ:]:¼	1¨;“U;]:¼g´g;9ó¿:P^¼õùu;ÓµC:P^¼>œ<"�Ô:›¶;a·û;P‡P;›¶;ŸØ<\´g;™Ëz;¼u<b>ì:™Ëz;©@ã;+д:j´ç»5Ö;ÉV1;j´ç»	1¨;“U;]:¼�²;VŽ:]:¼©@ã;+д:j´ç;5Ö;ÉV1;j´ç;a·û;P‡P;›¶;>œ<"�Ô:›¶;>œ<"�Ô:›¶»a·û;P‡P;›¶»5Ö;ÉV1;j´ç»©@ã;+д:j´ç»�²;VŽ:]:<1¨;’U;]:<5Ö;ÉV1;j´ç;©@ã;+д:j´ç;¼u<b>ì: Ëz»ŸØ<\´g; Ëz»a·û;P‡P;›¶»>œ<"�Ô:›¶»ðùu;ÔµC:R^<b´g;8ó¿:R^<1¨;’U;]:<�²;VŽ:]:<§š<�Ëú:uµÿº·u<ëùu;uµÿºŸØ<\´g; Ëz»¼u<b>ì: Ëz»™Ëú:"‹Ç9± <x>ì:ʵC:± <b´g;8ó¿:R^<ðùu;ÔµC:R^<± <eµÿ:ì†O°M^<—Ëz;ì†O°·u<ëùu;uµÿº§š<�Ëú:uµÿº1¨;’U;]:<K^—;4HJ;]:<ɧÀ;jº€;j´ç;5Ö;ÉV1;j´ç;ŸØ<\´g; Ëz»i·û;1¨; Ëz»ç‰â;I^—;›¶»a·û;P‡P;›¶»b´g;8ó¿:R^<T‡P;�U;R^<K^—;4HJ;]:<1¨;’U;]:<·u<ëùu;uµÿº=œ<�²;uµÿºi·û;1¨; Ëz»ŸØ<\´g; Ëz»x>ì:ʵC:± </�Ô:OŽ:± <T‡P;�U;R^<b´g;8ó¿:R^<M^<—Ëz;ì†O°Y:<•¶;ì†O°=œ<�²;uµÿº·u<ëùu;uµÿº·u<ëùu;iµÿ:=œ<�²;iµÿ:Y:<•¶;ì†O°M^<—Ëz;ì†O°g´g;9ó¿:P^¼Y‡P;’U;P^¼=�Ô:YŽ:± ¼‰>ì:صC:± ¼ŸØ<\´g;™Ëz;i·û;1¨;™Ëz;=œ<�²;iµÿ:·u<ëùu;iµÿ:	1¨;“U;]:¼N^—;7HJ;]:¼Y‡P;’U;P^¼g´g;9ó¿:P^¼a·û;P‡P;›¶;ç‰â;I^—;›¶;i·û;1¨;™Ëz;ŸØ<\´g;™Ëz;5Ö;ÉV1;j´ç»É§À;jº€;j´ç»N^—;7HJ;]:¼	1¨;“U;]:¼5Ö;ÉV1;j´ç;ɧÀ;jº€;j´ç;ç‰â;I^—;›¶;a·û;P‡P;›¶;a·û;P‡P;›¶»ç‰â;I^—;›¶»É§À;jº€;j´ç»5Ö;ÉV1;j´ç»Y‡P;’U;P^¼ÍV1;ÂV1;P^¼Bд:)д:± ¼=�Ô:YŽ:± ¼i·û;1¨;™Ëz;7Ö;0Ö;™Ëz;ž@ã;ž@ã;iµÿ:=œ<�²;iµÿ:N^—;7HJ;]:¼lº€;hº€;]:¼ÍV1;ÂV1;P^¼Y‡P;’U;P^¼ç‰â;I^—;›¶;Á§À;§À;›¶;7Ö;0Ö;™Ëz;i·û;1¨;™Ëz;ɧÀ;jº€;j´ç»×£;×£;j´ç»lº€;hº€;]:¼N^—;7HJ;]:¼É§À;jº€;j´ç;×£;×£;j´ç;Á§À;§À;›¶;ç‰â;I^—;›¶;ç‰â;I^—;›¶»Á§À;§À;›¶»×£;×£;j´ç»É§À;jº€;j´ç»K^—;4HJ;]:<jº€;fº€;]:<×£;×£;j´ç;ɧÀ;jº€;j´ç;i·û;1¨; Ëz»7Ö;0Ö; Ëz»Á§À;§À;›¶»ç‰â;I^—;›¶»T‡P;�U;R^<ÊV1;ÀV1;R^<jº€;fº€;]:<K^—;4HJ;]:<=œ<�²;uµÿºž@ã;ž@ã;uµÿº7Ö;0Ö; Ëz»i·û;1¨; Ëz»/�Ô:OŽ:± <7д:д:± <ÊV1;ÀV1;R^<T‡P;�U;R^<Y:<•¶;ì†O°a´ç;b´ç;ì†O°ž@ã;ž@ã;uµÿº=œ<�²;uµÿº=œ<�²;iµÿ:ž@ã;ž@ã;iµÿ:a´ç;b´ç;ì†O°Y:<•¶;ì†O°7Ö;0Ö; Ëz»	1¨;b·û; Ëz»G^—;æ‰â;›¶»Á§À;§À;›¶»ÊV1;ÀV1;R^<™U;J‡P;R^<;HJ;G^—;]:<jº€;fº€;]:<ž@ã;ž@ã;uµÿº�²;;œ<uµÿº	1¨;b·û; Ëz»7Ö;0Ö; Ëz»7д:д:± <jŽ:�Ô:± <™U;J‡P;R^<ÊV1;ÀV1;R^<a´ç;b´ç;ì†O°“¶;W:<ì†O°�²;;œ<uµÿºž@ã;ž@ã;uµÿºž@ã;ž@ã;iµÿ:�²;;œ<iµÿ:“¶;W:<ì†O°a´ç;b´ç;ì†O°ÍV1;ÂV1;P^¼›U;L‡P;P^¼sŽ:"�Ô:± ¼Bд:)д:± ¼7Ö;0Ö;™Ëz;	1¨;b·û;™Ëz;�²;;œ<iµÿ:ž@ã;ž@ã;iµÿ:lº€;hº€;]:¼=HJ;I^—;]:¼›U;L‡P;P^¼ÍV1;ÂV1;P^¼Á§À;§À;›¶;G^—;æ‰â;›¶;	1¨;b·û;™Ëz;7Ö;0Ö;™Ëz;×£;×£;j´ç»kº€;ŧÀ;j´ç»=HJ;I^—;]:¼lº€;hº€;]:¼×£;×£;j´ç;kº€;ŧÀ;j´ç;G^—;æ‰â;›¶;Á§À;§À;›¶;Á§À;§À;›¶»G^—;æ‰â;›¶»kº€;ŧÀ;j´ç»×£;×£;j´ç»jº€;fº€;]:<;HJ;G^—;]:<kº€;ŧÀ;j´ç;×£;×£;j´ç;	1¨;b·û;™Ëz;f´g;›Ø<™Ëz;ãùu;´u<iµÿ:�²;;œ<iµÿ:=HJ;I^—;]:¼™U;1¨;]:¼Kó¿:Y´g;P^¼›U;L‡P;P^¼G^—;æ‰â;›¶;J‡P;]·û;›¶;f´g;›Ø<™Ëz;	1¨;b·û;™Ëz;kº€;ŧÀ;j´ç»ÊV1;2Ö;j´ç»™U;1¨;]:¼=HJ;I^—;]:¼kº€;ŧÀ;j´ç;ÊV1;2Ö;j´ç;J‡P;]·û;›¶;G^—;æ‰â;›¶;G^—;æ‰â;›¶»J‡P;]·û;›¶»ÊV1;2Ö;j´ç»kº€;ŧÀ;j´ç»;HJ;G^—;]:<—U;1¨;]:<ÊV1;2Ö;j´ç;kº€;ŧÀ;j´ç;	1¨;b·û; Ëz»f´g;›Ø< Ëz»J‡P;]·û;›¶»G^—;æ‰â;›¶»™U;J‡P;R^<Ió¿:W´g;R^<—U;1¨;]:<;HJ;G^—;]:<�²;;œ<uµÿºãùu;´u<uµÿºf´g;›Ø< Ëz»	1¨;b·û; Ëz»jŽ:�Ô:± <þµC:]>ì:± <Ió¿:W´g;R^<™U;J‡P;R^<“¶;W:<ì†O°�Ëz;J^<ì†O°ãùu;´u<uµÿº�²;;œ<uµÿº�²;;œ<iµÿ:ãùu;´u<iµÿ:�Ëz;J^<ì†O°“¶;W:<ì†O°›U;L‡P;P^¼Kó¿:Y´g;P^¼
+¶C:n>ì:± ¼sŽ:"�Ô:± ¼Ió¿:W´g;R^<óµC:ãùu;R^<`Ž:�²;]:<—U;1¨;]:<ãùu;´u<uµÿº€Ëú:¤š<uµÿºw>ì:¸u< Ëz»f´g;›Ø< Ëz»þµC:]>ì:± <Š‹Ç9~Ëú:± <óµC:ãùu;R^<Ió¿:W´g;R^<�Ëz;J^<ì†O°Uµÿ:± <ì†O°€Ëú:¤š<uµÿºãùu;´u<uµÿºãùu;´u<iµÿ:€Ëú:¤š<iµÿ:Uµÿ:± <ì†O°�Ëz;J^<ì†O°Kó¿:Y´g;P^¼õµC:æùu;P^¼’‹Ç9�Ëú:± ¼
+¶C:n>ì:± ¼f´g;›Ø<™Ëz;w>ì:¸u<™Ëz;€Ëú:¤š<iµÿ:ãùu;´u<iµÿ:™U;1¨;]:¼cŽ:�²;]:¼õµC:æùu;P^¼Kó¿:Y´g;P^¼J‡P;]·û;›¶;�Ô:;œ<›¶;w>ì:¸u<™Ëz;f´g;›Ø<™Ëz;ÊV1;2Ö;j´ç».д:¢@ã;j´ç»cŽ:�²;]:¼™U;1¨;]:¼ÊV1;2Ö;j´ç;.д:¢@ã;j´ç;�Ô:;œ<›¶;J‡P;]·û;›¶;J‡P;]·û;›¶»�Ô:;œ<›¶».д:¢@ã;j´ç»ÊV1;2Ö;j´ç»—U;1¨;]:<`Ž:�²;]:<.д:¢@ã;j´ç;ÊV1;2Ö;j´ç;f´g;›Ø< Ëz»w>ì:¸u< Ëz»�Ô:;œ<›¶»J‡P;]·û;›¶»�Ô:;œ<›¶;@;±T:<›¶;[¼.°K^<™Ëz;w>ì:¸u<™Ëz;.д:¢@ã;j´ç»u?Ò°a´ç;j´ç»ÑΔ°�¶;]:¼cŽ:�²;]:¼.д:¢@ã;j´ç;u?Ò°a´ç;j´ç;@;±T:<›¶;�Ô:;œ<›¶;�Ô:;œ<›¶»@;±T:<›¶»u?Ò°a´ç;j´ç».д:¢@ã;j´ç»`Ž:�²;]:<³I©°Ž¶;]:<u?Ò°a´ç;j´ç;.д:¢@ã;j´ç;w>ì:¸u< Ëz»[¼.°K^< Ëz»@;±T:<›¶»�Ô:;œ<›¶»óµC:ãùu;R^<²W°ŠËz;R^<³I©°Ž¶;]:<`Ž:�²;]:<€Ëú:¤š<uµÿºÏÍ0±± <uµÿº[¼.°K^< Ëz»w>ì:¸u< Ëz»Š‹Ç9~Ëú:± <Šv&¯Pµÿ:± <²W°ŠËz;R^<óµC:ãùu;R^<Uµÿ:± <ì†O°@;±
×#<ì†O°ÏÍ0±± <uµÿº€Ëú:¤š<uµÿº€Ëú:¤š<iµÿ:ÏÍ0±± <iµÿ:@;±
×#<ì†O°Uµÿ:± <ì†O°õµC:æùu;P^¼²W°ŒËz;P^¼Œίaµÿ:± ¼’‹Ç9�Ëú:± ¼w>ì:¸u<™Ëz;[¼.°K^<™Ëz;ÏÍ0±± <iµÿ:€Ëú:¤š<iµÿ:cŽ:�²;]:¼ÑΔ°�¶;]:¼²W°ŒËz;P^¼õµC:æùu;P^¼€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€(¤Cº€`µÄ<Ö»€ÍfÖ<PþGº€`´6¹€Ðÿ’;€:ûƒ;€ë<€d<<€Pî�¹€"í¨<’…»€`µÄ<Ö»€(¤Cº€,õ×:€€»:€:ûƒ;€Ðÿ’;€³
;€°€^<=Ú¢»€"í¨<’…»€Pî�¹€€õí8€‡›8€€»:€,õ×:€y¨<€–6‘;ú­-»€°€^<=Ú¢»€³
;€€€‡›8€€õí8€Rd›<€@ E;€–6‘;ú­-»€y¨<€€€€€nW¹<€	^i<€@ E;€Rd›<€€¾Ný<Xµ€€š[þ<À 8¸€{äÿ<0€ÿ¸€½Ný¼Ð
µ€™[þ¼à8¸€<P=˜ÂF¹€€B=¤Vb¹€kúþ<|ÂF¹€ÇÒý<€ÿ¸€€ãGý<¢ 8¸€ŠJý<Lµ€<Ký<€€=Ký<€BKý<€CKý<€€=Ký<€CKý<€€€CKý¼€=Ký¼€BKý¼€€AKý¼€=Ký¼€<Ký¼€€ŠJý¼hµ€âGý¼Ë 8¸€ÆÒý¼øÿ¸€€kúþ¼TÂF¹€A½\Vb¹€;P½@ÂF¹€€zäÿ¼Pÿ¸€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€Ø£<€jº„<€	^i<€nW¹<€`´6¹€ÍfÖ<PþGº€¾Ný<Xµ€€d<<€ë<€jº„<€Ø£<€jº„<€Èy@;€’þ_»€	^i<€ÍfÖ<PþGº€8†ë<>zκ€š[þ<À 8¸€¾Ný<Xµ€ë<€Ê�›;€Èy@;€jº„<€`µÄ<Ö»€çdä<ד”»€8†ë<>zκ€ÍfÖ<PþGº€:ûƒ;€`:;€Ê�›;€ë<€"í¨<’…»€þ¯<&�ü»€çdä<ד”»€`µÄ<Ö»€€»:€À­g:€`:;€:ûƒ;€°€^<=Ú¢»€>O<Lß!¼€þ¯<&�ü»€"í¨<’…»€‡›8€€À­g:€€»:€–6‘;ú­-»€6­¶;01¼�V¸9>O<Lß!¼€°€^<=Ú¢»€€€€‡›8€@ E;€¾—:Ø2¼€6­¶;01¼�V¸9–6‘;ú­-»€€€€€	^i<€’þ_»€¾—:Ø2¼€@ E;€€€‹•9€À­g:€6­¶;01¼�V¸9a]¸;¶¼H`;”™;fΤ¼xÔ:;>O<Lß!¼€€€€€¾—:Ø2¼€an;n”¼Ûþ;a]¸;¶¼H`;6­¶;01¼�V¸9€€€€’þ_»€)$¼€an;n”¼Ûþ;¾—:Ø2¼€Èy@;€D"¤»€)$¼€’þ_»€8†ë<>zκ€dÈð<$»€{äÿ<0€ÿ¸€š[þ<À 8¸€Ê�›;€à2û9€D"¤»€Èy@;€çdä<ד”»€ž´<ÇÐØ»€dÈð<$»€8†ë<>zκ€`:;€H$·:€à2û9€Ê�›;€þ¯<&�ü»€þ�=;€tp¼�wñ:ž´<ÇÐØ»€çdä<ד”»€À­g:€‹•9€H$·:€`:;€>O<Lß!¼€”™;fΤ¼xÔ:;þ�=;€tp¼�wñ:þ¯<&�ü»€à2û9€ó4.»€hý»€D"¤»€ž´<ÇÐØ»€oF<ôE¼€pÛâ<}¦B»€dÈð<$»€H$·:€Àm9€ó4.»€à2û9€þ�=;€tp¼�wñ:¨ˆ/;³Š‹¼ì‰Õ:oF<ôE¼€ž´<ÇÐØ»€‹•9€€Àm9€H$·:€”™;fΤ¼xÔ:;¼þ:
+­¼°‚š:¨ˆ/;³Š‹¼ì‰Õ:þ�=;€tp¼�wñ:€€€‹•9€a]¸;¶¼H`;à` :èüµ¼$C:¼þ:
+­¼°‚š:”™;fΤ¼xÔ:;€€€€an;n”¼Ûþ;Ê“,;ž±¼0ñÑ:à` :èüµ¼$C:a]¸;¶¼H`;€€€€)$¼€X×¾:˜ˆz¼)h:Ê“,;ž±¼0ñÑ:an;n”¼Ûþ;D"¤»€hý»€X×¾:˜ˆz¼)h:)$¼€dÈð<$»€pÛâ<}¦B»€<P=˜ÂF¹€{äÿ<0€ÿ¸€€€€€Ê“,;ž±¼0ñÑ::ø7€¿¨¼Àü–7ù?»¼€à` :èüµ¼$C:€€€€X×¾:˜ˆz¼)h:HœQ:�ƒ¼Jþþ9:ø7€¿¨¼Àü–7Ê“,;ž±¼0ñÑ:hý»€Åa¼€HœQ:�ƒ¼Jþþ9X×¾:˜ˆz¼)h:pÛâ<}¦B»€ŠÌ<ý´P»€B=¤Vb¹€<P=˜ÂF¹€ó4.»€	µP»€Åa¼€hý»€oF<ôE¼€Ðo;üE0¼\—:ŠÌ<ý´P»€pÛâ<}¦B»€Àm9€€Vb¹€	µP»€ó4.»€¨ˆ/;³Š‹¼ì‰Õ:ÜÒË:�à‰¼ ôw:Ðo;üE0¼\—:oF<ôE¼€€€€Vb¹€Àm9€¼þ:
+­¼°‚š:X!6G�¨¼@Ä5ÜÒË:�à‰¼ ôw:¨ˆ/;³Š‹¼ì‰Õ:€€€€à` :èüµ¼$C:ù?»¼€X!6G�¨¼@Ä5¼þ:
+­¼°‚š:Ðo;üE0¼\—:8­;D‰(¼¼9�:3À¹<~¦B»€ŠÌ<ý´P»€€Vb¹€Þò¸€M¯/»€	µP»€ÜÒË:�à‰¼ ôw:€k:¢9w¼ˆü:8­;D‰(¼¼9�:Ðo;üE0¼\—:€€Þò¸€€Vb¹€X!6G�¨¼@Ä5]¶›¼€€k:¢9w¼ˆü:ÜÒË:�à‰¼ ôw:€€€€ù?»¼€e«¼€]¶›¼€X!6G�¨¼@Ä5€€€€:ø7€¿¨¼Àü–7‹†™¼€e«¼€ù?»¼€€€€€HœQ:�ƒ¼Jþþ9Àâ9»b¼F9Ÿ8‹†™¼€:ø7€¿¨¼Àü–7Åa¼€hý»€Àâ9»b¼F9Ÿ8HœQ:�ƒ¼Jþþ9ŠÌ<ý´P»€3À¹<~¦B»€kúþ<|ÂF¹€B=¤Vb¹€	µP»€M¯/»€hý»€Åa¼€‹†™¼€°-6½Ýg¼@Ó5¨Ëƒ¼€e«¼€€€€€Àâ9»b¼F9Ÿ8)$¼€°-6½Ýg¼@Ó5‹†™¼€hý»€Ô¬»€)$¼€Àâ9»b¼F9Ÿ83À¹<~¦B»€´¯<$»€ÇÒý<€ÿ¸€kúþ<|ÂF¹€M¯/»€»@¿º€Ô¬»€hý»€8­;D‰(¼¼9�:¯±;õì	¼0œƒ:´¯<$»€3À¹<~¦B»€Þò¸€€»@¿º€M¯/»€€k:¢9w¼ˆü:Xž<:÷)G¼àtå9¯±;õì	¼0œƒ:8­;D‰(¼¼9�:€€€Þò¸€]¶›¼€Æ„8^ðv¼€…!8Xž<:÷)G¼àtå9€k:¢9w¼ˆü:€€€€e«¼€¨Ëƒ¼€Æ„8^ðv¼€…!8]¶›¼€€€€€€€J“¹€»@¿º€Xž<:÷)G¼àtå90²Ô9��¼ _�9²ÿœ;ý¼»é/:¯±;õì	¼0œƒ:€€€€Æ„8^ðv¼€…!8C´9%(¼@J[90²Ô9��¼ _�9Xž<:÷)G¼àtå9€€€€¨Ëƒ¼€“9~%)¼ ¶£8C´9%(¼@J[9Æ„8^ðv¼€…!8€€€€°-6½Ýg¼@Ó5ø˜6UI¼:6“9~%)¼ ¶£8¨Ëƒ¼€€€€€)$¼€Ô´»€ø˜6UI¼:6°-6½Ýg¼@Ó5Ô¬»€’»€Ô´»€)$¼€´¯<$»€²ì­<4zκ€ãGý<¢ 8¸€ÇÒý<€ÿ¸€»@¿º€J“¹€’»€Ô¬»€¯±;õì	¼0œƒ:²ÿœ;ý¼»é/:²ì­<4zκ€´¯<$»€€€€€Ô´»€éoߺ€�’b»€ø˜6UI¼:6’»€„• ¹€éoߺ€Ô´»€²ì­<4zκ€]¬±<6þGº€ŠJý<Lµ€ãGý<¢ 8¸€J“¹€€„• ¹€’»€²ÿœ;ý¼»é/:/<¶#»<:8]¬±<6þGº€²ì­<4zκ€€€€J“¹€0²Ô9��¼ _�9hn3:KЋ»€�ï8/<¶#»<:8²ÿœ;ý¼»é/:€€€€C´9%(¼@J[9øå8)Ʀ»€á‹8hn3:KЋ»€�ï80²Ô9��¼ _�9€€€€“9~%)¼ ¶£8ˆm7¡›»{7øå8)Ʀ»€á‹8C´9%(¼@J[9€€€€ø˜6UI¼:6�’b»€ˆm7¡›»{7“9~%)¼ ¶£8hn3:KЋ»€�ï8†?v;9Á
»z:}<<4Gº€/<¶#»<:8€€€€øå8)Ʀ»€á‹8À/5ŒË·ºÀ©4†?v;9Á
»z:hn3:KЋ»€�ï8€€€€ˆm7¡›»{7t¦ˆº€À/5ŒË·ºÀ©4øå8)Ʀ»€á‹8€€€€�’b»€88á¹€t¦ˆº€ˆm7¡›»{7€€€€éoߺ€ËK·€88á¹€�’b»€„• ¹€€ËK·€éoߺ€]¬±<6þGº€vœ·<h´6¹€<Ký<€ŠJý<Lµ€€€€„• ¹€/<¶#»<:8}<<4Gº€vœ·<h´6¹€]¬±<6þGº€€€€€ËK·€7³8—ø`Z8@èk9»€¹Ð}988á¹€€€7³8—ø`Z8ËK·€vœ·<h´6¹€Oaº<€=Ký<€<Ký<€€€€€}<<4Gº€ªhU<ãv·€Oaº<€vœ·<h´6¹€€€€€†?v;9Á
»z:O×Ð;¢îº”Û‚:ªhU<ãv·€}<<4Gº€€€€€À/5ŒË·ºÀ©4#:0¯¬¹`¿>9O×Ð;¢îº”Û‚:†?v;9Á
»z:€€€€t¦ˆº€� ‰9¨•¹ Ñ&9#:0¯¬¹`¿>9À/5ŒË·ºÀ©4€€€€88á¹€@èk9»€¹Ð}9� ‰9¨•¹ Ñ&9t¦ˆº€€€€€€€€€#:0¯¬¹`¿>9Û;(Ê»h!•:ãØý;¦S»Ðêë:O×Ð;¢îº”Û‚:€€€€� ‰9¨•¹ Ñ&9^ó	;$Ž»†Ñ§:Û;(Ê»h!•:#:0¯¬¹`¿>9€€€€@èk9»€¹Ð}9pÕ
;˻Ҋ¬:^ó	;$Ž»†Ñ§:� ‰9¨•¹ Ñ&9€€€€7³8—ø`Z8€�Ü:°·ðºÖ(†:pÕ
;˻Ҋ¬:@èk9»€¹Ð}9€Häh:Ð+~ºZ¨
:€�Ü:°·ðºÖ(†:7³8—ø`Z8Oaº<€Oaº<€BKý<€=Ký<€€à‹C9ÀiU¹`âí8Häh:Ð+~ºZ¨
:€ªhU<ãv·€©
V<€Oaº<€Oaº<€€€à‹C9ÀiU¹`âí8€O×Ð;¢îº”Û‚:ãØý;¦S»Ðêë:©
V<€ªhU<ãv·€Häh:Ð+~ºZ¨
:]JP;pRc»;cý:?£›;¼Û©»»U=;€�Ü:°·ðºÖ(†:Oaº<€Raº<€CKý<€BKý<€à‹C9ÀiU¹`âí8€
»:´̺œ~c:]JP;pRc»;cý:Häh:Ð+~ºZ¨
:©
V<€­
V<€Raº<€Oaº<€€ ¹Y9À�m¹`n9€
»:´̺œ~c:à‹C9ÀiU¹`âí8ãØý;¦S»Ðêë:hh:ƒ‹»:‚;­
V<۩
V<€€€ ¹Y9À�m¹`n9€Û;(Ê»h!•:4—;'G™»uÚ*;hh:ƒ‹»:‚;ãØý;¦S»Ðêë:€€€€^ó	;$Ž»†Ñ§: ƒ©;%¹»£6N;4—;'G™»uÚ*;Û;(Ê»h!•:€€€€pÕ
;˻Ҋ¬:÷Ö´;ô\Å»Rþ[; ƒ©;%¹»£6N;^ó	;$Ž»†Ñ§:€€€€€�Ü:°·ðºÖ(†:?£›;¼Û©»»U=;÷Ö´;ô\Å»Rþ[;pÕ
;˻Ҋ¬:€€€€ ƒ©;%¹»£6N;>%
<Á
+¼z´«;âê;<Ðó»Œâ‡;4—;'G™»uÚ*;€€€€÷Ö´;ô\Å»Rþ[;Ìe<çi'¼!œº;>%
<Á
+¼z´«; ƒ©;%¹»£6N;€€€€?£›;¼Û©»»U=;°<X-¼FH¦;Ìe<çi'¼!œº;÷Ö´;ô\Å»Rþ[;]JP;pRc»;cý:óHÄ;:8Ö»bÈn;°<X-¼FH¦;?£›;¼Û©»»U=;Raº<€Raº<€=Ký<€CKý<€€
»:´̺œ~c:3ˆQ;T­d»âåþ:óHÄ;:8Ö»bÈn;]JP;pRc»;cý:­
V<€²
V<€Raº<€Raº<€ ¹Y9À�m¹`n9 Är:Py„ºè©:3ˆQ;T­d»âåþ:€
»:´̺œ~c:hh:ƒ‹»:‚;„l=:&`‘»~";²
V<€­
V<€€€ Är:Py„ºè©: ¹Y9À�m¹`n94—;'G™»uÚ*;âê;<Ðó»Œâ‡;„l=:&`‘»~";hh:ƒ‹»:‚;Raº<€Waº<€CKý<€=Ký<€3ˆQ;T­d»âåþ:þš;Ž.¨»Ww;;-<-�¼ø—¥;óHÄ;:8Ö»bÈn;²
V<€²
V<€Waº<€Raº<€ Är:Py„ºè©:ˆ¥×:°Yëº+ƒ:þš;Ž.¨»Ww;;3ˆQ;T­d»âåþ:„l=:&`‘»~";¬ö·:Dr»¦æ;²
V<€²
V<€€°‡ž8À­¸Ú@8ˆ¥×:°Yëº+ƒ: Är:Py„ºè©:âê;<Ðó»Œâ‡;à]<q¼$ά;¬ö·:Dr»¦æ;„l=:&`‘»~";€€°‡ž8À­¸Ú@8€>%
<Á
+¼z´«;Zó:<JL¼lmã;à]<q¼$ά;âê;<Ðó»Œâ‡;€€€€Ìe<çi'¼!œº;©øM<�Ê`¼û�ú;Zó:<JL¼lmã;>%
<Á
+¼z´«;€€€€°<X-¼FH¦;>†9<ÔyJ¼C±á;©øM<�Ê`¼û�ú;Ìe<çi'¼!œº;óHÄ;:8Ö»bÈn;-<-�¼ø—¥;>†9<ÔyJ¼C±á;°<X-¼FH¦;Zó:<JL¼lmã;@é_¼æ•ù;nÂ$¼Á¦·;à]<q¼$ά;€€€€©øM<�Ê`¼û�ú;îÙx¼V±
+<@é_¼æ•ù;Zó:<JL¼lmã;€€€€>†9<ÔyJ¼C±á;<é_¼â•ù;îÙx¼V±
+<©øM<�Ê`¼û�ú;-<-�¼ø—¥;pÂ$¼Â¦·;<é_¼â•ù;>†9<ÔyJ¼C±á;Waº<€€f¹¥§8€CKý<€þš;Ž.¨»Ww;;9½»iëR;pÂ$¼Â¦·;-<-�¼ø—¥;²
V<€¯
+»ô•š:€f¹¥§8Waº<€ˆ¥×:°Yëº+ƒ:ü®
+»ä•š:9½»iëR;þš;Ž.¨»Ww;;¬ö·:Dr»¦æ;9½»iëR;¯
+»ô•š:²
V<€°‡ž8À­¸Ú@8@f¹¥§8ü®
+»ä•š:ˆ¥×:°Yëº+ƒ:à]<q¼$ά;nÂ$¼Á¦·;9½»iëR;¬ö·:Dr»¦æ;€€@f¹¥§8°‡ž8À­¸Ú@89½»iëR;üš»Ž.¨»Ww;;/¼.�¼ø—¥;pÂ$¼Â¦·;¯
+»ô•š:²
V¼€Vaº¼€€f¹¥§8ü®
+»ä•š:–¥×º¸Yëº+ƒ:üš»Ž.¨»Ww;;9½»iëR;9½»iëR;±ö·ºHr»¦æ;²
V¼€¯
+»ô•š:@f¹¥§8ˆž¸@­¸Ú@8–¥×º¸Yëº+ƒ:ü®
+»ä•š:nÂ$¼Á¦·;â]¼r¼$ά;±ö·ºHr»¦æ;9½»iëR;€€ˆž¸@­¸Ú@8@f¹¥§8@é_¼æ•ù;Yó:¼JL¼lmã;â]¼r¼$ά;nÂ$¼Á¦·;€€€€îÙx¼V±
+<ªøM¼‚Ê`¼û�ú;Yó:¼JL¼lmã;@é_¼æ•ù;€€€€<é_¼â•ù;B†9¼ÕyJ¼C±á;ªøM¼‚Ê`¼û�ú;îÙx¼V±
+<pÂ$¼Â¦·;/¼.�¼ø—¥;B†9¼ÕyJ¼C±á;<é_¼â•ù;€f¹¥§8Vaº¼€CKý¼€€€€€€ªøM¼‚Ê`¼û�ú;Íe¼éi'¼!œº;<%
¼Á
+¼z´«;Yó:¼JL¼lmã;€€€€B†9¼ÕyJ¼C±á;°¼Z-¼FH¦;Íe¼éi'¼!œº;ªøM¼‚Ê`¼û�ú;/¼.�¼ø—¥;öHÄ»>8Ö»bÈn;°¼Z-¼FH¦;B†9¼ÕyJ¼C±á;Vaº¼€Qaº¼€=Ký¼€CKý¼€üš»Ž.¨»Ww;;,ˆQ»T­d»âåþ:öHÄ»>8Ö»bÈn;/¼.�¼ø—¥;²
V¼€±
V¼€Qaº¼€Vaº¼€–¥×º¸Yëº+ƒ:0Ärºly„ºè©:,ˆQ»T­d»âåþ:üš»Ž.¨»Ww;;±ö·ºHr»¦æ;Œl=º(`‘»~";±
V¼€²
V¼€ˆž¸@­¸Ú@8€0Ärºly„ºè©:–¥×º¸Yëº+ƒ:â]¼r¼$ά;äê»CÐó»Œâ‡;Œl=º(`‘»~";±ö·ºHr»¦æ;€€€ˆž¸@­¸Ú@8Yó:¼JL¼lmã;<%
¼Á
+¼z´«;äê»CÐó»Œâ‡;â]¼r¼$ά;±
V¼€«
V¼€Qaº¼€Qaº¼€0Ärºly„ºè©:¹Y¹ žm¹`n9p
»º¸̺œ~c:,ˆQ»T­d»âåþ:Œl=º(`‘»~";hhº
+ƒ‹»:‚;«
V¼€±
V¼€€€¹Y¹ žm¹`n90Ärºly„ºè©:äê»CÐó»Œâ‡;3—».G™»uÚ*;hhº
+ƒ‹»:‚;Œl=º(`‘»~";€€€€<%
¼Á
+¼z´«;ƒ©»&¹»£6N;3—».G™»uÚ*;äê»CÐó»Œâ‡;€€€€Íe¼éi'¼!œº;øÖ´»ú\Å»Rþ[;ƒ©»&¹»£6N;<%
¼Á
+¼z´«;€€€€°¼Z-¼FH¦;A£›»ÂÛ©»»U=;øÖ´»ú\Å»Rþ[;Íe¼éi'¼!œº;öHÄ»>8Ö»bÈn;_JP»|Rc»;cý:A£›»ÂÛ©»»U=;°¼Z-¼FH¦;Qaº¼€Qaº¼€BKý¼€=Ký¼€,ˆQ»T­d»âåþ:p
»º¸̺œ~c:_JP»|Rc»;cý:öHÄ»>8Ö»bÈn;øÖ´»ú\Å»Rþ[;lÕ
»Ë»ÒŠ¬:Tó	»(Ž»†Ñ§:ƒ©»&¹»£6N;€€€€A£›»ÂÛ©»»U=;„�ܺȷðºÖ(†:lÕ
»Ë»ÒŠ¬:øÖ´»ú\Å»Rþ[;_JP»|Rc»;cý:8ähº,~ºZ¨
:„�ܺȷðºÖ(†:A£›»ÂÛ©»»U=;Qaº¼€Paº¼€AKý¼€BKý¼€p
»º¸̺œ~c:@‹C¹jU¹`âí88ähº,~ºZ¨
:_JP»|Rc»;cý:«
V¼€§
V¼€Paº¼€Qaº¼€¹Y¹ žm¹`n9€@‹C¹jU¹`âí8p
»º¸̺œ~c:hhº
+ƒ‹»:‚;äØý»"¦S»Ðêë:§
V¼€«
V¼€€€€¹Y¹ žm¹`n93—».G™»uÚ*;Û»:Ê»h!•:äØý»"¦S»Ðêë:hhº
+ƒ‹»:‚;€€€€ƒ©»&¹»£6N;Tó	»(Ž»†Ñ§:Û»:Ê»h!•:3—».G™»uÚ*;€€€€€€€@‹C¹jU¹`âí8äØý»"¦S»Ðêë:K×л$¢îº”Û‚:¨hU¼åv·€§
V¼€€€€€Û»:Ê»h!•:à
+#º°¯¬¹`¿>9K×л$¢îº”Û‚:äØý»"¦S»Ðêë:€€€€Tó	»(Ž»†Ñ§:P ‰¹¨•¹ Ñ&9à
+#º°¯¬¹`¿>9Û»:Ê»h!•:€€€€lÕ
»Ë»ÒŠ¬:Àçk¹�»€¹Ð}9P ‰¹¨•¹ Ñ&9Tó	»(Ž»†Ñ§:€€€€„�ܺȷðºÖ(†:€6³¸À˜Ã¸`Z8Àçk¹�»€¹Ð}9lÕ
»Ë»ÒŠ¬:8ähº,~ºZ¨
:€€6³¸À˜Ã¸`Z8„�ܺȷðºÖ(†:Paº¼€Naº¼€=Ký¼€AKý¼€@‹C¹jU¹`âí8€€8ähº,~ºZ¨
:§
V¼€¨hU¼åv·€Naº¼€Paº¼€€€€€€6³¸À˜Ã¸`Z8ÙK·€¸8á¹€Àçk¹�»€¹Ð}9€€ÙK·€€6³¸À˜Ã¸`Z8Naº¼€tœ·¼Ð´6¹€<Ký¼€=Ký¼€€€€€¨hU¼åv·€z<¼4Gº€tœ·¼Ð´6¹€Naº¼€€€€€K×л$¢îº”Û‚:~?v»?Á
»z:z<¼4Gº€¨hU¼åv·€€€€€à
+#º°¯¬¹`¿>9à.µ¬Ë·ºÀ©4~?v»?Á
»z:K×л$¢îº”Û‚:€€€€P ‰¹¨•¹ Ñ&9t¦ˆº€à.µ¬Ë·ºÀ©4à
+#º°¯¬¹`¿>9€€€€Àçk¹�»€¹Ð}9¸8á¹€t¦ˆº€P ‰¹¨•¹ Ñ&9€€€€à.µ¬Ë·ºÀ©4€õå¸1Ʀ»€á‹8Hn3ºNЋ»€�ï8~?v»?Á
»z:€€€€t¦ˆº€€m·¡›»{7€õå¸1Ʀ»€á‹8à.µ¬Ë·ºÀ©4€€€€¸8á¹€Ÿ’b»€€m·¡›»{7t¦ˆº€€€€€ÙK·€pߺ€Ÿ’b»€¸8á¹€€– ¹€pߺ€ÙK·€tœ·¼Ð´6¹€\¬±¼HþGº€ŠJý¼hµ€<Ký¼€€€– ¹€€z<¼4Gº€/¼º#»<:8\¬±¼HþGº€tœ·¼Ð´6¹€€€€€~?v»?Á
»z:Hn3ºNЋ»€�ï8/¼º#»<:8z<¼4Gº€– ¹€,’»€Ù´»€pߺ€\¬±¼HþGº€±ì­¼7zκ€âGý¼Ë 8¸€ŠJý¼hµ€€+“¹€,’»€– ¹€/¼º#»<:8¬ÿœ»þ¼»é/:±ì­¼7zκ€\¬±¼HþGº€€€+“¹€€Hn3ºNЋ»€�ï8à±Ô¹ž�¼ _�9¬ÿœ»þ¼»é/:/¼º#»<:8€€€€€õå¸1Ʀ»€á‹8@B´¹'(¼@J[9à±Ô¹ž�¼ _�9Hn3ºNЋ»€�ï8€€€€€m·¡›»{7€’¹~%)¼ ¶£8@B´¹'(¼@J[9€õå¸1Ʀ»€á‹8€€€€Ÿ’b»€Ø˜¶XI¼:6€’¹~%)¼ ¶£8€m·¡›»{7€€€€pߺ€Ù´»€Ø˜¶XI¼:6Ÿ’b»€@B´¹'(¼@J[9€Â„¸_ðv¼€…!8(ž<º÷)G¼àtå9à±Ô¹ž�¼ _�9€€€€€’¹~%)¼ ¶£8¨Ëƒ¼€€Â„¸_ðv¼€…!8@B´¹'(¼@J[9€€€€Ø˜¶XI¼:6@-¶ÀÝg¼@Ó5¨Ëƒ¼€€’¹~%)¼ ¶£8€€€€Ù´»€
)$¼€@-¶ÀÝg¼@Ó5ؘ¶XI¼:6,’»€Ø¬»€
)$¼€Ù´»€±ì­¼7zκ€~´¯¼$»€ÆÒý¼øÿ¸€âGý¼Ë 8¸€+“¹€¯@¿º€Ø¬»€,’»€¬ÿœ»þ¼»é/:©±»õì	¼0œƒ:~´¯¼$»€±ì­¼7zκ€€€¯@¿º€+“¹€à±Ô¹ž�¼ _�9(ž<º÷)G¼àtå9©±»õì	¼0œƒ:¬ÿœ»þ¼»é/:€€€€Ø¬»€jý»€@á¹»b¼F9Ÿ8
)$¼€~´¯¼$»€2À¹¼x¦B»€kúþ¼TÂF¹€ÆÒý¼øÿ¸€¯@¿º€E¯/»€jý»€Ø¬»€©±»õì	¼0œƒ:
8­»B‰(¼¼9�:2À¹¼x¦B»€~´¯¼$»€€ÀÝò¸€E¯/»€¯@¿º€(ž<º÷)G¼àtå9@kº¢9w¼ˆü:
8­»B‰(¼¼9�:©±»õì	¼0œƒ:€€ÀÝò¸€€€Â„¸_ðv¼€…!8]¶›¼€@kº¢9w¼ˆü:(ž<º÷)G¼àtå9€€€€¨Ëƒ¼€d«¼€]¶›¼€€Â„¸_ðv¼€…!8€€€€@-¶ÀÝg¼@Ó5‹†™¼€d«¼€¨Ëƒ¼€€€€€
)$¼€@á¹»b¼F9Ÿ8‹†™¼€@-¶ÀÝg¼@Ó5€€€€d«¼€ø?»¼€Ø ¶F�¨¼@Ä5]¶›¼€€€€€‹†™¼€,ø·€¿¨¼Àü–7ø?»¼€d«¼€€€€€@á¹»b¼F9Ÿ8è›QºŽƒ¼Jþþ9,ø·€¿¨¼Àü–7‹†™¼€jý»€Äa¼€è›QºŽƒ¼Jþþ9@á¹»b¼F9Ÿ82À¹¼x¦B»€ŠÌ¼ö´P»€A½\Vb¹€kúþ¼TÂF¹€E¯/»€ÿ´P»€Äa¼€jý»€
8­»B‰(¼¼9�:Ào»úE0¼\—:ŠÌ¼ö´P»€2À¹¼x¦B»€ÀÝò¸€Vb¹€ÿ´P»€E¯/»€@kº¢9w¼ˆü:ÀÒ˺œà‰¼ ôw:Ào»úE0¼\—:
8­»B‰(¼¼9�:€€Vb¹€ÀÝò¸€]¶›¼€Ø ¶F�¨¼@Ä5ÀÒ˺œà‰¼ ôw:@kº¢9w¼ˆü:ŠÌ¼ö´P»€nÛâ¼q¦B»€;P½@ÂF¹€A½\Vb¹€ÿ´P»€å4.»€`ý»€Äa¼€Ào»úE0¼\—:oF¼òE¼€nÛâ¼q¦B»€ŠÌ¼ö´P»€Vb¹€ n9€å4.»€ÿ´P»€ÀÒ˺œà‰¼ ôw:šˆ/»²Š‹¼ì‰Õ:oF¼òE¼€Ào»úE0¼\—:€€ n9€Vb¹€Ø ¶F�¨¼@Ä5€þº
+­¼°‚š:šˆ/»²Š‹¼ì‰Õ:ÀÒ˺œà‰¼ ôw:€€€€ø?»¼€Ì` ºéüµ¼$C:€þº
+­¼°‚š:Ø ¶F�¨¼@Ä5€€€€,ø·€¿¨¼Àü–7ª“,»œ±¼0ñÑ:Ì` ºéüµ¼$C:ø?»¼€€€€€è›QºŽƒ¼Jþþ9 ×¾º—ˆz¼)h:ª“,»œ±¼0ñÑ:,ø·€¿¨¼Àü–7Äa¼€`ý»€ ×¾º—ˆz¼)h:è›QºŽƒ¼Jþþ9Ì` ºéüµ¼$C:\]¸»¶¼H`;”™»dΤ¼xÔ:;€þº
+­¼°‚š:€€€€ª“,»œ±¼0ñÑ:an»n”¼Ûþ;\]¸»¶¼H`;Ì` ºéüµ¼$C:€€€€ ×¾º—ˆz¼)h:)$¼€an»n”¼Ûþ;ª“,»œ±¼0ñÑ:`ý»€8"¤»€)$¼€ ×¾º—ˆz¼)h:nÛâ¼q¦B»€bÈð¼$»€zäÿ¼Pÿ¸€;P½@ÂF¹€å4.»€`3û9€8"¤»€`ý»€oF¼òE¼€ž´¼ÁÐØ»€bÈð¼$»€nÛâ¼q¦B»€ n9€p$·:€`3û9€å4.»€šˆ/»²Š‹¼ì‰Õ:î�=»~tp¼�wñ:ž´¼ÁÐØ»€oF¼òE¼€€`‹•9€p$·:€ n9€€þº
+­¼°‚š:”™»dΤ¼xÔ:;î�=»~tp¼�wñ:šˆ/»²Š‹¼ì‰Õ:€€`‹•9€€`3û9€Ò�›;€èy@;€8"¤»€ž´¼ÁÐØ»€ådä¼Ï“”»€7†ë¼zκ€bÈð¼$»€p$·:€z:;€Ò�›;€`3û9€î�=»~tp¼�wñ:þ¯¼!�ü»€ådä¼Ï“”»€ž´¼ÁÐØ»€`‹•9€è­g:€z:;€p$·:€”™»dΤ¼xÔ:;8O¼Fß!¼€þ¯¼!�ü»€î�=»~tp¼�wñ:€€è­g:€`‹•9€\]¸»¶¼H`;0­¶»
01¼�V¸98O¼Fß!¼€”™»dΤ¼xÔ:;€€€€an»n”¼Ûþ;Ô½—ºÐ2¼€0­¶»
01¼�V¸9\]¸»¶¼H`;€€€€)$¼€zþ_»€Ô½—ºÐ2¼€an»n”¼Ûþ;8"¤»€èy@;€zþ_»€)$¼€bÈð¼$»€7†ë¼zκ€™[þ¼à8¸€zäÿ¼Pÿ¸€€€Š›8€€Ô½—ºÐ2¼€d E;€“6‘»æ­-»€0­¶»
01¼�V¸9€€€€zþ_»€^i<€d E;€Ô½—ºÐ2¼€èy@;€oº„<€^i<€zþ_»€7†ë¼zκ€ÌfÖ¼þGº€½Ný¼Ð
µ€™[þ¼à8¸€Ò�›;€ð<€oº„<€èy@;€ådä¼Ï“”»€_µÄ¼
+Ö»€ÌfÖ¼þGº€7†ë¼zκ€z:;€Jûƒ;€ð<€Ò�›;€þ¯¼!�ü»€!í¨¼Š…»€_µÄ¼
+Ö»€ådä¼Ï“”»€è­g:€(€»:€Jûƒ;€z:;€8O¼Fß!¼€¬€^¼-Ú¢»€!í¨¼Š…»€þ¯¼!�ü»€€Š›8€(€»:€è­g:€0­¶»
01¼�V¸9“6‘»æ­-»€¬€^¼-Ú¢»€8O¼Fß!¼€Jûƒ;€Ðÿ’;€d<<€ð<€!í¨¼Š…»€Pî�¹€(¤Cº€_µÄ¼
+Ö»€(€»:€,õ×:€Ðÿ’;€Jûƒ;€¬€^¼-Ú¢»€³
;€Pî�¹€!í¨¼Š…»€Š›8€€õí8€,õ×:€(€»:€“6‘»æ­-»€y¨<€³
;€¬€^¼-Ú¢»€€€€õí8€Š›8€d E;€Rd›<€y¨<€“6‘»æ­-»€€€€€^i<€nW¹<€Rd›<€d E;€oº„<€Ø£<€nW¹<€^i<€ÌfÖ¼þGº€`´6¹€€½Ný¼Ð
µ€ð<€d<<€Ø£<€oº„<€_µÄ¼
+Ö»€(¤Cº€`´6¹€ÌfÖ¼þGº€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ š˜¹€Ôä» ób¹€Øô»XéÕ¹€àº€€€€€À°ß¸€'¸õº€‰¸€Ôä» ób¹€ š˜¹€€€€€€5íµº€ªµ€'¸õº€‰¸€À°ß¸€€€€€€
+Eº€5íµº€ªµ€€€€€€€(^¹€
+Eº€€€€€€€€(^¹€€Z”4º€¦ïA»F†
º€~±Hº€yRj»4®ø¹€àžŠ»dJÕ¹€©ïA;$†
º€~Rj;ø­ø¹€ˆ®Ÿ»Pá³¹€~±Hº€}²»Fý–¹€œžÂ»Ò1€¹€n„λT`¹€~±Hº€Ï-Ö»)®L¹€LóÙ»ô«D¹€w'Ú»%G¹€~±Hº€€Ö»8+U¹€âÇλð+p¹€¤ûL®Œ¹€~±Hº€,ʳ»|E¨¹€Om¢»]ɹ€d”4º€~±Hº€Om¢;]ɹ€-ʳ;ŒE¨¹€¤Ã;`®Œ¹€~±Hº€æÇÎ; ,p¹€€Ö;h+U¹€z'Ú;4%G¹€~±Hº€OóÙ;¬D¹€Ò-Ö;3®L¹€q„Î;H`¹€~±Hº€ žÂ;¾1€¹€�²;"ý–¹€Œ®Ÿ;$á³¹€~±Hº€ãžŠ;,JÕ¹€€€€€À“^¸€€€€H–#¹€|–¡¹€< º€€¦¤7º€‚üjº€/ÍŠº€€䘺€íÑ�º€䘺€€4ÍŠº€�üjº€¬¤7º€€€®¤7:€†üj:€€8ÍŠ:€„ä˜:€ôÑ�:€€ˆä˜:€9ÍŠ:€˜üj:€€º¤7:€P :€¤–¡9€€�–#9€À”^8€€€€€àº€Øô»XéÕ¹€¦ïA»F†
º€Z”4º€€€€€€€ IѸ€€Øô»XéÕ¹€+\V»pú¦¹€yRj»4®ø¹€¦ïA»F†
º€€€€€Ôä» ób¹€¹YK»àÛ¹€+\V»pú¦¹€Øô»XéÕ¹€€€€€'¸õº€‰¸€I8?»#µ·€¹YK»àÛ¹€Ôä» ób¹€€€€€5íµº€ªµ€j[»€I8?»#µ·€'¸õº€‰¸€€€€€
+Eº€TÙ¿º€j[»€5íµº€ªµ€€€€€(^¹€Â)º€TÙ¿º€
+Eº€€€€€€ IѸ€Â)º€(^¹€€€€€TÙ¿º€Ä§»€h_»€j[»€€€€€Â)º€0Ú–º€Ä§»€TÙ¿º€€À“^¸€€€ IѸ€À¬¹€0Ú–º€Â)º€€€À¬¹€ IѸ€+\V»pú¦¹€Ð†‘»Àqh¹€àžŠ»dJÕ¹€yRj»4®ø¹€€€€€¹YK»àÛ¹€jä�»À‹¸€Ð†‘»Àqh¹€+\V»pú¦¹€€€€€I8?»#µ·€S›‹»*³€jä�»À‹¸€¹YK»àÛ¹€€€€€j[»€h_»€S›‹»*³€I8?»#µ·€€€“Õ·€€jä�»À‹¸€ôa½»©ƒ·€ª�·»€ø¹€Ð†‘»Àqh¹€€€€€S›‹»*³€�X´»€ôa½»©ƒ·€jä�»À‹¸€€€€€h_»€è|•»€�X´»€S›‹»*³€€À–¸€€€Ä§»€ü(G»€è|•»€h_»€€�}¹€À–¸€€0Ú–º€X~̺€ü(G»€Ä§»€À“^¸€H–#¹€�}¹€€À¬¹€èuº€X~̺€0Ú–º€€“Õ·€èuº€À¬¹€Ð†‘»Àqh¹€ª�·»€ø¹€ˆ®Ÿ»Pá³¹€àžŠ»dJÕ¹€�}¹€Ì/º€¸�	º€À–¸€X~̺€xäúº€’ëq»€ü(G»€H–#¹€|–¡¹€Ì/º€�}¹€èuº€�~&º€xäúº€X~̺€“Õ·€÷@¸€�~&º€èuº€ª�·»€ø¹€ŠØ» Bž¸€}²»Fý–¹€ˆ®Ÿ»Pá³¹€€€÷@¸€“Õ·€ôa½»©ƒ·€ØÚá»p³€ŠØ» Bž¸€ª�·»€ø¹€€À‡¹€€€�X´»€p{Ó»€ØÚá»p³€ôa½»©ƒ·€€àëĹ€À‡¹€€è|•»€ïj¯»€p{Ó»€�X´»€À–¸€¸�	º€àëĹ€€ü(G»€’ëq»€ïj¯»€è|•»€ØÚá»p³€Þ‘ø»€žëï» .)¸€ŠØ» Bž¸€À‡¹€8Ô‡º€í
+º€€p{Ó»€Û_什ޑø»€ØÚá»p³€àëĹ€@²º€8Ô‡º€À‡¹€ïj¯»€ôº»€Û_什p{Ó»€¸�	º€<´°º€@²º€àëĹ€’ëq»€u„»€ôº»€ïj¯»€Ì/º€ èƒº€<´°º€¸�	º€xäúº€ØA»€u„»€’ëq»€|–¡¹€< º€ èƒº€Ì/º€�~&º€ÐÆ,º€ØA»€xäúº€÷@¸€º¹€ÐÆ,º€�~&º€ŠØ» Bž¸€žëï» .)¸€œžÂ»Ò1€¹€}²»Fý–¹€€í
+º€º¹€÷@¸€ØA»€Hò>»€Ì–»€u„»€< º€¦¤7º€8êÓº€ èƒº€ÐÆ,º€ Vº€Hò>»€ØA»€º¹€È˲º€ Vº€ÐÆ,º€žëï» .)¸€ˆŒÿ»àM½·€n„λT`¹€œžÂ»Ò1€¹€í
+º€xˆÿº€È˲º€º¹€Þ‘ø»€_1¼€ˆŒÿ»àM½·€žëï» .)¸€8Ô‡º€ü2*»€xˆÿº€í
+º€Û_什�
+ð»€_1¼€Þ‘ø»€@²º€Þ58»€ü2*»€8Ô‡º€ôº»€ZÈ»€�
+ð»€Û_什<´°º€.`»€Þ58»€@²º€u„»€Ì–»€ZÈ»€ôº»€ èƒº€8êÓº€.`»€<´°º€ü2*»€-•»€ÞÛ„»€xˆÿº€�
+𻀰Çú»€êý¼€_1¼€Þ58»€]“»€-•»€ü2*»€ZÈ»€<Ø»€°Çú»€�
+ð»€.`»€¼¶l»€]“»€Þ58»€Ì–»€4+®»€<Ø»€ZÈ»€8êÓº€?껀¼¶l»€.`»€Hò>»€bx‚»€4+®»€Ì–»€¦¤7º€‚üjº€?껀8êÓº€ Vº€8N[»€bx‚»€Hò>»€È˲º€¼Šh»€8N[»€ Vº€ˆŒÿ»àM½·€ì¼¬©Z·€Ï-Ö»)®L¹€n„λT`¹€xˆÿº€ÞÛ„»€¼Šh»€È˲º€_1¼€êý¼€ì¼¬©Z·€ˆŒÿ»àM½·€‚üjº€/ÍŠº€Ù|6»€?껀8N[»€²ù°»€ªÞ®»€bx‚»€¼Šh»€¸n·»€²ù°»€8N[»€ì¼¬©Z·€ã>¼@}
+·€LóÙ»ô«D¹€Ï-Ö»)®L¹€ÞÛ„»€HçÅ»€¸n·»€¼Šh»€êý¼€ïS¼€ã>¼@}
+·€ì¼¬©Z·€-•»€úlÕ»€HçÅ»€ÞÛ„»€°Çú»€Ø*¼€ïS¼€êý¼€]“»€rjÈ»€úlÕ»€-•»€<Ø»€é绀Ø*¼€°Çú»€¼¶l»€Ö’™»€rjÈ»€]“»€4+®»€�šÆ»€é绀<Ø»€?껀Ù|6»€Ö’™»€¼¶l»€bx‚»€ªÞ®»€�šÆ»€4+®»€Ø*¼€•¼€ä÷
¼€ïS¼€rjÈ»€:âﻀh–¼€úlÕ»€é绀úÍõ»€•¼€Ø*¼€Ö’™»€!w²»€:âﻀrjÈ»€�šÆ»€�šÛ»€úÍõ»€é绀Ù|6»€ºN»€!w²»€Ö’™»€ªÞ®»€DÚ»€�šÛ»€�šÆ»€/ÍŠº€䘺€ºN»€Ù|6»€²ù°»€Hù軀DÚ»€ªÞ®»€¸n·»€„?軀Hù軀²ù°»€ã>¼@}
+·€6›	¼&ܶ€w'Ú»%G¹€LóÙ»ô«D¹€HçÅ»€juö»€„?軀¸n·»€ïS¼€ä÷
¼€6›	¼&ܶ€ã>¼@}
+·€úlÕ»€h–¼€juö»€HçÅ»€Hù軀.¼€Pûò»€DÚ»€„?軀î—¼€.¼€Hù軀6›	¼&ܶ€˜ÿ¼’·€€Ö»8+U¹€w'Ú»%G¹€juö»€O¼€î—¼€„?軀ä÷
¼€‘Þ¼€˜ÿ¼’·€6›	¼&ܶ€h–¼€ø-¼€O¼€juö»€•¼€{
+¼€‘Þ¼€ä÷
¼€:âﻀiÑþ»€ø-¼€h–¼€úÍõ»€°`¼€{
+¼€•¼€!w²»€z~»»€iÑþ»€:âﻀ�šÛ»€¶ì黀°`¼€úÍõ»€ºN»€*UW»€z~»»€!w²»€DÚ»€Pûò»€¶ì黀�šÛ»€䘺€íÑ�º€*UW»€ºN»€iÑþ»€§ßñ»€š¼€ø-¼€°`¼€æè
¼€Z-¼€{
+¼€z~»»€"w²»€§ßñ»€iÑþ»€¶ì黀¨¡ã»€æè
¼€°`¼€*UW»€ºN»€"w²»€z~»»€Pûò»€Ð⻀¨¡ã»€¶ì黀íÑ�º€䘺€ºN»€*UW»€.¼€†Ñ¼€Ð⻀Pûò»€î—¼€Êí¼€†Ñ¼€.¼€˜ÿ¼’·€–¼¼‚·€âÇλð+p¹€€Ö»8+U¹€O¼€ö	¼€Êí¼€î—¼€‘Þ¼€k¯¼€–¼¼‚·€˜ÿ¼’·€ø-¼€š¼€ö	¼€O¼€{
+¼€Z-¼€k¯¼€‘Þ¼€Êí¼€}2黀YÁ»€†Ñ¼€–¼¼‚·€€Ðû»€ý¸€¤ûL®Œ¹€âÇλð+p¹€ö	¼€<Võ»€}2黀Êí¼€k¯¼€©^
+¼€€Ðû»€ý¸€–¼¼‚·€š¼€øIí»€<Võ»€ö	¼€Z-¼€º¼€©^
+¼€k¯¼€§ßñ»€bÍ»€øIí»€š¼€æè
¼€`ò»€º¼€Z-¼€"w²»€Ñ’™»€bÍ»€§ßñ»€¨¡ã»€ºß¿»€`ò»€æè
¼€ºN»€Ú|6»€Ñ’™»€"w²»€Ð⻀/Q¨»€ºß¿»€¨¡ã»€䘺€4ÍŠº€Ú|6»€ºN»€†Ñ¼€YÁ»€/Q¨»€Ð⻀ђ™»€½¶l»€}'•»€bÍ»€ºß¿»€e1‡»€*šÃ»€`ò»€Ú|6»€<껀½¶l»€Ñ’™»€/Q¨»€‰.»€e1‡»€ºß¿»€4ÍŠº€�üjº€<껀Ú|6»€YÁ»€†$4»€‰.»€/Q¨»€}2黀®¨†»€†$4»€YÁ»€€Ðû»€ý¸€5"Ề}¼¸€,ʳ»|E¨¹€¤ûL®Œ¹€<Võ»€µÎ£»€®¨†»€}2黀©^
+¼€÷»€5"Ề}¼¸€€Ðû»€ý¸€øIí»€Q§»€µÎ£»€<Võ»€º¼€þ÷»€©^
+¼€bÍ»€}'•»€Q§»€øIí»€`ò»€*šÃ»€þº¼€5"Ề}¼¸€`×»»ð6?¹€Om¢»]ɹ€,ʳ»|E¨¹€µÎ£»€Òº»€ûO•º€®¨†»€÷»€¼òû€Ÿ-¸€`×»»ð6?¹€5"Ề}¼¸€Q§»€T?+»€Òº»€µÎ£»€þD𱻀¼òû€Ÿ-¸€÷»€}'•»€â58»€T?+»€Q§»€*šÃ»€5Lƒ»€D𱻀þ½¶l»€,`»€â58»€}'•»€e1‡»€®>»€5Lƒ»€*šÃ»€<껀:êÓº€,`»€½¶l»€‰.»€2Uº€®>»€e1‡»€�üjº€¬¤7º€:êÓº€<껀†$4»€
͹€2Uº€‰.»€®¨†»€ûO•º€
͹€†$4»€®>»€€€5Lƒ»€:êÓº€€€,`»€2Uº€€€®>»€¬¤7º€€€:êÓº€
͹€€€2Uº€ûO•º€€€
͹€`×»»ð6?¹€àº€d”4º€Om¢»]ɹ€Òº»€€€ûO•º€¼òû€Ÿ-¸€ š˜¹€àº€`×»»ð6?¹€T?+»€€€Òº»€D𱻀±ß¸€ š˜¹€¼òû€Ÿ-¸€â58»€€€T?+»€5Lƒ»€€±ß¸€D𱻀,`»€€€â58»€€Öº;€ïO•:€€ š˜¹€¾òÃ;€Ÿ-¸€b×»;7?¹€àº€€L?+;€Öº;€€±ß¸€Bð±;€¾òÃ;€Ÿ-¸€ š˜¹€€ß58;€L?+;€€€2Lƒ;€Bð±;€±ß¸€€+`;€ß58;€€€´>;€2Lƒ;€€€>êÓ:€+`;€€€U:€´>;€€€®¤7:€>êÓ:€€€ÄÍ9€U:€€€ïO•:€ÄÍ9€€àº€b×»;7?¹€Om¢;]ɹ€d”4º€>êÓ:€=ê;€½¶l;€+`;€U:€„.;€h1‡;€´>;€®¤7:€†üj:€=ê;€>êÓ:€ÄÍ9€~$4;€„.;€U:€ïO•:€¬¨†;€~$4;€ÄÍ9€b×»;7?¹€7"á;~¼¸€-ʳ;ŒE¨¹€Om¢;]ɹ€Öº;€¸Î£;€¬¨†;€ïO•:€¾òÃ;€Ÿ-¸€÷;€7"á;~¼¸€b×»;7?¹€L?+;€Q§;€¸Î£;€Öº;€Bð±;€ýî;€÷;€¾òÃ;€Ÿ-¸€ß58;€|'•;€Q§;€L?+;€2Lƒ;€(šÃ;€ýî;€Bð±;€+`;€½¶l;€|'•;€ß58;€´>;€h1‡;€(šÃ;€2Lƒ;€÷;€ª^
+<€‚Ðû;Àþ¸€7"á;~¼¸€Q§;€ùIí;€@Võ;€¸Î£;€ýî;€€º<€ª^
+<€÷;€|'•;€bÍ;€ùIí;€Q§;€(šÃ;€aò;€€º<€ýî;€½¶l;€Ò’™;€bÍ;€|'•;€h1‡;€¾ß¿;€aò;€(šÃ;€=ê;€Ý|6;€Ò’™;€½¶l;€„.;€.Q¨;€¾ß¿;€h1‡;€†üj:€8ÍŠ:€Ý|6;€=ê;€~$4;€YÁ;€.Q¨;€„.;€¬¨†;€|2é;€YÁ;€~$4;€7"á;~¼¸€‚Ðû;Àþ¸€¤Ã;`®Œ¹€-ʳ;ŒE¨¹€¸Î£;€@Võ;€|2é;€¬¨†;€.Q¨;€	Ðâ;€­¡ã;€¾ß¿;€8ÍŠ:€„ä˜:€ºN;€Ý|6;€YÁ;€…Ñ<€	Ðâ;€.Q¨;€|2é;€Êí<€…Ñ<€YÁ;€‚Ðû;Àþ¸€€–<€¿‚·€æÇÎ; ,p¹€¤Ã;`®Œ¹€@Võ;€ø	<€Êí<€|2é;€ª^
+<€l¯<€€–<€¿‚·€‚Ðû;Àþ¸€ùIí;€š<€ø	<€@Võ;€€º<€[-<€l¯<€ª^
+<€bÍ;€¨ßñ;€š<€ùIí;€aò;€æè
<€[-<€€º<€Ò’™;€$w²;€¨ßñ;€bÍ;€¾ß¿;€­¡ã;€æè
<€aò;€Ý|6;€ºN;€$w²;€Ò’™;€š<€û-<€Q<€ø	<€[-<€{
+<€’Þ<€l¯<€¨ßñ;€mÑþ;€û-<€š<€æè
<€²`<€{
+<€[-<€$w²;€}~»;€mÑþ;€¨ßñ;€­¡ã;€ºìé;€²`<€æè
<€ºN;€1UW;€}~»;€$w²;€	Ðâ;€Tûò;€ºìé;€­¡ã;€„ä˜:€ôÑ�:€1UW;€ºN;€…Ñ<€.<€Tûò;€	Ðâ;€Êí<€ð—<€.<€…Ñ<€€–<€¿‚·€›ÿ<™·€€Ö;h+U¹€æÇÎ; ,p¹€ø	<€Q<€ð—<€Êí<€l¯<€’Þ<€›ÿ<™·€€–<€¿‚·€ôÑ�:€ˆä˜:€ºN;€1UW;€.<€Lùè;€HÚ;€Tûò;€ð—<€ˆ?è;€Lùè;€.<€›ÿ<™·€9›	<3ܶ€z'Ú;4%G¹€€Ö;h+U¹€Q<€nuö;€ˆ?è;€ð—<€’Þ<€æ÷
<€9›	<3ܶ€›ÿ<™·€û-<€l–<€nuö;€Q<€{
+<€•<€æ÷
<€’Þ<€mÑþ;€>âï;€l–<€û-<€²`<€
Îõ;€•<€{
+<€}~»;€%w²;€>âï;€mÑþ;€ºìé;€”šÛ;€
Îõ;€²`<€1UW;€ºN;€%w²;€}~»;€Tûò;€HÚ;€”šÛ;€ºìé;€>âï;€vjÈ;€mÕ;€l–<€
Îõ;€éç;€Ú*<€•<€%w²;€Û’™;€vjÈ;€>âï;€”šÛ;€”šÆ;€éç;€
Îõ;€ºN;€ä|6;€Û’™;€%w²;€HÚ;€²Þ®;€”šÆ;€”šÛ;€ˆä˜:€9ÍŠ:€ä|6;€ºN;€Lùè;€¸ù°;€²Þ®;€HÚ;€ˆ?è;€Àn·;€¸ù°;€Lùè;€9›	<3ܶ€ç><À�
+·€OóÙ;¬D¹€z'Ú;4%G¹€nuö;€LçÅ;€Àn·;€ˆ?è;€æ÷
<€òS<€ç><À�
+·€9›	<3ܶ€l–<€mÕ;€LçÅ;€nuö;€•<€Ú*<€òS<€æ÷
<€Àn·;€ÌŠh;€LN[;€¸ù°;€ç><À�
+·€ð<E«Z·€Ò-Ö;3®L¹€OóÙ;¬D¹€LçÅ;€âÛ„;€ÌŠh;€Àn·;€òS<€îý<€ð<E«Z·€ç><À�
+·€mÕ;€"-•;€âÛ„;€LçÅ;€Ú*<€µÇú;€îý<€òS<€vjÈ;€]“;€"-•;€mÕ;€éç;€<Ø;€µÇú;€Ú*<€Û’™;€È¶l;€]“;€vjÈ;€”šÆ;€8+®;€<Ø;€éç;€ä|6;€Lê;€È¶l;€Û’™;€²Þ®;€jx‚;€8+®;€”šÆ;€9ÍŠ:€˜üj:€Lê;€ä|6;€¸ù°;€LN[;€jx‚;€²Þ®;€<Ø;€hÈ;€‡
+ð;€µÇú;€È¶l;€>`;€ê58;€]“;€8+®;€Ò–;€hÈ;€<Ø;€Lê;€TêÓ:€>`;€È¶l;€jx‚;€dò>;€Ò–;€8+®;€˜üj:€º¤7:€TêÓ:€Lê;€LN[;€HVÂ:€dò>;€jx‚;€ÌŠh;€Ì²:€HVÂ:€LN[;€ð<E«Z·€�Œÿ; M½·€q„Î;H`¹€Ò-Ö;3®L¹€âÛ„;€�ˆÿ:€Ì²:€ÌŠh;€îý<€b1<€�Œÿ; M½·€ð<E«Z·€"-•;€3*;€�ˆÿ:€âÛ„;€µÇú;€‡
+ð;€b1<€îý<€]“;€ê58;€3*;€"-•;€Ì²:€À»9€0Ç,:€HVÂ:€�Œÿ; M½·€¦ëï;@-)¸€ žÂ;¾1€¹€q„Î;H`¹€�ˆÿ:€0í
+:€À»9€Ì²:€b1<€å‘ø;€¦ëï;@-)¸€�Œÿ; M½·€3*;€tÔ‡:€0í
+:€�ˆÿ:€‡
+ð;€ã_ä;€å‘ø;€b1<€ê58;€$@²:€tÔ‡:€3*;€hÈ;€'ôº;€ã_ä;€‡
+ð;€>`;€`´°:€$@²:€ê58;€Ò–;€"u„;€'ôº;€hÈ;€TêÓ:€¼èƒ:€`´°:€>`;€dò>;€ôA;€"u„;€Ò–;€º¤7:€P :€¼èƒ:€TêÓ:€HVÂ:€0Ç,:€ôA;€dò>;€`´°:€�	:€PìÄ9€$@²:€"u„;€žëq;€ÿj¯;€'ôº;€¼èƒ:€0:€�	:€`´°:€ôA;€°äú:€žëq;€"u„;€P :€¤–¡9€0:€¼èƒ:€0Ç,:€ð~&:€°äú:€ôA;€À»9€þ@8€ð~&:€0Ç,:€¦ëï;@-)¸€’Ø; Až¸€�²;"ý–¹€ žÂ;¾1€¹€0í
+:€€þ@8€À»9€å‘ø;€àÚá;j³€’Ø; Až¸€¦ëï;@-)¸€tÔ‡:€À‰9€€0í
+:€ã_ä;€w{Ó;€àÚá;j³€å‘ø;€$@²:€PìÄ9€À‰9€tÔ‡:€'ôº;€ÿj¯;€w{Ó;€ã_ä;€’Ø; Až¸€²�·;À÷¹€Œ®Ÿ;$á³¹€�²;"ý–¹€€€£Õ7€þ@8€àÚá;j³€üa½;¤ƒ·€²�·;À÷¹€’Ø; Až¸€À‰9€€€€w{Ó;€—X´;€üa½;¤ƒ·€àÚá;j³€PìÄ9€€€À‰9€ÿj¯;€÷|•;€—X´;€w{Ó;€�	:€–8€€PìÄ9€žëq;€)G;€÷|•;€ÿj¯;€0:€`~9€–8€�	:€°äú:€˜~Ì:€)G;€žëq;€¤–¡9€�–#9€`~9€0:€ð~&:€Xv:€˜~Ì:€°äú:€þ@8€£Õ7€Xv:€ð~&:€)G;€Î§;€‚_;€÷|•;€`~9€€€–8€˜~Ì:€hÚ–:€Î§;€)G;€�–#9€À”^8€€`~9€Xv:€�¬9€hÚ–:€˜~Ì:€£Õ7€€�¬9€Xv:€²�·;À÷¹€Ö†‘;Àph¹€ãžŠ;,JÕ¹€Œ®Ÿ;$á³¹€€€€£Õ7€üa½;¤ƒ·€rä�;@‹¸€Ö†‘;Àph¹€²�·;À÷¹€€€€€—X´;€[›‹; ³€rä�;@‹¸€üa½;¤ƒ·€€€€€÷|•;€‚_;€[›‹; ³€—X´;€–8€€€€€€€€rä�;@‹¸€ÅYK;àÚ¹€6\V;àù¦¹€Ö†‘;Àph¹€€€€€[›‹; ³€V8?;µ·€ÅYK;àÚ¹€rä�;@‹¸€€€€€‚_;€‚[;€V8?;µ·€[›‹; ³€€€€€Î§;€dÙ¿:€‚[;€‚_;€€€€€hÚ–:€tÂ):€dÙ¿:€Î§;€À”^8€€€€�¬9€àKÑ8€tÂ):€hÚ–:€€€àKÑ8€�¬9€Ö†‘;Àph¹€6\V;àù¦¹€~Rj;ø­ø¹€ãžŠ;,JÕ¹€€€€€tÂ):€P^9€&
+E:€dÙ¿:€€€€€àKÑ8€€P^9€tÂ):€€€€àKÑ8€6\V;àù¦¹€àô;ÀèÕ¹€©ïA;$†
º€~Rj;ø­ø¹€€€€€ÅYK;àÚ¹€Þä;`òb¹€àô;ÀèÕ¹€6\V;àù¦¹€€€€€V8?;µ·€:¸õ:€‰¸€Þä;`òb¹€ÅYK;àÚ¹€€€€€‚[;€[íµ:€©µ€:¸õ:€‰¸€V8?;µ·€€€€€dÙ¿:€&
+E:€[íµ:€©µ€‚[;€€€€€:¸õ:€‰¸€À°ß¸€ š˜¹€Þä;`òb¹€€€€€[íµ:€©µ€€À°ß¸€:¸õ:€‰¸€€€€€&
+E:€€€[íµ:€©µ€€€€€P^9€€€&
+E:€€€€€€€€P^9€€€€€àô;ÀèÕ¹€àº€Z”4º€©ïA;$†
º€€€€€Þä;`òb¹€ š˜¹€àº€àô;ÀèÕ¹€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€

+	
+
"! #" &%$'&$*)(+*(.-,./-.0/.,1.124304534658768978:9<;:<=;<>=@?>@A?@BADCBDECDFEHGFHIGHJILKJLMKLNMPONPQOPRQTSRTUST2UXWVWYVYZV[XV\[VZ^]^_]_`]`babcacdadfefgeghehjijkiklilnmnomopmprqrsqstqtvuvwuwxuxzyz{y{|y|~}~}\}‚�€ƒ‚€†…„‡†„Š‰ˆ‹ŠˆŽ�Œ�ŽŒ’‘�“’�–•”—–”š™˜›š˜ž�œŸžœ¢¡ £¢ ¦¥¤§¦¤ª©¨«ª¨®­¬¯®¬²±°³²°¶µ´·¶´º¹¸»º¸¾½¼¿¾¼ÂÁÀÃÂÀÆÅÄÇÆÄÊÉÈËÊÈÎÍÌÏÎÌÒÑÐÓÒÐÖÕÔ×ÖÔÚÙØÛÚØÞÝÜßÞÜâáàãâàæåäçæäêéèëêèîíìïîìòñðóòðöõô÷öôúùøûúøþýüÿþü













+
	



+
































"
!
 
#
"
 
&
%
$
'
&
$
*
)
(
+
*
(
.
-
,
/
.
,
2
1
0
3
2
0
6
5
4
7
6
4
:
9
8
;
:
8
>
=
<
?
>
<
B
A
@
C
B
@
F
E
D
G
F
D
J
I
H
K
J
H
N
M
L
O
N
L
R
Q
P
S
R
P
V
U
T
W
V
T
Z
Y
X
[
Z
X
^
]
\
_
^
\
b
a
`
c
b
`
f
e
d
g
f
d
j
i
h
k
j
h
n
m
l
o
n
l
r
q
p
s
r
p
v
u
t
w
v
t
z
y
x
{
z
x
~
}
|

~
|
‚
�
€
ƒ
‚
€
†
…
„
‡
†
„
Š
‰
ˆ
‹
Š
ˆ
Ž
�
Œ
�
Ž
Œ
’
‘
�
“
’
�
–
•
”
—
–
”
š
™
˜
›
š
˜
ž
�
œ
Ÿ
ž
œ
¢
¡
 
£
¢
 
¦
¥
¤
§
¦
¤
ª
©
¨
«
ª
¨
®
­
¬
¯
®
¬
²
±
°
³
²
°
¶
µ
´
·
¶
´
º
¹
¸
»
º
¸
¾
½
¼
¿
¾
¼
Â
Á
À
Ã
Â
À
Æ
Å
Ä
Ç
Æ
Ä
Ê
É
È
Ë
Ê
È
Î
Í
Ì
Ï
Î
Ì
Ò
Ñ
Ð
Ó
Ò
Ð
Ö
Õ
Ô
×
Ö
Ô
Ú
Ù
Ø
Û
Ú
Ø
Þ
Ý
Ü
ß
Þ
Ü
â
á
à
ã
â
à
æ
å
ä
ç
æ
ä
ê
é
è
ë
ê
è
î
í
ì
ï
î
ì
ò
ñ
ð
ó
ò
ð
ö
õ
ô
÷
ö
ô
ú
ù
ø
û
ú
ø
þ
ý
ü
ÿ
þ
ü


+	
+
"! #" &%$'&$*)(+*(.-,/.,210320654764:98;:8>=<?><BA@CB@FEDGFDJIHKJHNMLONLRQPSRPVUTWVTZYX[ZX^]\_^\ba`cb`fedgfdjihkjhnmlonlrqpsrpvutwvtzyx{zx~}|~|‚�€ƒ‚€†…„‡†„Š‰ˆ‹ŠˆŽ�Œ�ŽŒ’‘�“’�–•”—–”š™˜›š˜ž�œŸžœ¢¡ £¢ ¦¥¤§¦¤ª©¨«ª¨®­¬¯®¬²±°³²°¶µ´·¶´º¹¸»º¸¾½¼¿¾¼ÂÁÀÃÂÀÆÅÄÇÆÄÊÉÈËÊÈÎÍÌÏÎÌÒÑÐÓÒÐÖÕÔ×ÖÔÚÙØÛÚØÞÝÜßÞÜâáàãâàæåäçæäêéèëêèîíìïîìòñðóòðöõô÷öôúùøûúøþýüÿþü

+	
+
"! #" &%$'&$*)(+*(.-,/.,210320654764:98;:8>=<?><BA@CB@FEDGFDJIHKJHNMLONLRQPSRPVUTWVTZYX[ZX^]\_^\ba`cb`fedgfdjihkjhnmlonlrqpsrpvutwvtzyx{zx~}|~|‚�€ƒ‚€†…„‡†„Š‰ˆ‹ŠˆŽ�Œ�ŽŒ’‘�“’�–•”—–”š™˜›š˜ž�œŸžœ¢¡ £¢ ¦¥¤§¦¤ª©¨«ª¨®­¬¯®¬²±°³²°¶µ´·¶´º¹¸»º¸¾½¼¿¾¼ÂÁÀÃÂÀÆÅÄÇÆÄÊÉÈËÊÈÎÍÌÏÎÌÒÑÐÓÒÐÖÕÔ×ÖÔÚÙØÛÚØÞÝÜßÞÜâáàãâàæåäçæäêéèëêèîíìïîìòñðóòðöõô÷öôúùøûúøþýüÿþü

+	
+
"! #" &%$'&$*)(+*(.-,/.,210320654764:98;:8>=<?><BA@CB@FEDGFDJIHKJHNMLONLRQPSRPVUTWVTZYX[ZX^]\_^\ba`cb`fedgfdjihkjhnmlonlrqpsrpvutwvtzyx{zx~}|~|‚�€ƒ‚€†…„‡†„Š‰ˆ‹ŠˆŽ�Œ�ŽŒ’‘�“’�–•”—–”š™˜›š˜ž�œŸžœ¢¡ £¢ ¦¥¤§¦¤ª©¨«ª¨®­¬¯®¬²±°³²°¶µ´·¶´º¹¸»º¸¾½¼¿¾¼ÂÁÀÃÂÀÆÅÄÇÆÄÊÉÈËÊÈÎÍÌÏÎÌÒÑÐÓÒÐÖÕÔ×ÖÔÚÙØÛÚØÞÝÜßÞÜâáàãâàæåäçæäêéèëêèîíìïîìòñðóòðöõô÷öôúùøûúøþýüÿþü

+	
+
"! #" &%$'&$*)(+*(.-,/.,210320654764:98;:8>=<?><BA@CB@FEDGFDJIHKJHNMLONLRQPSRPVUTWVTZYX[ZX^]\_^\ba`cb`fedgfdjihkjhnmlonlrqpsrpvutwvtzyx{zx~}|~|‚�€ƒ‚€†…„‡†„Š‰ˆ‹ŠˆŽ�Œ�ŽŒ’‘�“’�–•”—–”š™˜›š˜ž�œŸžœ¢¡ £¢ ¦¥¤§¦¤ª©¨«ª¨®­¬¯®¬²±°³²°¶µ´·¶´º¹¸»º¸¾½¼¿¾¼ÂÁÀÃÂÀÆÅÄÇÆÄÊÉÈËÊÈÎÍÌÏÎÌÒÑÐÓÒÐÖÕÔ×ÖÔÚÙØÛÚØÞÝÜßÞÜâáàãâàæåäçæäêéèëêèîíìïîìòñðóòðöõô÷öôúùøûúøþýüÿþü

+	
+
"! #" &%$'&$*)(+*(.-,/.,210320654764:98;:8>=<?><BA@CB@FEDGFDJIHKJHNMLONLRQPSRPVUTWVTZYX[ZX^]\_^\ba`cb`fedgfdjihkjhnmlonlrqpsrpvutwvtzyx{zx~}|~|‚�€ƒ‚€†…„‡†„Š‰ˆ‹ŠˆŽ�Œ�ŽŒ’‘�“’�–•”—–”š™˜›š˜ž�œŸžœ¢¡ £¢ ¦¥¤§¦¤ª©¨«ª¨®­¬¯®¬²±°³²°¶µ´·¶´º¹¸»º¸¾½¼¿¾¼ÂÁÀÃÂÀÆÅÄÇÆÄÊÉÈËÊÈÎÍÌÏÎÌÒÑÐÓÒÐÖÕÔ×ÖÔÚÙØÛÚØÞÝÜßÞÜâáàãâàæåäçæäêéèëêèîíìïîìòñðóòðöõô÷öôúùøûúøþýüÿþü

+	
+
"! #" &%$'&$*)(+*(.-,/.,210320654764:98;:8>=<?><BA@CB@FEDGFDJIHKJHNMLONLRQPSRP‰ˆ=‰ˆˆ=ÎÌÌ=‰ˆ>«ª*>ÍÌL>ïîn>‰ˆˆ>š™™>«ªª>¼»»>ÍÌÌ>ÞÝÝ>ïîî>?‰ˆ??›™?$""?­ª*?633?¿»;?HDD?ÑÌL?ZUU?ãÝ]?lff?õîn?~ww?€?GD„?‹ˆˆ?ÏÌŒ?‘?WU•?›™™?ßÝ�?#"¢?gf¦?«ªª?ïî®?33³?ww·?»»»?ÿÿ¿?CDÄ?‡ˆÈ?ËÌÌ?Ñ?SUÕ?—™Ù?ÛÝÝ?"â?cfæ?§ªê?ëîî?/3ó?sw÷?·»û?ûÿÿ? "@BD@df@†ˆ@¨ª
+@ÊÌ@ìî@@03@RU@tw@–™@¸»@ÚÝ@üÿ@""@@D$@bf&@„ˆ(@¦ª*@ÈÌ,@êî.@1@.33@PU5@rw7@”™9@¶»;@ØÝ=@úÿ?@"B@>DD@`fF@‚ˆH@¤ªJ@ÆÌL@èîN@
+Q@,3S@NUU@pwW@’™Y@´»[@ÖÝ]@øÿ_@"b@<Dd@^ff@€ˆh@¢ªj@ÄÌl@æîn@q@*3s@LUu@nww@�™y@²»{@ÔÝ}@öÿ@�@"‚@.3ƒ@?D„@PU…@af†@rw‡@ƒˆˆ@”™‰@¥ªŠ@¶»‹@ÇÌŒ@ØÝ�@éîŽ@úÿ�@‘@"’@-3“@>D”@OU•@`f–@qw—@‚ˆ˜@“™™@¤ªš@µ»›@ÆÌœ@×Ý�@èîž@ùÿŸ@
+¡@"¢@,3£@=D¤@NU¥@_f¦@pw§@�ˆ¨@’™©@£ªª@´»«@Å̬@ÖÝ­@çî®@øÿ¯@	±@"²@+3³@<D´@MUµ@^f¶@ow·@€ˆ¸@‘™¹@¢ªº@³»»@Ä̼@Õݽ@æî¾@÷ÿ¿@Á@"Â@*3Ã@;DÄ@LUÅ@]fÆ@nwÇ@ˆÈ@�™É@¡ªÊ@²»Ë@ÃÌÌ@ÔÝÍ@åîÎ@öÿÏ@Ñ@"Ò@)3Ó@:DÔ@KUÕ@\fÖ@mw×@~ˆØ@�™Ù@ ªÚ@±»Û@ÂÌÜ@ÓÝÝ@äîÞ@õÿß@á@"â@(3ã@9Dä@JUå@[fæ@½k:¼Xh;Ê$
<»Ôb<¡¯<Ñúø<EU'=ºÌW=ÈІ=ÏH¤=W-Ä=L]æ=È[>ˆ�>Z³,>²¼A>™W>Á7n>1Ä‚>,½Ž>‹þš>€§>_9´>F"Á>}2Î>ºaÛ>¶§è>-üõ>l«
?¸W?Ùþ?ªœ?
+-?Õ«"?è)? d/?\•5?v¤;?M�A?»KG?¡ÛL?Ú8R?D_W?ºJ\?÷`?C`e?‚i?[Xm?ßp?ît?íìv?áky?¦Š{?E}?—~?Š|?;ñ?þ9‘ö?óJ¨:Û«?
+Œg;t?3Äà;w>~?±ÿ7<
 }?}ˆ<,¿{?�=¼<z?£%ø<Ó>x?¤Ç=…#v?ŠC=HÎs?Ïìk=3Aq?ÝŒ=d~n?LÀ£=÷‡k?Øÿ¼=`h?¥º×=¬e?Úßó=„a?O¯>-Ô]?>?ûY?ª(>VûU?Í¥8>�ÖQ?ýÃI>�M?Ñd[>Ì&I?Úm>
+ D?T€>Öü??h�‰>L?;?ó,“>†i6?¼�>¡}1?�§>¸},?3(±>æk'?rk»>GJ"?ÊÅ>ö?ä?Ð>à?¬ÈÚ>ª›?2`å>çO
?Að>ßþ?£ªú>¯ª?�ª?áªú>Àþ?€ð>ÈO
?q`å>Œ›?èÈÚ>ïß?!@Ð>Ø?QÊÅ>*J"?­k»>Ék'?n(±>›},?ʧ>„}1?ø�>ji6?,-“>/?;?¡�‰>ºü??�€>ïŸD?C€m>²&I?8e[>èŽM?aÄI>tÖQ?.¦8>=ûU?
+(>(ûY?a>Ô]?¤¯>ñƒa?{àó=—e?H»×=ó_h?f½=æ‡k?ÍÀ£=T~n?\
Œ=$Aq?Ãík=:Îs?fC={#v?RÈ=Ê>x?¸&ø<
+z?¸>¼<%¿{?\ˆ<ú}?š
8<s>~?fÆà;q?\�g;Û«?=J¨:‘ö?Ãõ9vù?‘Å?ò^?ÏÆ~?_þ}?Ú}?tá{?i�z?ìy?6jw?}™u?ø s?à�q?j=o?ÎÔl?CIj?ÿ›g?;Îd?,áa?
+Ö^?®[?ljX?\U?•Q?ÏN?Á_J?!¤F?(ÔB?
+ñ>?ü:?Aö6?á2?€½.?ìŒ*?P&?o	"?ö¸?H`?�?.›?01?ÚÃ?dT?
+Èý>èçô>Ì
+ì>,3ã>ncÚ>žÑ>]åÈ>é;À>¤·>H ¯>ö²¦>’^ž>}%–>3
+Ž>†>Hm|>vm>Ÿî]>Ÿ*O>\¿@>Ÿ±2>R%>HÂ>lê
+>ý=%å=…8Î=K¸=šf£=¸”�=)¾y=HŸV=×ß5=H“=fš÷<ìAÅ<D˜<®�a<Rè<¸¾Ë;=
+g;áúÎ:š™Ð9
+×#´
\ No newline at end of file
diff --git a/test/models/glTF2/AnimatedMorphSphere/glTF/AnimatedMorphSphere.gltf b/test/models/glTF2/AnimatedMorphSphere/glTF/AnimatedMorphSphere.gltf
new file mode 100644
index 000000000..69f451fc2
--- /dev/null
+++ b/test/models/glTF2/AnimatedMorphSphere/glTF/AnimatedMorphSphere.gltf
@@ -0,0 +1,276 @@
+{
+  "accessors": [
+    {
+      "bufferView": 0,
+      "componentType": 5126,
+      "count": 1876,
+      "type": "VEC3"
+    },
+    {
+      "bufferView": 1,
+      "componentType": 5126,
+      "count": 1876,
+      "type": "VEC4"
+    },
+    {
+      "bufferView": 2,
+      "componentType": 5126,
+      "count": 1876,
+      "type": "VEC3",
+      "max": [
+        0.009999998,
+        0.009999991,
+        0.01
+      ],
+      "min": [
+        -0.0100000026,
+        -0.0100000035,
+        -0.01
+      ]
+    },
+    {
+      "bufferView": 3,
+      "componentType": 5126,
+      "count": 1876,
+      "type": "VEC3",
+      "name": "Ship"
+    },
+    {
+      "bufferView": 4,
+      "componentType": 5126,
+      "count": 1876,
+      "type": "VEC3",
+      "max": [
+        0.0313265175,
+        0.0226246975,
+        0.008465132
+      ],
+      "min": [
+        -0.0313265137,
+        -0.022857653,
+        0.0
+      ],
+      "name": "Ship"
+    },
+    {
+      "bufferView": 5,
+      "componentType": 5126,
+      "count": 1876,
+      "type": "VEC3",
+      "name": "Ship"
+    },
+    {
+      "bufferView": 6,
+      "componentType": 5126,
+      "count": 1876,
+      "type": "VEC3",
+      "name": "Blob"
+    },
+    {
+      "bufferView": 7,
+      "componentType": 5126,
+      "count": 1876,
+      "type": "VEC3",
+      "max": [
+        0.008781092,
+        0.0,
+        0.0
+      ],
+      "min": [
+        -0.008781091,
+        -0.0007655843,
+        0.0
+      ],
+      "name": "Blob"
+    },
+    {
+      "bufferView": 8,
+      "componentType": 5126,
+      "count": 1876,
+      "type": "VEC3",
+      "name": "Blob"
+    },
+    {
+      "bufferView": 9,
+      "componentType": 5123,
+      "count": 2880,
+      "type": "SCALAR"
+    },
+    {
+      "bufferView": 10,
+      "componentType": 5126,
+      "count": 217,
+      "type": "SCALAR",
+      "max": [
+        7.19999456
+      ],
+      "min": [
+        0.0
+      ]
+    },
+    {
+      "bufferView": 11,
+      "componentType": 5126,
+      "count": 434,
+      "type": "SCALAR"
+    }
+  ],
+  "animations": [
+    {
+      "channels": [
+        {
+          "sampler": 0,
+          "target": {
+            "node": 0,
+            "path": "weights"
+          }
+        }
+      ],
+      "samplers": [
+        {
+          "input": 10,
+          "interpolation": "LINEAR",
+          "output": 11
+        }
+      ],
+      "name": "Globe"
+    }
+  ],
+  "asset": {
+    "generator": "glTF Tools for Unity",
+    "version": "2.0"
+  },
+  "bufferViews": [
+    {
+      "buffer": 0,
+      "byteLength": 22512
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 22512,
+      "byteLength": 30016
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 52528,
+      "byteLength": 22512
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 75040,
+      "byteLength": 22512
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 97552,
+      "byteLength": 22512
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 120064,
+      "byteLength": 22512
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 142576,
+      "byteLength": 22512
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 165088,
+      "byteLength": 22512
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 187600,
+      "byteLength": 22512
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 210112,
+      "byteLength": 5760
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 215872,
+      "byteLength": 868
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 216740,
+      "byteLength": 1736
+    }
+  ],
+  "buffers": [
+    {
+      "uri": "AnimatedMorphSphere.bin",
+      "byteLength": 218476
+    }
+  ],
+  "meshes": [
+    {
+      "primitives": [
+        {
+          "attributes": {
+            "NORMAL": 0,
+            "TANGENT": 1,
+            "POSITION": 2
+          },
+          "indices": 9,
+          "material": 0,
+          "targets": [
+            {
+              "NORMAL": 3,
+              "POSITION": 4,
+              "TANGENT": 5
+            },
+            {
+              "NORMAL": 6,
+              "POSITION": 7,
+              "TANGENT": 8
+            }
+          ]
+        }
+      ],
+      "weights": [
+        0.0,
+        0.0
+      ],
+      "name": "Sphere"
+    }
+  ],
+  "materials": [
+    {
+      "pbrMetallicRoughness": {
+        "metallicFactor": 0.0,
+        "roughnessFactor": 0.5
+      },
+      "name": "No Name"
+    }
+  ],
+  "nodes": [
+    {
+      "mesh": 0,
+      "rotation": [
+        0.0,
+        0.7071067,
+        -0.7071068,
+        0.0
+      ],
+      "scale": [
+        100.0,
+        100.0,
+        100.0
+      ],
+      "name": "AnimatedMorphSphere"
+    }
+  ],
+  "scene": 0,
+  "scenes": [
+    {
+      "nodes": [
+        0
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/models/glTF2/MorphPrimitivesTest/LICENSE.md b/test/models/glTF2/MorphPrimitivesTest/LICENSE.md
new file mode 100644
index 000000000..5ed346890
--- /dev/null
+++ b/test/models/glTF2/MorphPrimitivesTest/LICENSE.md
@@ -0,0 +1,17 @@
+# LICENSE file for the model: Morph-Primitives Test
+
+All files in this directory tree are licensed as indicated below.
+
+* All files directly associated with the model including all text, image and binary files:
+
+  * [CC BY 4.0 International]("https://creativecommons.org/licenses/by/4.0/legalcode") [SPDX license identifier: "CC-BY-4.0"]
+
+  * [CC BY 4.0 International]("https://creativecommons.org/licenses/by/4.0/legalcode") [SPDX license identifier: "CC-BY-4.0"]
+
+* This file and all other metadocumentation files including "metadata.json":
+
+  * [Creative Commons Attribtution 4.0 International]("https://creativecommons.org/licenses/by/4.0/legalcode") [SPDX license identifier: "CC-BY-4.0"]
+
+Full license text of these licenses are available at the links above
+
+#### Generated by modelmetadata
\ No newline at end of file
diff --git a/test/models/glTF2/MorphPrimitivesTest/README.body.md b/test/models/glTF2/MorphPrimitivesTest/README.body.md
new file mode 100644
index 000000000..984ccd1d7
--- /dev/null
+++ b/test/models/glTF2/MorphPrimitivesTest/README.body.md
@@ -0,0 +1,21 @@
+## Screenshot
+
+![screenshot](screenshot/screenshot.jpg)
+
+## Description
+
+This model contains a simple mesh with two primitives:  A larger red primitive displays a grid covering 3 of the 4 quadrants of the model's area, followed by a smaller green primitive covering the last quadrant.
+
+Each primitive has a morph target that creates an elevated area within these quadrants.  The model's only mesh contains a `weights: [0.5]` instruction that should cause these morph targets to be applied at half strength, raising the center of the model as shown in the screenshot above.
+
+## Common Problems
+
+If the entire model appears perfectly flat, it is likely that the morph targets have not been applied as requested.
+
+If the red area or green area is missing, particularly in the Draco-compressed version of this model, it could indicate a problem with decompression or with support of multiple primitives within a single mesh.
+
+## Author
+
+Model by [@ft-lab](https://github.com/ft-lab).
+
+
diff --git a/test/models/glTF2/MorphPrimitivesTest/README.md b/test/models/glTF2/MorphPrimitivesTest/README.md
new file mode 100644
index 000000000..80dacfbcd
--- /dev/null
+++ b/test/models/glTF2/MorphPrimitivesTest/README.md
@@ -0,0 +1,50 @@
+# Morph-Primitives Test
+
+## Tags
+
+[core](../../Models-core.md), [testing](../../Models-testing.md)
+
+## Summary
+
+Tests a morph target on multiple primitives.
+
+## Operations
+
+* [Display](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/MorphPrimitivesTest/glTF-Binary/MorphPrimitivesTest.glb) in SampleViewer
+* [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/MorphPrimitivesTest/glTF-Binary/MorphPrimitivesTest.glb)
+* [Model Directory](./)
+
+## Screenshot
+
+![screenshot](screenshot/screenshot.jpg)
+
+## Description
+
+This model contains a simple mesh with two primitives:  A larger red primitive displays a grid covering 3 of the 4 quadrants of the model's area, followed by a smaller green primitive covering the last quadrant.
+
+Each primitive has a morph target that creates an elevated area within these quadrants.  The model's only mesh contains a `weights: [0.5]` instruction that should cause these morph targets to be applied at half strength, raising the center of the model as shown in the screenshot above.
+
+## Common Problems
+
+If the entire model appears perfectly flat, it is likely that the morph targets have not been applied as requested.
+
+If the red area or green area is missing, particularly in the Draco-compressed version of this model, it could indicate a problem with decompression or with support of multiple primitives within a single mesh.
+
+## Author
+
+Model by [@ft-lab](https://github.com/ft-lab).
+
+
+
+
+## Legal
+
+&copy; 2018, ft-lab. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
+
+ - ft-lab for Everything
+
+&copy; 2020, Frank Galligan. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
+
+ - Frank Galligan for DRACO compression
+
+#### Assembled by modelmetadata
\ No newline at end of file
diff --git a/test/models/glTF2/MorphPrimitivesTest/glTF/MorphPrimitivesTest.bin b/test/models/glTF2/MorphPrimitivesTest/glTF/MorphPrimitivesTest.bin
new file mode 100644
index 000000000..7f269e17a
Binary files /dev/null and b/test/models/glTF2/MorphPrimitivesTest/glTF/MorphPrimitivesTest.bin differ
diff --git a/test/models/glTF2/MorphPrimitivesTest/glTF/MorphPrimitivesTest.gltf b/test/models/glTF2/MorphPrimitivesTest/glTF/MorphPrimitivesTest.gltf
new file mode 100644
index 000000000..bd3ad0e31
--- /dev/null
+++ b/test/models/glTF2/MorphPrimitivesTest/glTF/MorphPrimitivesTest.gltf
@@ -0,0 +1,331 @@
+{
+  "asset": {
+    "generator": "glTF Converter for Shade3D",
+    "version": "2.0",
+    "extras": {
+      "title": "multiple_primitives",
+      "author": "ft-lab",
+      "license": "CC BY-4.0 (https://creativecommons.org/licenses/by/4.0/)"
+    }
+  },
+  "accessors": [
+    {
+      "bufferView": 0,
+      "componentType": 5123,
+      "count": 72,
+      "type": "SCALAR",
+      "byteOffset": 0
+    },
+    {
+      "bufferView": 1,
+      "componentType": 5126,
+      "count": 21,
+      "type": "VEC3",
+      "byteOffset": 0
+    },
+    {
+      "bufferView": 2,
+      "componentType": 5126,
+      "count": 21,
+      "type": "VEC3",
+      "max": [
+        0.5,
+        0,
+        0.5
+      ],
+      "min": [
+        -0.5,
+        0,
+        -0.5
+      ],
+      "byteOffset": 0
+    },
+    {
+      "bufferView": 3,
+      "componentType": 5126,
+      "count": 21,
+      "type": "VEC2",
+      "byteOffset": 0
+    },
+    {
+      "bufferView": 4,
+      "componentType": 5126,
+      "count": 21,
+      "type": "VEC3",
+      "max": [
+        0,
+        0.20000000298023224,
+        0
+      ],
+      "min": [
+        0,
+        0,
+        0
+      ],
+      "byteOffset": 0
+    },
+    {
+      "bufferView": 5,
+      "componentType": 5123,
+      "count": 24,
+      "type": "SCALAR",
+      "byteOffset": 0
+    },
+    {
+      "bufferView": 6,
+      "componentType": 5126,
+      "count": 9,
+      "type": "VEC3",
+      "byteOffset": 0
+    },
+    {
+      "bufferView": 7,
+      "componentType": 5126,
+      "count": 9,
+      "type": "VEC3",
+      "max": [
+        0.5,
+        0,
+        0
+      ],
+      "min": [
+        0,
+        0,
+        -0.5
+      ],
+      "byteOffset": 0
+    },
+    {
+      "bufferView": 8,
+      "componentType": 5126,
+      "count": 9,
+      "type": "VEC2",
+      "byteOffset": 0
+    },
+    {
+      "bufferView": 9,
+      "componentType": 5126,
+      "count": 9,
+      "type": "VEC3",
+      "max": [
+        0,
+        0.20000000298023224,
+        0
+      ],
+      "min": [
+        0,
+        0,
+        0
+      ],
+      "byteOffset": 0
+    }
+  ],
+  "bufferViews": [
+    {
+      "buffer": 0,
+      "byteOffset": 0,
+      "byteLength": 144,
+      "target": 34963
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 144,
+      "byteLength": 252,
+      "target": 34962,
+      "byteStride": 12
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 396,
+      "byteLength": 252,
+      "target": 34962,
+      "byteStride": 12
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 648,
+      "byteLength": 168,
+      "target": 34962,
+      "byteStride": 8
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 816,
+      "byteLength": 252,
+      "target": 34962,
+      "byteStride": 12
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 1068,
+      "byteLength": 48,
+      "target": 34963
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 1116,
+      "byteLength": 108,
+      "target": 34962,
+      "byteStride": 12
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 1224,
+      "byteLength": 108,
+      "target": 34962,
+      "byteStride": 12
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 1332,
+      "byteLength": 72,
+      "target": 34962,
+      "byteStride": 8
+    },
+    {
+      "buffer": 0,
+      "byteOffset": 1404,
+      "byteLength": 108,
+      "target": 34962,
+      "byteStride": 12
+    }
+  ],
+  "buffers": [
+    {
+      "name": "MorphPrimitivesTest",
+      "byteLength": 1512,
+      "uri": "MorphPrimitivesTest.bin"
+    }
+  ],
+  "images": [
+    {
+      "name": "uv_texture.jpg",
+      "mimeType": "image/jpeg",
+      "uri": "uv_texture.jpg"
+    }
+  ],
+  "materials": [
+    {
+      "pbrMetallicRoughness": {
+        "baseColorFactor": [
+          1,
+          0,
+          0,
+          1
+        ],
+        "baseColorTexture": {
+          "index": 0,
+          "texCoord": 0
+        },
+        "metallicFactor": 0,
+        "roughnessFactor": 1
+      },
+      "name": "red",
+      "emissiveFactor": [
+        0,
+        0,
+        0
+      ],
+      "alphaMode": "OPAQUE",
+      "doubleSided": false
+    },
+    {
+      "pbrMetallicRoughness": {
+        "baseColorFactor": [
+          0,
+          1,
+          0,
+          1
+        ],
+        "baseColorTexture": {
+          "index": 0,
+          "texCoord": 0
+        },
+        "metallicFactor": 0,
+        "roughnessFactor": 1
+      },
+      "name": "green",
+      "emissiveFactor": [
+        0,
+        0,
+        0
+      ],
+      "alphaMode": "OPAQUE",
+      "doubleSided": false
+    }
+  ],
+  "meshes": [
+    {
+      "weights": [
+        0.5
+      ],
+      "name": "mesh",
+      "primitives": [
+        {
+          "attributes": {
+            "NORMAL": 1,
+            "POSITION": 2,
+            "TEXCOORD_0": 3
+          },
+          "indices": 0,
+          "material": 0,
+          "targets": [
+            {
+              "POSITION": 4
+            }
+          ],
+          "mode": 4
+        },
+        {
+          "attributes": {
+            "POSITION": 7,
+            "NORMAL": 6,
+            "TEXCOORD_0": 8
+          },
+          "indices": 5,
+          "material": 1,
+          "targets": [
+            {
+              "POSITION": 9
+            }
+          ],
+          "mode": 4
+        }
+      ]
+    }
+  ],
+  "nodes": [
+    {
+      "children": [
+        1
+      ],
+      "name": "ルートパート"
+    },
+    {
+      "mesh": 0,
+      "name": "mesh"
+    }
+  ],
+  "samplers": [
+    {
+      "minFilter": 9729,
+      "wrapS": 10497,
+      "wrapT": 10497
+    }
+  ],
+  "scenes": [
+    {
+      "nodes": [
+        0
+      ],
+      "name": "Scene"
+    }
+  ],
+  "textures": [
+    {
+      "sampler": 0,
+      "source": 0
+    }
+  ],
+  "scene": 0
+}
diff --git a/test/models/glTF2/MorphPrimitivesTest/glTF/uv_texture.jpg b/test/models/glTF2/MorphPrimitivesTest/glTF/uv_texture.jpg
new file mode 100644
index 000000000..7f63873f9
Binary files /dev/null and b/test/models/glTF2/MorphPrimitivesTest/glTF/uv_texture.jpg differ
diff --git a/test/models/glTF2/MorphStressTest/LICENSE.md b/test/models/glTF2/MorphStressTest/LICENSE.md
new file mode 100644
index 000000000..2e9a26b9f
--- /dev/null
+++ b/test/models/glTF2/MorphStressTest/LICENSE.md
@@ -0,0 +1,15 @@
+# LICENSE file for the model: Morph Stress Test
+
+All files in this directory tree are licensed as indicated below.
+
+* All files directly associated with the model including all text, image and binary files:
+
+  * [CC BY 4.0 International]("https://creativecommons.org/licenses/by/4.0/legalcode") [SPDX license identifier: "CC-BY-4.0"]
+
+* This file and all other metadocumentation files including "metadata.json":
+
+  * [Creative Commons Attribtution 4.0 International]("https://creativecommons.org/licenses/by/4.0/legalcode") [SPDX license identifier: "CC-BY-4.0"]
+
+Full license text of these licenses are available at the links above
+
+#### Generated by modelmetadata
\ No newline at end of file
diff --git a/test/models/glTF2/MorphStressTest/README.body.md b/test/models/glTF2/MorphStressTest/README.body.md
new file mode 100644
index 000000000..704ebd1e7
--- /dev/null
+++ b/test/models/glTF2/MorphStressTest/README.body.md
@@ -0,0 +1,62 @@
+## Screenshot
+
+![screenshot](screenshot/screenshot_large.png)
+
+## Description
+
+This model has a base mesh, plus eight morph targets.  The base and each of the morph targets has
+both a POSITION and a NORMAL accessor, resulting in no less than 18 vertex attributes being requested
+by a typical implementation.  This number can be too high for many realtime graphics systems, and
+the client runtime may take steps to limit the overall number of morph targets and/or limit the
+number of active morph targets.
+
+As such, this model is not expected to render correctly everywhere.  Instead, it pushes the limits
+to see how many morph targets can move at once before problems become apparent.
+
+## Animations
+
+Three animations are included:
+
+---
+### "Individuals"
+
+![Individuals animation](screenshot/Anim_Individuals.gif)
+
+Each morph target is exercised one at a time, and returns to zero strength before the next one
+starts to move.  This offers runtimes the best chance of success, as vertex attributes need only
+be allocated for one morph target at a time.  Even so, systems that pre-allocate morph target
+attributes may place an upper limit here, allowing only some of the test blocks to move.
+
+---
+### "TheWave"
+
+![Wave animation](screenshot/Anim_TheWave.gif)
+
+This animation tests a wave of morph targets being activated simultaneously.  This does require
+a high number of vertex attributes to be available.  If glitches in movement are observed,
+continue on to the "Pulse" animation for closer inspection.
+
+---
+### "Pulse"
+
+![Pulse animation](screenshot/Anim_Pulse.gif)
+
+This is the most stressful test, with all 8 morph targets reaching full strength before any
+begin to subside.  Some runtimes may place limits on how many morph targets can be active at
+once, resulting in a distinctive visual pattern here:  Only the first N test blocks will
+appear to move, where N is the number of simultaneous active morph targets allowed.  Test
+blocks on the right will remain frozen in the starting position until the first few blocks
+on the left have returned to rest.  After the blocks on the left have returned to rest, they
+could relinquish their vertex attributes to blocks on the right, allowing those blocks to
+"catch up" to their assigned positions in the animation.
+
+It is also possible that there could be a hard limit on the number of morph targets, regardless
+of whether they are active or not.  In this case, only the first N blocks will move at all,
+and the remainder will be frozen the entire time.
+
+---
+## Implementation Notes
+
+BabylonJS has shared some technical details of their "Infinite Morph Targets" implementation
+in [this YouTube video](https://www.youtube.com/watch?v=LBPRmGgU0PE).
+
diff --git a/test/models/glTF2/MorphStressTest/README.md b/test/models/glTF2/MorphStressTest/README.md
new file mode 100644
index 000000000..71eb60540
--- /dev/null
+++ b/test/models/glTF2/MorphStressTest/README.md
@@ -0,0 +1,87 @@
+# Morph Stress Test
+
+## Tags
+
+[core](../../Models-core.md), [testing](../../Models-testing.md)
+
+## Summary
+
+Tests up to 8 morph targets.
+
+## Operations
+
+* [Display](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/MorphStressTest/glTF-Binary/MorphStressTest.glb) in SampleViewer
+* [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/MorphStressTest/glTF-Binary/MorphStressTest.glb)
+* [Model Directory](./)
+
+## Screenshot
+
+![screenshot](screenshot/screenshot_large.png)
+
+## Description
+
+This model has a base mesh, plus eight morph targets.  The base and each of the morph targets has
+both a POSITION and a NORMAL accessor, resulting in no less than 18 vertex attributes being requested
+by a typical implementation.  This number can be too high for many realtime graphics systems, and
+the client runtime may take steps to limit the overall number of morph targets and/or limit the
+number of active morph targets.
+
+As such, this model is not expected to render correctly everywhere.  Instead, it pushes the limits
+to see how many morph targets can move at once before problems become apparent.
+
+## Animations
+
+Three animations are included:
+
+---
+### "Individuals"
+
+![Individuals animation](screenshot/Anim_Individuals.gif)
+
+Each morph target is exercised one at a time, and returns to zero strength before the next one
+starts to move.  This offers runtimes the best chance of success, as vertex attributes need only
+be allocated for one morph target at a time.  Even so, systems that pre-allocate morph target
+attributes may place an upper limit here, allowing only some of the test blocks to move.
+
+---
+### "TheWave"
+
+![Wave animation](screenshot/Anim_TheWave.gif)
+
+This animation tests a wave of morph targets being activated simultaneously.  This does require
+a high number of vertex attributes to be available.  If glitches in movement are observed,
+continue on to the "Pulse" animation for closer inspection.
+
+---
+### "Pulse"
+
+![Pulse animation](screenshot/Anim_Pulse.gif)
+
+This is the most stressful test, with all 8 morph targets reaching full strength before any
+begin to subside.  Some runtimes may place limits on how many morph targets can be active at
+once, resulting in a distinctive visual pattern here:  Only the first N test blocks will
+appear to move, where N is the number of simultaneous active morph targets allowed.  Test
+blocks on the right will remain frozen in the starting position until the first few blocks
+on the left have returned to rest.  After the blocks on the left have returned to rest, they
+could relinquish their vertex attributes to blocks on the right, allowing those blocks to
+"catch up" to their assigned positions in the animation.
+
+It is also possible that there could be a hard limit on the number of morph targets, regardless
+of whether they are active or not.  In this case, only the first N blocks will move at all,
+and the remainder will be frozen the entire time.
+
+---
+## Implementation Notes
+
+BabylonJS has shared some technical details of their "Infinite Morph Targets" implementation
+in [this YouTube video](https://www.youtube.com/watch?v=LBPRmGgU0PE).
+
+
+
+## Legal
+
+&copy; 2021, Analytical Graphics, Inc.. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
+
+ - Ed Mackey for Everything
+
+#### Assembled by modelmetadata
\ No newline at end of file
diff --git a/test/models/glTF2/MorphStressTest/glTF/Base_AO.png b/test/models/glTF2/MorphStressTest/glTF/Base_AO.png
new file mode 100644
index 000000000..567255a7f
Binary files /dev/null and b/test/models/glTF2/MorphStressTest/glTF/Base_AO.png differ
diff --git a/test/models/glTF2/MorphStressTest/glTF/ColorSwatches.png b/test/models/glTF2/MorphStressTest/glTF/ColorSwatches.png
new file mode 100644
index 000000000..72da1c22c
Binary files /dev/null and b/test/models/glTF2/MorphStressTest/glTF/ColorSwatches.png differ
diff --git a/test/models/glTF2/MorphStressTest/glTF/MorphStressTest.bin b/test/models/glTF2/MorphStressTest/glTF/MorphStressTest.bin
new file mode 100644
index 000000000..53ebd6724
Binary files /dev/null and b/test/models/glTF2/MorphStressTest/glTF/MorphStressTest.bin differ
diff --git a/test/models/glTF2/MorphStressTest/glTF/MorphStressTest.gltf b/test/models/glTF2/MorphStressTest/glTF/MorphStressTest.gltf
new file mode 100644
index 000000000..560cb2b1d
--- /dev/null
+++ b/test/models/glTF2/MorphStressTest/glTF/MorphStressTest.gltf
@@ -0,0 +1,999 @@
+{
+    "asset" : {
+        "copyright" : "CC-BY 4.0 Copyright 2021 Analytical Graphics, Inc. Model and Textures by Ed Mackey.",
+        "generator" : "Khronos glTF Blender I/O v1.5.13",
+        "version" : "2.0"
+    },
+    "scene" : 0,
+    "scenes" : [
+        {
+            "name" : "Scene",
+            "nodes" : [
+                0
+            ]
+        }
+    ],
+    "nodes" : [
+        {
+            "mesh" : 0,
+            "name" : "Main"
+        }
+    ],
+    "animations" : [
+        {
+            "channels" : [
+                {
+                    "sampler" : 0,
+                    "target" : {
+                        "node" : 0,
+                        "path" : "weights"
+                    }
+                }
+            ],
+            "name" : "Individuals",
+            "samplers" : [
+                {
+                    "input" : 42,
+                    "interpolation" : "LINEAR",
+                    "output" : 43
+                }
+            ]
+        },
+        {
+            "channels" : [
+                {
+                    "sampler" : 0,
+                    "target" : {
+                        "node" : 0,
+                        "path" : "weights"
+                    }
+                }
+            ],
+            "name" : "TheWave",
+            "samplers" : [
+                {
+                    "input" : 44,
+                    "interpolation" : "LINEAR",
+                    "output" : 45
+                }
+            ]
+        },
+        {
+            "channels" : [
+                {
+                    "sampler" : 0,
+                    "target" : {
+                        "node" : 0,
+                        "path" : "weights"
+                    }
+                }
+            ],
+            "name" : "Pulse",
+            "samplers" : [
+                {
+                    "input" : 46,
+                    "interpolation" : "LINEAR",
+                    "output" : 47
+                }
+            ]
+        }
+    ],
+    "materials" : [
+        {
+            "doubleSided" : true,
+            "name" : "Base",
+            "occlusionTexture" : {
+                "index" : 0,
+                "texCoord" : 1
+            },
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "index" : 1
+                },
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.4000000059604645
+            }
+        },
+        {
+            "doubleSided" : true,
+            "name" : "TestMaterial",
+            "pbrMetallicRoughness" : {
+                "baseColorTexture" : {
+                    "index" : 2
+                },
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.5
+            }
+        }
+    ],
+    "meshes" : [
+        {
+            "extras" : {
+                "targetNames" : [
+                    "Key 1",
+                    "Key 2",
+                    "Key 3",
+                    "Key 4",
+                    "Key 5",
+                    "Key 6",
+                    "Key 7",
+                    "Key 8"
+                ]
+            },
+            "name" : "Cube",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 0,
+                        "NORMAL" : 1,
+                        "TEXCOORD_0" : 2,
+                        "TEXCOORD_1" : 3
+                    },
+                    "indices" : 4,
+                    "material" : 0,
+                    "targets" : [
+                        {
+                            "POSITION" : 5,
+                            "NORMAL" : 6
+                        },
+                        {
+                            "POSITION" : 7,
+                            "NORMAL" : 8
+                        },
+                        {
+                            "POSITION" : 9,
+                            "NORMAL" : 10
+                        },
+                        {
+                            "POSITION" : 11,
+                            "NORMAL" : 12
+                        },
+                        {
+                            "POSITION" : 13,
+                            "NORMAL" : 14
+                        },
+                        {
+                            "POSITION" : 15,
+                            "NORMAL" : 16
+                        },
+                        {
+                            "POSITION" : 17,
+                            "NORMAL" : 18
+                        },
+                        {
+                            "POSITION" : 19,
+                            "NORMAL" : 20
+                        }
+                    ]
+                },
+                {
+                    "attributes" : {
+                        "POSITION" : 21,
+                        "NORMAL" : 22,
+                        "TEXCOORD_0" : 23,
+                        "TEXCOORD_1" : 24
+                    },
+                    "indices" : 25,
+                    "material" : 1,
+                    "targets" : [
+                        {
+                            "POSITION" : 26,
+                            "NORMAL" : 27
+                        },
+                        {
+                            "POSITION" : 28,
+                            "NORMAL" : 29
+                        },
+                        {
+                            "POSITION" : 30,
+                            "NORMAL" : 31
+                        },
+                        {
+                            "POSITION" : 32,
+                            "NORMAL" : 33
+                        },
+                        {
+                            "POSITION" : 34,
+                            "NORMAL" : 35
+                        },
+                        {
+                            "POSITION" : 36,
+                            "NORMAL" : 37
+                        },
+                        {
+                            "POSITION" : 38,
+                            "NORMAL" : 39
+                        },
+                        {
+                            "POSITION" : 40,
+                            "NORMAL" : 41
+                        }
+                    ]
+                }
+            ],
+            "weights" : [
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0
+            ]
+        }
+    ],
+    "textures" : [
+        {
+            "sampler" : 0,
+            "source" : 0
+        },
+        {
+            "sampler" : 0,
+            "source" : 1
+        },
+        {
+            "sampler" : 0,
+            "source" : 2
+        }
+    ],
+    "images" : [
+        {
+            "mimeType" : "image/png",
+            "name" : "Base_AO",
+            "uri" : "Base_AO.png"
+        },
+        {
+            "mimeType" : "image/png",
+            "name" : "TinyGrid",
+            "uri" : "TinyGrid.png"
+        },
+        {
+            "mimeType" : "image/png",
+            "name" : "ColorSwatches",
+            "uri" : "ColorSwatches.png"
+        }
+    ],
+    "accessors" : [
+        {
+            "bufferView" : 0,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                2,
+                0,
+                0.5
+            ],
+            "min" : [
+                -2,
+                -0.10000002384185791,
+                -0.5
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 1,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 2,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 3,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 4,
+            "componentType" : 5123,
+            "count" : 36,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 5,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                0,
+                0,
+                0
+            ],
+            "min" : [
+                0,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 6,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 7,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                0,
+                0,
+                0
+            ],
+            "min" : [
+                0,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 8,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 9,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                0,
+                0,
+                0
+            ],
+            "min" : [
+                0,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 10,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 11,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                0,
+                0,
+                0
+            ],
+            "min" : [
+                0,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 12,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 13,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                0,
+                0,
+                0
+            ],
+            "min" : [
+                0,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 14,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 15,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                0,
+                0,
+                0
+            ],
+            "min" : [
+                0,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 16,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 17,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                0,
+                0,
+                0
+            ],
+            "min" : [
+                0,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 18,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 19,
+            "componentType" : 5126,
+            "count" : 24,
+            "max" : [
+                0,
+                0,
+                0
+            ],
+            "min" : [
+                0,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 20,
+            "componentType" : 5126,
+            "count" : 24,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 21,
+            "componentType" : 5126,
+            "count" : 1504,
+            "max" : [
+                1.875,
+                0.5,
+                0.25
+            ],
+            "min" : [
+                -1.875,
+                0,
+                -0.25
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 22,
+            "componentType" : 5126,
+            "count" : 1504,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 23,
+            "componentType" : 5126,
+            "count" : 1504,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 24,
+            "componentType" : 5126,
+            "count" : 1504,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 25,
+            "componentType" : 5123,
+            "count" : 7200,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 26,
+            "componentType" : 5126,
+            "count" : 1504,
+            "max" : [
+                0.04999995231628418,
+                1,
+                0
+            ],
+            "min" : [
+                -0.04999995231628418,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 27,
+            "componentType" : 5126,
+            "count" : 1504,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 28,
+            "componentType" : 5126,
+            "count" : 1504,
+            "max" : [
+                0.04999995231628418,
+                1,
+                0
+            ],
+            "min" : [
+                -0.04999995231628418,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 29,
+            "componentType" : 5126,
+            "count" : 1504,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 30,
+            "componentType" : 5126,
+            "count" : 1504,
+            "max" : [
+                0.050000011920928955,
+                1,
+                0
+            ],
+            "min" : [
+                -0.050000011920928955,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 31,
+            "componentType" : 5126,
+            "count" : 1504,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 32,
+            "componentType" : 5126,
+            "count" : 1504,
+            "max" : [
+                0.050000011920928955,
+                1,
+                0
+            ],
+            "min" : [
+                -0.04999999701976776,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 33,
+            "componentType" : 5126,
+            "count" : 1504,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 34,
+            "componentType" : 5126,
+            "count" : 1504,
+            "max" : [
+                0.04999999701976776,
+                1,
+                0
+            ],
+            "min" : [
+                -0.050000011920928955,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 35,
+            "componentType" : 5126,
+            "count" : 1504,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 36,
+            "componentType" : 5126,
+            "count" : 1504,
+            "max" : [
+                0.050000011920928955,
+                1,
+                0
+            ],
+            "min" : [
+                -0.050000011920928955,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 37,
+            "componentType" : 5126,
+            "count" : 1504,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 38,
+            "componentType" : 5126,
+            "count" : 1504,
+            "max" : [
+                0.04999995231628418,
+                1,
+                0
+            ],
+            "min" : [
+                -0.04999995231628418,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 39,
+            "componentType" : 5126,
+            "count" : 1504,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 40,
+            "componentType" : 5126,
+            "count" : 1504,
+            "max" : [
+                0.04999995231628418,
+                1,
+                0
+            ],
+            "min" : [
+                -0.04999995231628418,
+                0,
+                0
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 41,
+            "componentType" : 5126,
+            "count" : 1504,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 42,
+            "componentType" : 5126,
+            "count" : 281,
+            "max" : [
+                9.366666666666667
+            ],
+            "min" : [
+                0.03333333333333333
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 43,
+            "componentType" : 5126,
+            "count" : 2248,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 44,
+            "componentType" : 5126,
+            "count" : 59,
+            "max" : [
+                1.9666666666666666
+            ],
+            "min" : [
+                0.03333333333333333
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 45,
+            "componentType" : 5126,
+            "count" : 472,
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 46,
+            "componentType" : 5126,
+            "count" : 191,
+            "max" : [
+                6.366666666666666
+            ],
+            "min" : [
+                0.03333333333333333
+            ],
+            "type" : "SCALAR"
+        },
+        {
+            "bufferView" : 47,
+            "componentType" : 5126,
+            "count" : 1528,
+            "type" : "SCALAR"
+        }
+    ],
+    "bufferViews" : [
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 0
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 288
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 192,
+            "byteOffset" : 576
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 192,
+            "byteOffset" : 768
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 72,
+            "byteOffset" : 960
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 1032
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 1320
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 1608
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 1896
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 2184
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 2472
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 2760
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 3048
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 3336
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 3624
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 3912
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 4200
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 4488
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 4776
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 5064
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 288,
+            "byteOffset" : 5352
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 5640
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 23688
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 12032,
+            "byteOffset" : 41736
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 12032,
+            "byteOffset" : 53768
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 14400,
+            "byteOffset" : 65800
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 80200
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 98248
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 116296
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 134344
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 152392
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 170440
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 188488
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 206536
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 224584
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 242632
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 260680
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 278728
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 296776
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 314824
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 332872
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 18048,
+            "byteOffset" : 350920
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 1124,
+            "byteOffset" : 368968
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 8992,
+            "byteOffset" : 370092
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 236,
+            "byteOffset" : 379084
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 1888,
+            "byteOffset" : 379320
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 764,
+            "byteOffset" : 381208
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 6112,
+            "byteOffset" : 381972
+        }
+    ],
+    "samplers" : [
+        {
+            "magFilter" : 9729,
+            "minFilter" : 9987
+        }
+    ],
+    "buffers" : [
+        {
+            "byteLength" : 388084,
+            "uri" : "MorphStressTest.bin"
+        }
+    ]
+}
diff --git a/test/models/glTF2/MorphStressTest/glTF/TinyGrid.png b/test/models/glTF2/MorphStressTest/glTF/TinyGrid.png
new file mode 100644
index 000000000..81d040a68
Binary files /dev/null and b/test/models/glTF2/MorphStressTest/glTF/TinyGrid.png differ
diff --git a/test/models/glTF2/SimpleMorph/LICENSE.md b/test/models/glTF2/SimpleMorph/LICENSE.md
new file mode 100644
index 000000000..a94108529
--- /dev/null
+++ b/test/models/glTF2/SimpleMorph/LICENSE.md
@@ -0,0 +1,15 @@
+# LICENSE file for the model: Simple Morph
+
+All files in this directory tree are licensed as indicated below.
+
+* All files directly associated with the model including all text, image and binary files:
+
+  * [CC0 1.0 Universal]("https://creativecommons.org/publicdomain/zero/1.0/legalcode") [SPDX license identifier: "CC0-1.0"]
+
+* This file and all other metadocumentation files including "metadata.json":
+
+  * [Creative Commons Attribtution 4.0 International]("https://creativecommons.org/licenses/by/4.0/legalcode") [SPDX license identifier: "CC-BY-4.0"]
+
+Full license text of these licenses are available at the links above
+
+#### Generated by modelmetadata
\ No newline at end of file
diff --git a/test/models/glTF2/SimpleMorph/README.body.md b/test/models/glTF2/SimpleMorph/README.body.md
new file mode 100644
index 000000000..02bb773bc
--- /dev/null
+++ b/test/models/glTF2/SimpleMorph/README.body.md
@@ -0,0 +1,17 @@
+## Screenshot
+
+![screenshot](screenshot/screenshot.png)
+
+## Notes
+
+This is an example of a glTF asset that uses morph targets, as described in the
+[Simple Morph Target](https://github.com/KhronosGroup/glTF-Tutorials/blob/master/gltfTutorial/gltfTutorial_017_SimpleMorphTarget.md)
+section of the glTF tutorial.
+
+## Data layout
+
+The following image shows the data layout of this sample:
+
+![simpleMorphStructure](screenshot/simpleMorphStructure.png)
+
+
diff --git a/test/models/glTF2/SimpleMorph/README.md b/test/models/glTF2/SimpleMorph/README.md
new file mode 100644
index 000000000..41f27498d
--- /dev/null
+++ b/test/models/glTF2/SimpleMorph/README.md
@@ -0,0 +1,41 @@
+# Simple Morph
+
+## Tags
+
+[core](../../Models-core.md), [testing](../../Models-testing.md)
+
+## Summary
+
+A triangle with a morph animation applied
+
+## Operations
+
+* [Display](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/SimpleMorph/glTF/SimpleMorph.gltf) in SampleViewer
+* [Model Directory](./)
+
+## Screenshot
+
+![screenshot](screenshot/screenshot.png)
+
+## Notes
+
+This is an example of a glTF asset that uses morph targets, as described in the
+[Simple Morph Target](https://github.com/KhronosGroup/glTF-Tutorials/blob/master/gltfTutorial/gltfTutorial_017_SimpleMorphTarget.md)
+section of the glTF tutorial.
+
+## Data layout
+
+The following image shows the data layout of this sample:
+
+![simpleMorphStructure](screenshot/simpleMorphStructure.png)
+
+
+
+
+## Legal
+
+&copy; 2017, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
+
+ - javagl for Everything
+
+#### Assembled by modelmetadata
\ No newline at end of file
diff --git a/test/models/glTF2/SimpleMorph/glTF/SimpleMorph.gltf b/test/models/glTF2/SimpleMorph/glTF/SimpleMorph.gltf
new file mode 100644
index 000000000..50091894f
--- /dev/null
+++ b/test/models/glTF2/SimpleMorph/glTF/SimpleMorph.gltf
@@ -0,0 +1,189 @@
+{
+  "scene" : 0,
+  "scenes":[
+    {
+      "nodes":[
+        0
+      ]
+    }
+  ],
+  "nodes":[
+    {
+      "mesh":0
+    }
+  ],
+  "meshes":[
+    {
+      "primitives":[
+        {
+          "attributes":{
+            "POSITION":1
+          },
+          "targets":[
+            {
+              "POSITION":2
+            },
+            {
+              "POSITION":3
+            }
+          ],
+          "indices":0
+        }
+      ],
+      "weights":[
+        0.5,
+        0.5
+      ]
+    }
+  ],
+  "animations":[
+    {
+      "samplers":[
+        {
+          "input":4,
+          "interpolation":"LINEAR",
+          "output":5
+        }
+      ],
+      "channels":[
+        {
+          "sampler":0,
+          "target":{
+            "node":0,
+            "path":"weights"
+          }
+        }
+      ]
+    }
+  ],
+  "buffers":[
+    {
+      "uri" : "simpleMorphGeometry.bin",
+      "byteLength":116
+    },
+    {
+      "uri" : "simpleMorphAnimation.bin",
+      "byteLength":60
+    }
+  ],
+  "bufferViews":[
+    {
+      "buffer":0,
+      "byteOffset":0,
+      "byteLength":6,
+      "target":34963
+    },
+    {
+      "buffer":0,
+      "byteOffset":8,
+      "byteLength":108,
+      "byteStride":12,
+      "target":34962
+    },
+    {
+      "buffer":1,
+      "byteOffset":0,
+      "byteLength":20
+    },
+    {
+      "buffer":1,
+      "byteOffset":20,
+      "byteLength":40
+    }
+  ],
+  "accessors":[
+    {
+      "bufferView":0,
+      "byteOffset":0,
+      "componentType":5123,
+      "count":3,
+      "type":"SCALAR",
+      "max":[
+        2
+      ],
+      "min":[
+        0
+      ]
+    },
+    {
+      "bufferView":1,
+      "byteOffset":0,
+      "componentType":5126,
+      "count":3,
+      "type":"VEC3",
+      "max":[
+        1.0,
+        0.5,
+        0.0
+      ],
+      "min":[
+        0.0,
+        0.0,
+        0.0
+      ]
+    },
+    {
+      "bufferView":1,
+      "byteOffset":36,
+      "componentType":5126,
+      "count":3,
+      "type":"VEC3",
+      "max":[
+        0.0,
+        1.0,
+        0.0
+      ],
+      "min":[
+        -1.0,
+        0.0,
+        0.0
+      ]
+    },
+    {
+      "bufferView":1,
+      "byteOffset":72,
+      "componentType":5126,
+      "count":3,
+      "type":"VEC3",
+      "max":[
+        1.0,
+        1.0,
+        0.0
+      ],
+      "min":[
+        0.0,
+        0.0,
+        0.0
+      ]
+    },
+    {
+      "bufferView":2,
+      "byteOffset":0,
+      "componentType":5126,
+      "count":5,
+      "type":"SCALAR",
+      "max":[
+        4.0
+      ],
+      "min":[
+        0.0
+      ]
+    },
+    {
+      "bufferView":3,
+      "byteOffset":0,
+      "componentType":5126,
+      "count":10,
+      "type":"SCALAR",
+      "max":[
+        1.0
+      ],
+      "min":[
+        0.0
+      ]
+    }
+  ],
+  "asset":{
+    "version":"2.0"
+  }
+}
diff --git a/test/models/glTF2/SimpleMorph/glTF/simpleMorphAnimation.bin b/test/models/glTF2/SimpleMorph/glTF/simpleMorphAnimation.bin
new file mode 100644
index 000000000..bbd0ee686
Binary files /dev/null and b/test/models/glTF2/SimpleMorph/glTF/simpleMorphAnimation.bin differ
diff --git a/test/models/glTF2/SimpleMorph/glTF/simpleMorphGeometry.bin b/test/models/glTF2/SimpleMorph/glTF/simpleMorphGeometry.bin
new file mode 100644
index 000000000..70b73c2c8
Binary files /dev/null and b/test/models/glTF2/SimpleMorph/glTF/simpleMorphGeometry.bin differ
diff --git a/test/models/glTF2/draco/robot.glb b/test/models/glTF2/draco/robot.glb
new file mode 100644
index 000000000..81679a60f
Binary files /dev/null and b/test/models/glTF2/draco/robot.glb differ
diff --git a/test/models/glTF2/ref/README.md b/test/models/glTF2/ref/README.md
new file mode 100644
index 000000000..63be83f11
--- /dev/null
+++ b/test/models/glTF2/ref/README.md
@@ -0,0 +1,16 @@
+# glTF 3D model reference images
+
+## AnimatedMorphCube
+<img alt="AnimatedMorphCube" src="screenshots/AnimatedMorphCube.gif" width=180 />
+
+## AnimatedMorphSphere
+<img alt="AnimatedMorphSphere" src="screenshots/AnimatedMorphSphere.gif" width=180 />
+
+## MorphPrimitivesTest
+<img alt="MorphPrimitivesTest" src="screenshots/MorphPrimitivesTest.gif" width=180 />
+
+## MorphStressTest
+<img alt="MorphStressTest" src="screenshots/MorphStressTest_cycle_animations.gif" width=180 />
+
+## SimpleMorph
+<img alt="SimpleMorph" src="screenshots/SimpleMorph.gif" width=180 />
diff --git a/test/models/glTF2/ref/screenshots/AnimatedMorphCube.gif b/test/models/glTF2/ref/screenshots/AnimatedMorphCube.gif
new file mode 100644
index 000000000..5c73ff8af
Binary files /dev/null and b/test/models/glTF2/ref/screenshots/AnimatedMorphCube.gif differ
diff --git a/test/models/glTF2/ref/screenshots/AnimatedMorphSphere.gif b/test/models/glTF2/ref/screenshots/AnimatedMorphSphere.gif
new file mode 100644
index 000000000..6e33d01b5
Binary files /dev/null and b/test/models/glTF2/ref/screenshots/AnimatedMorphSphere.gif differ
diff --git a/test/models/glTF2/ref/screenshots/MorphPrimitivesTest.gif b/test/models/glTF2/ref/screenshots/MorphPrimitivesTest.gif
new file mode 100644
index 000000000..fbd100620
Binary files /dev/null and b/test/models/glTF2/ref/screenshots/MorphPrimitivesTest.gif differ
diff --git a/test/models/glTF2/ref/screenshots/MorphStressTest_cycle_animations.gif b/test/models/glTF2/ref/screenshots/MorphStressTest_cycle_animations.gif
new file mode 100644
index 000000000..877b78f20
Binary files /dev/null and b/test/models/glTF2/ref/screenshots/MorphStressTest_cycle_animations.gif differ
diff --git a/test/models/glTF2/ref/screenshots/SimpleMorph.gif b/test/models/glTF2/ref/screenshots/SimpleMorph.gif
new file mode 100644
index 000000000..d883b352c
Binary files /dev/null and b/test/models/glTF2/ref/screenshots/SimpleMorph.gif differ
diff --git a/test/models/invalid/box_nested_animation_4286.dae b/test/models/invalid/box_nested_animation_4286.dae
new file mode 100644
index 000000000..2def61d20
--- /dev/null
+++ b/test/models/invalid/box_nested_animation_4286.dae
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <asset>
+    <contributor>
+      <author>Blender User</author>
+      <authoring_tool>Blender 2.80.40 commit date:2019-01-07, commit time:23:37, hash:91a155833e59</authoring_tool>
+    </contributor>
+    <created>2019-01-08T17:44:11</created>
+    <modified>2019-01-08T17:44:11</modified>
+    <unit name="meter" meter="1"/>
+    <up_axis>Z_UP</up_axis>
+  </asset>
+  <library_effects>
+    <effect id="Material-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <lambert>
+            <diffuse>
+              <color sid="diffuse">0.8 0.8 0.8 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0 0.5 0 1</color>
+            </specular>
+          </lambert>
+        </technique>
+      </profile_COMMON>
+    </effect>
+  </library_effects>
+  <library_images/>
+  <library_materials>
+    <material id="Material-material" name="Material">
+      <instance_effect url="#Material-effect"/>
+    </material>
+  </library_materials>
+  <library_geometries>
+    <geometry id="Cube-mesh" name="Cube">
+      <mesh>
+        <source id="Cube-mesh-positions">
+          <float_array id="Cube-mesh-positions-array" count="3">1 1 1 1 1 -1 1 -1 1 1 -1 -1 -1 1 1 -1 1 -1 -1 -1 1 -1 -1 -1</float_array>
+          <technique_common>
+            <accessor source="#Cube-mesh-positions-array" count="8" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Cube-mesh-normals">
+          <float_array id="Cube-mesh-normals-array" count="18">0 0 1 0 -1 0 -1 0 0 0 0 -1 1 0 0 0 1 0</float_array>
+          <technique_common>
+            <accessor source="#Cube-mesh-normals-array" count="6" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Cube-mesh-map-0">
+          <float_array id="Cube-mesh-map-0-array" count="72">0.625 0 0.375 0.25 0.375 0 0.625 0.25 0.375 0.5 0.375 0.25 0.625 0.5 0.375 0.75 0.375 0.5 0.625 0.75 0.375 1 0.375 0.75 0.375 0.5 0.125 0.75 0.125 0.5 0.875 0.5 0.625 0.75 0.625 0.5 0.625 0 0.625 0.25 0.375 0.25 0.625 0.25 0.625 0.5 0.375 0.5 0.625 0.5 0.625 0.75 0.375 0.75 0.625 0.75 0.625 1 0.375 1 0.375 0.5 0.375 0.75 0.125 0.75 0.875 0.5 0.875 0.75 0.625 0.75</float_array>
+          <technique_common>
+            <accessor source="#Cube-mesh-map-0-array" count="36" stride="2">
+              <param name="S" type="float"/>
+              <param name="T" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <vertices id="Cube-mesh-vertices">
+          <input semantic="POSITION" source="#Cube-mesh-positions"/>
+        </vertices>
+        <polylist material="Material-material" count="12">
+          <input semantic="VERTEX" source="#Cube-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Cube-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Cube-mesh-map-0" offset="2" set="1"/>
+          <vcount>3 3 3 3 3 3 3 3 3 3 3 3 </vcount>
+          <p>4 0 0 2 0 1 0 0 2 2 1 3 7 1 4 3 1 5 6 2 6 5 2 7 7 2 8 1 3 9 7 3 10 5 3 11 0 4 12 3 4 13 1 4 14 4 5 15 1 5 16 5 5 17 4 0 18 6 0 19 2 0 20 2 1 21 6 1 22 7 1 23 6 2 24 4 2 25 5 2 26 1 3 27 3 3 28 7 3 29 0 4 30 2 4 31 3 4 32 4 5 33 0 5 34 1 5 35</p>
+        </polylist>
+      </mesh>
+    </geometry>
+  </library_geometries>
+  <library_controllers>
+    <controller id="Armature_Cube-skin" name="Armature">
+      <skin source="#Cube-mesh">
+        <bind_shape_matrix>1 0 0 -1 0 1 0 1 0 0 1 1 0 0 0 1</bind_shape_matrix>
+        <source id="Armature_Cube-skin-joints">
+          <Name_array id="Armature_Cube-skin-joints-array" count="1">Bone</Name_array>
+          <technique_common>
+            <accessor source="#Armature_Cube-skin-joints-array" count="1" stride="1">
+              <param name="JOINT" type="name"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Armature_Cube-skin-bind_poses">
+          <float_array id="Armature_Cube-skin-bind_poses-array" count="16">0.7886752 0.2113248 0.5773504 -0.5773504 -0.5773503 0.5773503 0.5773503 1.154701 -0.2113249 -0.7886752 0.5773503 -0.5773502 0 0 0 1</float_array>
+          <technique_common>
+            <accessor source="#Armature_Cube-skin-bind_poses-array" count="1" stride="16">
+              <param name="TRANSFORM" type="float4x4"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Armature_Cube-skin-weights">
+          <float_array id="Armature_Cube-skin-weights-array" count="8">1 1 1 1 1 1 1 1</float_array>
+          <technique_common>
+            <accessor source="#Armature_Cube-skin-weights-array" count="8" stride="1">
+              <param name="WEIGHT" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <joints>
+          <input semantic="JOINT" source="#Armature_Cube-skin-joints"/>
+          <input semantic="INV_BIND_MATRIX" source="#Armature_Cube-skin-bind_poses"/>
+        </joints>
+        <vertex_weights count="8">
+          <input semantic="JOINT" source="#Armature_Cube-skin-joints" offset="0"/>
+          <input semantic="WEIGHT" source="#Armature_Cube-skin-weights" offset="1"/>
+          <vcount>1 1 1 1 1 1 1 1 </vcount>
+          <v>0 0 0 1 0 2 0 3 0 4 0 5 0 6 0 7</v>
+        </vertex_weights>
+      </skin>
+    </controller>
+  </library_controllers>
+  <library_animations>
+    <animation id="action_container-Armature" name="Armature">
+      <animation id="Armature_ArmatureAction_transform" name="Armature">
+        <source id="Armature_ArmatureAction_transform-input">
+          <float_array id="Armature_ArmatureAction_transform-input-array" count="40">0.04166662 0.08333331 0.125 0.1666666 0.2083333 0.25 0.2916666 0.3333333 0.375 0.4166666 0.4583333 0.5 0.5416667 0.5833333 0.625 0.6666667 0.7083333 0.75 0.7916667 0.8333333 0.875 0.9166667 0.9583333 1 1.041667 1.083333 1.125 1.166667 1.208333 1.25 1.291667 1.333333 1.375 1.416667 1.458333 1.5 1.541667 1.583333 1.625 1.666667</float_array>
+          <technique_common>
+            <accessor source="#Armature_ArmatureAction_transform-input-array" count="40" stride="1">
+              <param name="TIME" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Armature_ArmatureAction_transform-output">
+          <float_array id="Armature_ArmatureAction_transform-output-array" count="640">1 0 0 1 0 1 0 -1 0 0 1 0 0 0 0 1 0.9999878 3.10816e-5 0.004935208 1 0 0.9999802 -0.006297799 -1 -0.004935306 0.006297722 0.999968 0 0 0 0 1 0.999819 4.61727e-4 0.01901668 1 0 0.9997054 -0.02427293 -1 -0.01902229 0.02426853 0.9995245 0 0 0 0 1 0.9991519 0.002163141 0.04111904 1 0 0.9986191 -0.05253414 -1 -0.04117589 0.05248959 0.9977722 0 0 0 0 1 0.9975264 0.006301912 0.07000974 1 0 0.9959731 -0.08965231 -1 -0.0702928 0.08943056 0.9935095 0 0 0 0 1 0.9944467 0.01411698 0.1042901 1 0 0.9909625 -0.1341392 -1 -0.1052413 0.1333943 0.9854594 0 0 0 0 1 0.9894527 0.02671701 0.1423712 1 0 0.9828442 -0.184438 -1 -0.1448563 0.1824927 0.9724778 0 0 0 0 1 0.9821799 0.04490547 0.1825 1 0 0.9710366 -0.2389307 -1 -0.1879434 0.234673 0.9537326 0 0 0 0 1 0.9724072 0.06904543 0.2228386 1 0 0.9551992 -0.2959637 -1 -0.2332902 0.2877972 0.9288425 0 0 0 0 1 0.9600915 0.09897761 0.261587 1 0 0.9352878 -0.3538882 -1 -0.2796861 0.339765 0.8979618 0 0 0 0 1 0.9453882 0.1340003 0.2971281 1 0 0.9115852 -0.4111113 -1 -0.3259466 0.3886598 0.8618018 0 0 0 0 1 0.9286572 0.1729132 0.328172 1 0 0.8847058 -0.4661497 -1 -0.3709391 0.4328933 0.8215885 0 0 0 0 1 0.9104556 0.2141147 0.3538722 1 0 0.8555763 -0.5176768 -1 -0.4136069 0.4713217 0.7789642 0 0 0 0 1 0.8915175 0.2557371 0.3738919 1 0 0.8253933 -0.5645581 -1 -0.4529863 0.5033134 0.7358525 0 0 0 0 1 0.8727233 0.2957927 0.388408 1 0 0.7955672 -0.6058654 -1 -0.4882152 0.5287529 0.6943099 0 0 0 0 1 0.8550603 0.332307 0.3980502 1 0 0.7676533 -0.6408653 -1 -0.5185286 0.5479785 0.6563899 0 0 0 0 1 0.8395769 0.3634188 0.4037789 1 0 0.7432778 -0.6689829 -1 -0.5432408 0.5616626 0.6240388 0 0 0 0 1 0.8273312 0.3874339 0.4067161 1 0 0.7240622 -0.6897347 -1 -0.5617144 0.5706391 0.5990393 0 0 0 0 1 0.8193359 0.4028329 0.4079393 1 0 0.7115462 -0.7026393 -1 -0.5733138 0.5756976 0.5829953 0 0 0 0 1 0.8164964 0.4082482 0.4082486 1 7.75722e-8 0.707107 -0.7071065 -1 -0.5773504 0.57735 0.5773503 0 0 0 0 1 0.8190646 0.4033515 0.4079717 1 7.78161e-8 0.7111219 -0.7030687 -1 -0.5737014 0.5758587 0.5824547 0 0 0 0 1 0.8263245 0.3893851 0.4068995 1 7.85059e-8 0.7224849 -0.6913868 -1 -0.5631944 0.5713098 0.5970069 0 0 0 0 1 0.8375081 0.3675125 0.4043696 1 7.95684e-8 0.7400277 -0.6725764 -1 -0.5464249 0.5632883 0.6197791 0 0 0 0 1 0.8517552 0.3390183 0.3994742 1 8.0922e-8 0.7624427 -0.6470557 -1 -0.5239399 0.5511332 0.6494145 0 0 0 0 1 0.8681612 0.3053284 0.3912425 1 8.24806e-8 0.7883466 -0.6152314 -1 -0.4962822 0.5341201 0.6844119 0 0 0 0 1 0.8858209 0.2680094 0.3788038 1 8.41584e-8 0.8163394 -0.5775725 -1 -0.4640273 0.5116258 0.7231305 0 0 0 0 1 0.9038687 0.2287352 0.3615268 1 8.58731e-8 0.8450637 -0.5346656 -1 -0.42781 0.4832675 0.7638266 0 0 0 0 1 0.9215156 0.1892192 0.339124 1 8.75496e-8 0.8732626 -0.4872499 -1 -0.3883413 0.4490085 0.8047251 0 0 0 0 1 0.9380813 0.1511175 0.3117163 1 8.91235e-8 0.899834 -0.4362323 -1 -0.3464153 0.4092214 0.8441175 0 0 0 0 1 0.9530206 0.1159168 0.2798482 1 9.05428e-8 0.9238796 -0.3826832 -1 -0.3029055 0.3647051 0.8804763 0 0 0 0 1 0.965943 0.08482374 0.2444564 1 9.17705e-8 0.9447417 -0.3278156 -1 -0.2587547 0.3166512 0.9125667 0 0 0 0 1 0.9766233 0.05867312 0.2067956 1 9.27852e-8 0.9620277 -0.2729518 -1 -0.2149581 0.2665711 0.9395387 0 0 0 0 1 0.9850019 0.03787052 0.1683363 1 9.35812e-8 0.975616 -0.2194843 -1 -0.1725436 0.2161924 0.9609836 0 0 0 0 1 0.991176 0.02237916 0.1306496 1 9.41678e-8 0.9856446 -0.1688333 -1 -0.1325524 0.1673435 0.9769473 0 0 0 0 1 0.9953793 0.01175384 0.09529842 1 9.45671e-8 0.9924796 -0.1224106 -1 -0.09602053 0.121845 0.9878936 0 0 0 0 1 0.997952 0.005218936 0.06375288 1 9.48115e-8 0.996666 -0.08159051 -1 -0.06396614 0.08142342 0.9946249 0 0 0 0 1 0.9993011 0.001782816 0.03733916 1 9.49397e-8 0.998862 -0.04769476 -1 -0.0373817 0.04766143 0.9981638 0 0 0 0 1 0.9998515 3.78837e-4 0.01722835 1 9.4992e-8 0.9997582 -0.02198936 -1 -0.01723252 0.0219861 0.9996098 0 0 0 0 1 0.99999 2.53135e-5 0.004462156 1 9.50052e-8 0.9999838 -0.00569412 -1 -0.004462227 0.005694063 0.9999738 0 0 0 0 1 1 0 0 2 0 1 0 -1 0 0 1 0 0 0 0 1</float_array>
+          <technique_common>
+            <accessor source="#Armature_ArmatureAction_transform-output-array" count="40" stride="16">
+              <param name="TRANSFORM" type="float4x4"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Armature_ArmatureAction_transform-interpolation">
+          <Name_array id="Armature_ArmatureAction_transform-interpolation-array" count="40">LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR LINEAR</Name_array>
+          <technique_common>
+            <accessor source="#Armature_ArmatureAction_transform-interpolation-array" count="40" stride="1">
+              <param name="INTERPOLATION" type="name"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <sampler id="Armature_ArmatureAction_transform-sampler">
+          <input semantic="INPUT" source="#Armature_ArmatureAction_transform-input"/>
+          <input semantic="OUTPUT" source="#Armature_ArmatureAction_transform-output"/>
+          <input semantic="INTERPOLATION" source="#Armature_ArmatureAction_transform-interpolation"/>
+        </sampler>
+        <channel source="#Armature_ArmatureAction_transform-sampler" target="Armature_Bone/transform"/>
+      </animation>
+    </animation>
+  </library_animations>
+  <library_visual_scenes>
+    <visual_scene id="Scene" name="Scene">
+      <node id="Armature" name="Armature" type="NODE">
+        <matrix sid="transform">1 0 0 1 0 1 0 -1 0 0 1 0 0 0 0 1</matrix>
+        <node id="Armature_Bone" name="Bone" sid="Bone" type="JOINT">
+          <matrix sid="transform">0.7886751 -0.5773503 -0.211325 0 0.2113248 0.5773503 -0.7886751 0 0.5773503 0.5773503 0.5773502 0 0 0 0 1</matrix>
+          <extra>
+            <technique profile="blender">
+              <layer sid="layer" type="string">0</layer>
+              <roll sid="roll" type="float">-0.5235989</roll>
+              <tip_x sid="tip_x" type="float">-2</tip_x>
+              <tip_y sid="tip_y" type="float">2</tip_y>
+              <tip_z sid="tip_z" type="float">2</tip_z>
+            </technique>
+          </extra>
+        </node>
+        <node id="Cube" name="Cube" type="NODE">
+          <translate sid="location">0 0 0</translate>
+          <rotate sid="rotationZ">0 0 1 0</rotate>
+          <rotate sid="rotationY">0 1 0 0</rotate>
+          <rotate sid="rotationX">1 0 0 0</rotate>
+          <scale sid="scale">1 1 1</scale>
+          <instance_controller url="#Armature_Cube-skin">
+            <skeleton>#Armature_Bone</skeleton>
+            <bind_material>
+              <technique_common>
+                <instance_material symbol="Material-material" target="#Material-material">
+                  <bind_vertex_input semantic="UVMap" input_semantic="TEXCOORD" input_set="0"/>
+                </instance_material>
+              </technique_common>
+            </bind_material>
+          </instance_controller>
+        </node>
+      </node>
+    </visual_scene>
+  </library_visual_scenes>
+  <scene>
+    <instance_visual_scene url="#Scene"/>
+  </scene>
+</COLLADA>
diff --git a/test/models/invalid/readme.txt b/test/models/invalid/readme.txt
index 6ad8b4380..ad144ca36 100644
--- a/test/models/invalid/readme.txt
+++ b/test/models/invalid/readme.txt
@@ -18,6 +18,9 @@ crash.
 FILES
 *********************************************************
 
+box_nested_animation_4286.dae - This was reported as GH#4286.
+  The "count" parameter in "Cube-mesh-positions-array" is too small.
+
 OutOfMemory.off - the number of faces is invalid. There won't be
   enough memory so std::vector::reserve() will most likely fail.
   The exception should be caught in Importer.cpp.
diff --git a/test/unit/AbstractImportExportBase.cpp b/test/unit/AbstractImportExportBase.cpp
index 077a4d1f2..eaa72781c 100644
--- a/test/unit/AbstractImportExportBase.cpp
+++ b/test/unit/AbstractImportExportBase.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/test/unit/AssimpAPITest.cpp b/test/unit/AssimpAPITest.cpp
index b8739b039..e15217e70 100644
--- a/test/unit/AssimpAPITest.cpp
+++ b/test/unit/AssimpAPITest.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -60,3 +60,12 @@ TEST_F( AssimpAPITest, aiGetLastErrorTest ) {
     const char *error = aiGetErrorString();
     EXPECT_NE(nullptr, error);
 }
+
+TEST_F(AssimpAPITest, aiImportFileFromMemoryTest) {
+    const aiScene *scene_null_buffer = aiImportFileFromMemory(nullptr, 0u, 0u, nullptr);
+    EXPECT_EQ(nullptr, scene_null_buffer);
+
+    char buffer[1024] = {'\0'};
+    const aiScene *scene_null_size = aiImportFileFromMemory(buffer, 0u, 0u, nullptr);
+    EXPECT_EQ(nullptr, scene_null_size);
+}
diff --git a/test/unit/AssimpAPITest_aiMatrix3x3.cpp b/test/unit/AssimpAPITest_aiMatrix3x3.cpp
index 90976ba6e..54e9719ea 100644
--- a/test/unit/AssimpAPITest_aiMatrix3x3.cpp
+++ b/test/unit/AssimpAPITest_aiMatrix3x3.cpp
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -42,12 +40,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "UnitTestPCH.h"
 #include "MathTest.h"
+#include <array>
 
 using namespace Assimp;
 
 class AssimpAPITest_aiMatrix3x3 : public AssimpMathTest {
 protected:
-    virtual void SetUp() {
+    void SetUp() override {
         result_c = result_cpp = aiMatrix3x3();
     }
 
@@ -114,10 +113,19 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3InverseTest) {
     EXPECT_EQ(result_cpp, result_c);
 }
 
+inline void AI_EXPECT_REAL_EQ(ai_real val1, ai_real val2) {
+#ifdef ASSIMP_DOUBLE_PRECISION
+    EXPECT_DOUBLE_EQ((val1), (val2));
+#else
+    EXPECT_FLOAT_EQ((val1), (val2));
+#endif
+}
+
 TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3DeterminantTest) {
     result_c = result_cpp = random_mat3();
-    EXPECT_EQ(result_cpp.Determinant(),
-        aiMatrix3Determinant(&result_c));
+    const ai_real det_1 = result_cpp.Determinant();
+    const ai_real det_2 = aiMatrix3Determinant(&result_c);
+    AI_EXPECT_REAL_EQ(det_1, det_2);
 }
 
 TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3RotationZTest) {
@@ -149,3 +157,18 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromToTest) {
     aiMatrix3FromTo(&result_c, &from, &to);
     EXPECT_EQ(result_cpp, result_c);
 }
+
+TEST_F(AssimpAPITest_aiMatrix3x3, operatorTest) {
+    std::array<ai_real, 9> value = { 1, 2, 3, 4, 5, 6, 7, 8,9};
+    result_cpp = aiMatrix3x3( value[0], value[1], value[2], value[3],
+                              value[4], value[5], value[6], value[7],
+                              value[8]);
+    size_t idx=0;
+    for (unsigned int i = 0; i < 3; ++i) {
+       for (unsigned int j = 0; j < 3; ++j) {
+            ai_real curValue = result_cpp[i][j];
+            EXPECT_EQ(curValue, value[idx]);
+            idx++;
+       }
+    }
+}
diff --git a/test/unit/AssimpAPITest_aiMatrix4x4.cpp b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
index 9372bd9c4..403072182 100644
--- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -42,12 +40,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "UnitTestPCH.h"
 #include "MathTest.h"
+#include <assimp/MathFunctions.h>
+#include <array>
 
 using namespace Assimp;
 
 class AssimpAPITest_aiMatrix4x4 : public AssimpMathTest {
 protected:
-    virtual void SetUp() {
+    void SetUp() override {
         result_c = result_cpp = aiMatrix4x4();
     }
 
@@ -64,6 +64,12 @@ protected:
     aiMatrix4x4 result_c, result_cpp;
 };
 
+TEST_F(AssimpAPITest_aiMatrix4x4, isIdendityTest) {
+    aiMatrix4x4 m = aiMatrix4x4(1 + Math::getEpsilon<ai_real>(), 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+    const bool result = m.IsIdentity(Math::getEpsilon<ai_real>());
+    EXPECT_TRUE(result);
+}
+
 TEST_F(AssimpAPITest_aiMatrix4x4, aiIdentityMatrix4Test) {
     // Force a non-identity matrix.
     result_c = aiMatrix4x4(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
@@ -257,3 +263,20 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromToTest) {
     aiMatrix4FromTo(&result_c, &from, &to);
     EXPECT_EQ(result_cpp, result_c);
 }
+
+TEST_F(AssimpAPITest_aiMatrix4x4, operatorTest) {
+    std::array<ai_real, 16> value = { 1, 2, 3, 4, 5, 6, 7, 8,
+                        9, 10, 11, 12, 13, 14, 15, 16 };
+    result_cpp = aiMatrix4x4( value[0], value[1], value[2], value[3],
+                              value[4], value[5], value[6], value[7],
+                              value[8], value[9], value[10], value[11],
+                              value[12], value[13], value[14], value[15] );
+    size_t idx=0;
+    for (unsigned int i = 0; i < 4; ++i) {
+       for (unsigned int j = 0; j < 4; ++j) {
+            ai_real curValue = result_cpp[i][j];
+            EXPECT_EQ(curValue, value[idx]);
+            idx++;
+       }
+    }
+}
diff --git a/test/unit/AssimpAPITest_aiQuaternion.cpp b/test/unit/AssimpAPITest_aiQuaternion.cpp
index 68daeefec..b9766eb68 100644
--- a/test/unit/AssimpAPITest_aiQuaternion.cpp
+++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/test/unit/AssimpAPITest_aiVector2D.cpp b/test/unit/AssimpAPITest_aiVector2D.cpp
index 44bb34aec..14755415e 100644
--- a/test/unit/AssimpAPITest_aiVector2D.cpp
+++ b/test/unit/AssimpAPITest_aiVector2D.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/test/unit/AssimpAPITest_aiVector3D.cpp b/test/unit/AssimpAPITest_aiVector3D.cpp
index c7521163d..cbe230306 100644
--- a/test/unit/AssimpAPITest_aiVector3D.cpp
+++ b/test/unit/AssimpAPITest_aiVector3D.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/test/unit/Common/uiScene.cpp b/test/unit/Common/uiScene.cpp
index 509bf71b1..d0de43b0f 100644
--- a/test/unit/Common/uiScene.cpp
+++ b/test/unit/Common/uiScene.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/Common/utAssertHandler.cpp b/test/unit/Common/utAssertHandler.cpp
index 039ba8345..8f3cc42c7 100644
--- a/test/unit/Common/utAssertHandler.cpp
+++ b/test/unit/Common/utAssertHandler.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/Common/utBase64.cpp b/test/unit/Common/utBase64.cpp
index ec927b980..53dd864ec 100644
--- a/test/unit/Common/utBase64.cpp
+++ b/test/unit/Common/utBase64.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/Common/utBaseProcess.cpp b/test/unit/Common/utBaseProcess.cpp
index 359042315..a620c7970 100644
--- a/test/unit/Common/utBaseProcess.cpp
+++ b/test/unit/Common/utBaseProcess.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/Common/utHash.cpp b/test/unit/Common/utHash.cpp
index 97e2d91c1..668994baa 100644
--- a/test/unit/Common/utHash.cpp
+++ b/test/unit/Common/utHash.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/Common/utLineSplitter.cpp b/test/unit/Common/utLineSplitter.cpp
index 0a97f72d9..2320ea599 100644
--- a/test/unit/Common/utLineSplitter.cpp
+++ b/test/unit/Common/utLineSplitter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/test/unit/Common/utLogger.cpp b/test/unit/Common/utLogger.cpp
new file mode 100644
index 000000000..a72f2d48e
--- /dev/null
+++ b/test/unit/Common/utLogger.cpp
@@ -0,0 +1,52 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software 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 the assimp team, nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of the assimp team.
+
+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 "UnitTestPCH.h"
+#include <assimp/Importer.hpp>
+
+using namespace Assimp;
+class utLogger : public ::testing::Test {};
+
+TEST_F(utLogger, aiGetPredefinedLogStream_leak_test) {
+    aiLogStream stream1 = aiGetPredefinedLogStream(aiDefaultLogStream_STDOUT, nullptr);
+    aiLogStream stream2 = aiGetPredefinedLogStream(aiDefaultLogStream_STDOUT, nullptr);
+    ASSERT_EQ(stream1.callback, stream2.callback);
+}
diff --git a/test/unit/Common/utMaybe.cpp b/test/unit/Common/utMaybe.cpp
index 9de300290..b50205339 100644
--- a/test/unit/Common/utMaybe.cpp
+++ b/test/unit/Common/utMaybe.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/Common/utMesh.cpp b/test/unit/Common/utMesh.cpp
index 77a711394..a93b05d80 100644
--- a/test/unit/Common/utMesh.cpp
+++ b/test/unit/Common/utMesh.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/Common/utParsingUtils.cpp b/test/unit/Common/utParsingUtils.cpp
new file mode 100644
index 000000000..f7e36ffcb
--- /dev/null
+++ b/test/unit/Common/utParsingUtils.cpp
@@ -0,0 +1,66 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software 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 the assimp team, nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of the assimp team.
+
+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 "UnitTestPCH.h"
+#include <assimp/ParsingUtils.h>
+#include <assimp/fast_atof.h>
+#include <array>
+
+using namespace Assimp;
+
+class utParsingUtils : public ::testing::Test {};
+
+TEST_F(utParsingUtils, parseFloatsStringTest) {
+    const std::array<float, 16> floatArray = {
+        1.0f, 0.0f,         0.0f,        0.0f,
+        0.0f, 7.54979e-8f, -1.0f,        0.0f,
+        0.0f, 1.0f,         7.54979e-8f, 0.0f,
+        0.0f, 0.0f,         0.0f,        1.0f};
+    const std::string floatArrayAsStr = "1 0 0 0 0 7.54979e-8 -1 0 0 1 7.54979e-8 0 0 0 0 1";
+    const char *content = floatArrayAsStr.c_str();
+    const char *end = content + floatArrayAsStr.size();
+    for (float i : floatArray) {
+        float value = 0.0f;
+        SkipSpacesAndLineEnd(&content, end);
+        content = fast_atoreal_move(content, value);
+        EXPECT_FLOAT_EQ(value, i);
+    }
+}
diff --git a/test/unit/Common/utSpatialSort.cpp b/test/unit/Common/utSpatialSort.cpp
index 6b05ac65e..4cbe2aa91 100644
--- a/test/unit/Common/utSpatialSort.cpp
+++ b/test/unit/Common/utSpatialSort.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/Common/utStandardShapes.cpp b/test/unit/Common/utStandardShapes.cpp
index d7e6d21d7..d8597d3eb 100644
--- a/test/unit/Common/utStandardShapes.cpp
+++ b/test/unit/Common/utStandardShapes.cpp
@@ -1,7 +1,7 @@
 /*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 All rights reserved.
 Redistribution and use of this software in source and binary forms,
 with or without modification, are permitted provided that the
diff --git a/test/unit/Common/utXmlParser.cpp b/test/unit/Common/utXmlParser.cpp
index 2db78e30d..a06712767 100644
--- a/test/unit/Common/utXmlParser.cpp
+++ b/test/unit/Common/utXmlParser.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/Geometry/utGeometryUtils.cpp b/test/unit/Geometry/utGeometryUtils.cpp
index 2e764860d..292bcb5d9 100644
--- a/test/unit/Geometry/utGeometryUtils.cpp
+++ b/test/unit/Geometry/utGeometryUtils.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/ImportExport/MDL/MDLHL1TestFiles.h b/test/unit/ImportExport/MDL/MDLHL1TestFiles.h
index 3c0630f63..187a0e307 100644
--- a/test/unit/ImportExport/MDL/MDLHL1TestFiles.h
+++ b/test/unit/ImportExport/MDL/MDLHL1TestFiles.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/ImportExport/MDL/utMDLImporter_HL1_ImportSettings.cpp b/test/unit/ImportExport/MDL/utMDLImporter_HL1_ImportSettings.cpp
index d50c2b35a..17c2ac6a4 100644
--- a/test/unit/ImportExport/MDL/utMDLImporter_HL1_ImportSettings.cpp
+++ b/test/unit/ImportExport/MDL/utMDLImporter_HL1_ImportSettings.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/ImportExport/MDL/utMDLImporter_HL1_Materials.cpp b/test/unit/ImportExport/MDL/utMDLImporter_HL1_Materials.cpp
index f733893ca..140bbdf5d 100644
--- a/test/unit/ImportExport/MDL/utMDLImporter_HL1_Materials.cpp
+++ b/test/unit/ImportExport/MDL/utMDLImporter_HL1_Materials.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/ImportExport/MDL/utMDLImporter_HL1_Nodes.cpp b/test/unit/ImportExport/MDL/utMDLImporter_HL1_Nodes.cpp
index 49ae8a16c..f361a1005 100644
--- a/test/unit/ImportExport/MDL/utMDLImporter_HL1_Nodes.cpp
+++ b/test/unit/ImportExport/MDL/utMDLImporter_HL1_Nodes.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/ImportExport/Pbrt/utPbrtImportExport.cpp b/test/unit/ImportExport/Pbrt/utPbrtImportExport.cpp
new file mode 100644
index 000000000..c7807205a
--- /dev/null
+++ b/test/unit/ImportExport/Pbrt/utPbrtImportExport.cpp
@@ -0,0 +1,70 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2020, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software 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 the assimp team, nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of the assimp team.
+
+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 "AbstractImportExportBase.h"
+#include "UnitTestPCH.h"
+#include <assimp/postprocess.h>
+#include <assimp/scene.h>
+#include <assimp/Importer.hpp>
+#include <assimp/Exporter.hpp>
+
+using namespace Assimp;
+
+class utPbrtImportExport : public AbstractImportExportBase {
+public:
+#ifndef ASSIMP_BUILD_NO_EXPORT
+	bool exporterTest() override {
+		Assimp::Importer importer;
+		const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/OBJ/spider.obj", aiProcess_ValidateDataStructure);
+		EXPECT_NE(scene, nullptr );
+
+        ::Assimp::Exporter exporter;
+		return AI_SUCCESS == exporter.Export(scene, "pbrt", ASSIMP_TEST_MODELS_DIR "/OBJ/spider_out.pbrt");
+    }
+#endif
+};
+
+#ifndef ASSIMP_BUILD_NO_EXPORT
+
+TEST_F(utPbrtImportExport, exportTest_Success) {
+    EXPECT_TRUE(exporterTest());
+}
+
+#endif // ASSIMP_BUILD_NO_EXPORT
diff --git a/test/unit/ImportExport/RAW/utRAWImportExport.cpp b/test/unit/ImportExport/RAW/utRAWImportExport.cpp
index bdd7f8533..01734e076 100644
--- a/test/unit/ImportExport/RAW/utRAWImportExport.cpp
+++ b/test/unit/ImportExport/RAW/utRAWImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/ImportExport/Terragen/utTerragenImportExport.cpp b/test/unit/ImportExport/Terragen/utTerragenImportExport.cpp
index 8ec20e0c0..f6b85af90 100644
--- a/test/unit/ImportExport/Terragen/utTerragenImportExport.cpp
+++ b/test/unit/ImportExport/Terragen/utTerragenImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/ImportExport/utAssjsonImportExport.cpp b/test/unit/ImportExport/utAssjsonImportExport.cpp
index 3470874b5..bec77b79d 100644
--- a/test/unit/ImportExport/utAssjsonImportExport.cpp
+++ b/test/unit/ImportExport/utAssjsonImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -57,18 +57,29 @@ public:
         const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/OBJ/spider.obj", aiProcess_ValidateDataStructure);
 
         Exporter exporter;
-        aiReturn res = exporter.Export(scene, "assjson", "./spider_test.json");
+        const char *testFileName = "./spider_test.json";
+        aiReturn res = exporter.Export(scene, "assjson", testFileName);
         if (aiReturn_SUCCESS != res) {
             return false;
         }
 
         Assimp::ExportProperties exportProperties;
         exportProperties.SetPropertyBool("JSON_SKIP_WHITESPACES", true);
-        aiReturn resNoWhitespace = exporter.Export(scene, "assjson", "./spider_test_nowhitespace.json", 0u, &exportProperties);
+        const char *testNoWhitespaceFileName = "./spider_test_nowhitespace.json";
+        aiReturn resNoWhitespace = exporter.Export(scene, "assjson", testNoWhitespaceFileName, 0u, &exportProperties);
         if (aiReturn_SUCCESS != resNoWhitespace) {
             return false;
         }
 
+        // Cleanup, remove generated json
+        if (0 != std::remove(testFileName)) {
+            return false;
+        }
+
+        if (0 != std::remove(testNoWhitespaceFileName)) {
+            return false;
+        }
+
         return true;
     }
 };
diff --git a/test/unit/ImportExport/utCOBImportExport.cpp b/test/unit/ImportExport/utCOBImportExport.cpp
index 187f16ede..05a8e3e91 100644
--- a/test/unit/ImportExport/utCOBImportExport.cpp
+++ b/test/unit/ImportExport/utCOBImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -63,9 +63,7 @@ TEST(utCOBImporter, importDwarf) {
 TEST(utCOBImporter, importMoleculeASCII) {
     Assimp::Importer importer;
     const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/COB/molecule_ascii.cob", aiProcess_ValidateDataStructure);
-    // FIXME: this is wrong, it should succeed
-    // change to ASSERT_NE after it's been fixed
-    ASSERT_EQ(nullptr, scene);
+    ASSERT_NE(nullptr, scene);
 }
 
 TEST(utCOBImporter, importMolecule) {
diff --git a/test/unit/ImportExport/utExporter.cpp b/test/unit/ImportExport/utExporter.cpp
index 096a5c49d..607a38189 100644
--- a/test/unit/ImportExport/utExporter.cpp
+++ b/test/unit/ImportExport/utExporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/ImportExport/utMD2Importer.cpp b/test/unit/ImportExport/utMD2Importer.cpp
index 0fcf76bfc..6fd9428ff 100644
--- a/test/unit/ImportExport/utMD2Importer.cpp
+++ b/test/unit/ImportExport/utMD2Importer.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/ImportExport/utMD5Importer.cpp b/test/unit/ImportExport/utMD5Importer.cpp
index 082121937..4af416de9 100644
--- a/test/unit/ImportExport/utMD5Importer.cpp
+++ b/test/unit/ImportExport/utMD5Importer.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/ImportExport/utMDLImporter.cpp b/test/unit/ImportExport/utMDLImporter.cpp
index c8960601d..ec8480d99 100644
--- a/test/unit/ImportExport/utMDLImporter.cpp
+++ b/test/unit/ImportExport/utMDLImporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/ImportExport/utNFFImportExport.cpp b/test/unit/ImportExport/utNFFImportExport.cpp
index 621324a85..411b49982 100644
--- a/test/unit/ImportExport/utNFFImportExport.cpp
+++ b/test/unit/ImportExport/utNFFImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -50,7 +50,7 @@ class utNFFImportExport : public AbstractImportExportBase {
 public:
     virtual bool importerTest() {
         Assimp::Importer importer;
-        const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/NFF/NFF/ManyEarthsNotJustOne.nff", 0);
+        const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/NFF/ManyEarthsNotJustOne.nff", 0);
         return nullptr != scene;
     }
 };
diff --git a/test/unit/ImportExport/utOFFImportExport.cpp b/test/unit/ImportExport/utOFFImportExport.cpp
index 78ae4acc4..90e050c73 100644
--- a/test/unit/ImportExport/utOFFImportExport.cpp
+++ b/test/unit/ImportExport/utOFFImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/ImportExport/utOgreImportExport.cpp b/test/unit/ImportExport/utOgreImportExport.cpp
index 7312d6b58..37ff98c48 100644
--- a/test/unit/ImportExport/utOgreImportExport.cpp
+++ b/test/unit/ImportExport/utOgreImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/ImportExport/utQ3BSPFileImportExport.cpp b/test/unit/ImportExport/utQ3BSPFileImportExport.cpp
index f5694d2ee..728d934da 100644
--- a/test/unit/ImportExport/utQ3BSPFileImportExport.cpp
+++ b/test/unit/ImportExport/utQ3BSPFileImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/ImportExport/utXGLImportExport.cpp b/test/unit/ImportExport/utXGLImportExport.cpp
index 8199806cc..616e3be5d 100644
--- a/test/unit/ImportExport/utXGLImportExport.cpp
+++ b/test/unit/ImportExport/utXGLImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/Main.cpp b/test/unit/Main.cpp
index 573c26a96..48022be0c 100644
--- a/test/unit/Main.cpp
+++ b/test/unit/Main.cpp
@@ -1,7 +1,6 @@
 #include "../../include/assimp/DefaultLogger.hpp"
 #include "UnitTestPCH.h"
-#include <math.h>
-#include <time.h>
+#include <ctime>
 
 int main(int argc, char *argv[]) {
     ::testing::InitGoogleTest(&argc, argv);
@@ -14,12 +13,12 @@ int main(int argc, char *argv[]) {
     // ............................................................................
 
     // create a logger from both CPP
-    Assimp::DefaultLogger::create("AssimpLog_Cpp.txt", Assimp::Logger::VERBOSE,
+    Assimp::DefaultLogger::create("AssimpLog_Cpp.log", Assimp::Logger::VERBOSE,
             aiDefaultLogStream_STDOUT | aiDefaultLogStream_DEBUGGER | aiDefaultLogStream_FILE);
 
     // .. and C. They should smoothly work together
     aiEnableVerboseLogging(AI_TRUE);
-    aiLogStream logstream = aiGetPredefinedLogStream(aiDefaultLogStream_FILE, "AssimpLog_C.txt");
+    aiLogStream logstream = aiGetPredefinedLogStream(aiDefaultLogStream_FILE, "AssimpLog_C.log");
     aiAttachLogStream(&logstream);
 
     int result = RUN_ALL_TESTS();
diff --git a/test/unit/MathTest.cpp b/test/unit/MathTest.cpp
index 86a5d7e0f..1091036eb 100644
--- a/test/unit/MathTest.cpp
+++ b/test/unit/MathTest.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/MathTest.h b/test/unit/MathTest.h
index 08411e82f..896805f8b 100644
--- a/test/unit/MathTest.h
+++ b/test/unit/MathTest.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/test/unit/RandomNumberGeneration.h b/test/unit/RandomNumberGeneration.h
index 95ba5b43b..e5d1fd9b6 100644
--- a/test/unit/RandomNumberGeneration.h
+++ b/test/unit/RandomNumberGeneration.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/SceneDiffer.cpp b/test/unit/SceneDiffer.cpp
index a7132496a..d558e9805 100644
--- a/test/unit/SceneDiffer.cpp
+++ b/test/unit/SceneDiffer.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/test/unit/SceneDiffer.h b/test/unit/SceneDiffer.h
index 2ac429b76..2fd6c6376 100644
--- a/test/unit/SceneDiffer.h
+++ b/test/unit/SceneDiffer.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/test/unit/TestIOStream.h b/test/unit/TestIOStream.h
index 2f7280e2f..4cdc92ed1 100644
--- a/test/unit/TestIOStream.h
+++ b/test/unit/TestIOStream.h
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2020, assimp team
+Copyright (c) 2006-2025, assimp team
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -43,20 +43,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using namespace ::Assimp;
 
-class TestDefaultIOStream : public DefaultIOStream {
+class TestDefaultIOStream final : public DefaultIOStream {
 public:
-    TestDefaultIOStream()
-        : DefaultIOStream() {
-        // empty
-    }
-
-    TestDefaultIOStream( FILE* pFile, const std::string &strFilename )
-    : DefaultIOStream( pFile, strFilename ) {
-        // empty
-    }
-
-    virtual ~TestDefaultIOStream() {
-        // empty
-    }
+    TestDefaultIOStream() = default;
+    TestDefaultIOStream(FILE* pFile, const std::string &strFilename) : DefaultIOStream(pFile, strFilename) {}
+    ~TestDefaultIOStream() override = default;
 };
-
diff --git a/test/unit/TestIOSystem.h b/test/unit/TestIOSystem.h
index fe2455e52..60459ba5f 100644
--- a/test/unit/TestIOSystem.h
+++ b/test/unit/TestIOSystem.h
@@ -3,8 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/TestModelFactory.h b/test/unit/TestModelFactory.h
index c938af0fd..1dfda4f88 100644
--- a/test/unit/TestModelFactory.h
+++ b/test/unit/TestModelFactory.h
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -49,18 +47,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace Assimp {
 
-class TestModelFacttory {
+class TestModelFactory {
 public:
-    TestModelFacttory() {
-        // empty
-    }
+    TestModelFactory() = default;
 
-    ~TestModelFacttory() {
-        // empty
-    }
+    ~TestModelFactory() = default;
 
     static aiScene *createDefaultTestModel( float &opacity ) {
-        aiScene *scene( new aiScene );
+        auto *scene = new aiScene;
         scene->mNumMaterials = 1;
         scene->mMaterials = new aiMaterial*[scene->mNumMaterials];
         scene->mMaterials[ 0 ] = new aiMaterial;
@@ -89,7 +83,7 @@ public:
         scene->mMeshes[ 0 ]->mFaces[ 0 ].mIndices[ 1 ] = 1;
         scene->mMeshes[ 0 ]->mFaces[ 0 ].mIndices[ 2 ] = 2;
 
-        scene->mRootNode = new aiNode();
+        scene->mRootNode = new aiNode;
         scene->mRootNode->mNumMeshes = 1;
         scene->mRootNode->mMeshes = new unsigned int[1]{ 0 };
 
diff --git a/test/unit/Tools/TestTools.h b/test/unit/Tools/TestTools.h
new file mode 100644
index 000000000..7bf75802f
--- /dev/null
+++ b/test/unit/Tools/TestTools.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <gtest/gtest.h>
+#include <cstdio>
+#include <string>
+
+namespace Assimp::Unittest {
+
+    class TestTools final {
+    public:
+        TestTools() = default;
+        ~TestTools() = default;
+        static bool openFilestream(FILE **pFile, const char *filename, const char *mode);
+    };
+
+    inline bool TestTools::openFilestream(FILE **fs, const char *filename, const char *mode) {
+#if defined(_WIN32)
+        errno_t err{ 0 };
+        err = fopen_s(fs, filename, mode);
+        EXPECT_EQ(err, 0);
+#else
+        *fs = fopen(filename, mode);
+#endif
+        return fs != nullptr;
+    }
+
+} // namespace Assimp::Unittest
diff --git a/test/unit/UTLogStream.h b/test/unit/UTLogStream.h
index 6e5d75762..76171a706 100644
--- a/test/unit/UTLogStream.h
+++ b/test/unit/UTLogStream.h
@@ -3,8 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/UnitTestFileGenerator.h b/test/unit/UnitTestFileGenerator.h
index 2166c6939..ecfeceb07 100644
--- a/test/unit/UnitTestFileGenerator.h
+++ b/test/unit/UnitTestFileGenerator.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2020, assimp team
+Copyright (c) 2006-2024, assimp team
 
 All rights reserved.
 
@@ -39,38 +39,60 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 #pragma once
+#ifdef _WIN32
+#  ifndef _CRT_NONSTDC_NO_DEPRECATE
+#    define _CRT_NONSTDC_NO_DEPRECATE
+#  endif // _CRT_NONSTDC_NO_DEPRECATE
+#  ifndef _CRT_SECURE_NO_WARNINGS
+#     define _CRT_SECURE_NO_WARNINGS
+#  endif
+#endif
 
 #include <cstdio>
 #include <cstdlib>
 #include <gtest/gtest.h>
 
+#if defined(_MSC_VER) || defined(__MINGW64__) || defined(__MINGW32__)
+#   define TMP_PATH "./"
+#elif defined(__GNUC__) || defined(__clang__)
+#   define TMP_PATH "/var/tmp/"
+#endif
+
 #if defined(_MSC_VER)
+
 #include <io.h>
-#define TMP_PATH "./"
-inline FILE* MakeTmpFile(char* tmplate)
-{
-    auto pathtemplate = _mktemp(tmplate);
+inline FILE* MakeTmpFile(char* tmplate, size_t len, std::string &tmpName) {
+    size_t tmpLen = len + 1;
+    char *pathtemplate = new char[tmpLen];
+    strcpy_s(pathtemplate, tmpLen, tmplate);
+    int err_code = _mktemp_s(pathtemplate, tmpLen);
+    EXPECT_EQ(err_code, 0);
     EXPECT_NE(pathtemplate, nullptr);
-    if(pathtemplate == nullptr)
-    {
+    if(pathtemplate == nullptr) {
+        delete[] pathtemplate;
         return nullptr;
     }
-    auto* fs = std::fopen(pathtemplate, "w+");
+    errno_t err;
+    FILE *fs{nullptr};
+    err = fopen_s(&fs, pathtemplate, "w+");
+    EXPECT_EQ(0, err);
+    tmpName = pathtemplate;
     EXPECT_NE(fs, nullptr);
+    delete[] pathtemplate;
+
     return fs;
 }
 #elif defined(__GNUC__) || defined(__clang__)
-#define TMP_PATH "/tmp/"
-inline FILE* MakeTmpFile(char* tmplate)
-{
+inline FILE *MakeTmpFile(char *tmplate, size_t len, std::string &tmpName) {
     auto fd = mkstemp(tmplate);
     EXPECT_NE(-1, fd);
-    if(fd == -1)
-    {
+    if(fd == -1) {
         return nullptr;
     }
     auto fs = fdopen(fd, "w+");
     EXPECT_NE(nullptr, fs);
+    tmpName += tmplate;
+
     return fs;
 }
 #endif
diff --git a/test/unit/ut3DImportExport.cpp b/test/unit/ut3DImportExport.cpp
index 32b77ddf8..fe83bd8d9 100644
--- a/test/unit/ut3DImportExport.cpp
+++ b/test/unit/ut3DImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/ut3DSImportExport.cpp b/test/unit/ut3DSImportExport.cpp
index 7279227fc..6de78c0f3 100644
--- a/test/unit/ut3DSImportExport.cpp
+++ b/test/unit/ut3DSImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utACImportExport.cpp b/test/unit/utACImportExport.cpp
index c844603cf..c3c0e4506 100644
--- a/test/unit/utACImportExport.cpp
+++ b/test/unit/utACImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -99,6 +99,12 @@ TEST(utACImportExport, importSphereWithLight) {
     ASSERT_NE(nullptr, scene);
 }
 
+TEST(utACImportExport, importSphereWithLightACC) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/AC/SphereWithLight.acc", aiProcess_ValidateDataStructure);
+    ASSERT_NE(nullptr, scene);
+}
+
 TEST(utACImportExport, importSphereWithLightUTF16) {
     Assimp::Importer importer;
     const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/AC/SphereWithLight_UTF16LE.ac", aiProcess_ValidateDataStructure);
diff --git a/test/unit/utAMFImportExport.cpp b/test/unit/utAMFImportExport.cpp
index 7319320cf..4fca9bd14 100644
--- a/test/unit/utAMFImportExport.cpp
+++ b/test/unit/utAMFImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utASEImportExport.cpp b/test/unit/utASEImportExport.cpp
index af05a2fe5..690a1fe4e 100644
--- a/test/unit/utASEImportExport.cpp
+++ b/test/unit/utASEImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utAnim.cpp b/test/unit/utAnim.cpp
index 956810d74..4075ebb7d 100644
--- a/test/unit/utAnim.cpp
+++ b/test/unit/utAnim.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utArmaturePopulate.cpp b/test/unit/utArmaturePopulate.cpp
index 0acea7b50..493445e6f 100644
--- a/test/unit/utArmaturePopulate.cpp
+++ b/test/unit/utArmaturePopulate.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utAssbinImportExport.cpp b/test/unit/utAssbinImportExport.cpp
index 437a0a5fe..3b24b3225 100644
--- a/test/unit/utAssbinImportExport.cpp
+++ b/test/unit/utAssbinImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utB3DImportExport.cpp b/test/unit/utB3DImportExport.cpp
index 9672aa01b..b549d66e3 100644
--- a/test/unit/utB3DImportExport.cpp
+++ b/test/unit/utB3DImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -56,6 +56,6 @@ public:
     }
 };
 
-TEST_F(utB3DImportExport, importACFromFileTest) {
+TEST_F(utB3DImportExport, importB3DFromFileTest) {
     EXPECT_TRUE(importerTest());
 }
diff --git a/test/unit/utBVHImportExport.cpp b/test/unit/utBVHImportExport.cpp
index 5a0ff1e10..5d5b0c488 100644
--- a/test/unit/utBVHImportExport.cpp
+++ b/test/unit/utBVHImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utBatchLoader.cpp b/test/unit/utBatchLoader.cpp
index df6aa7995..2552802e2 100644
--- a/test/unit/utBatchLoader.cpp
+++ b/test/unit/utBatchLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/test/unit/utBlendImportAreaLight.cpp b/test/unit/utBlendImportAreaLight.cpp
index 470d80737..bc9e4af2b 100644
--- a/test/unit/utBlendImportAreaLight.cpp
+++ b/test/unit/utBlendImportAreaLight.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utBlendImportMaterials.cpp b/test/unit/utBlendImportMaterials.cpp
index 11499cc18..f38f8c039 100644
--- a/test/unit/utBlendImportMaterials.cpp
+++ b/test/unit/utBlendImportMaterials.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utBlenderImportExport.cpp b/test/unit/utBlenderImportExport.cpp
index c220b7daa..f6100a1fd 100644
--- a/test/unit/utBlenderImportExport.cpp
+++ b/test/unit/utBlenderImportExport.cpp
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utBlenderIntermediate.cpp b/test/unit/utBlenderIntermediate.cpp
index c2cc51e8d..e95193655 100644
--- a/test/unit/utBlenderIntermediate.cpp
+++ b/test/unit/utBlenderIntermediate.cpp
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utBlenderWork.cpp b/test/unit/utBlenderWork.cpp
index 977877250..3773251e6 100644
--- a/test/unit/utBlenderWork.cpp
+++ b/test/unit/utBlenderWork.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utCSMImportExport.cpp b/test/unit/utCSMImportExport.cpp
index 13bfd52bc..c4b4e5d4c 100644
--- a/test/unit/utCSMImportExport.cpp
+++ b/test/unit/utCSMImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utColladaExport.cpp b/test/unit/utColladaExport.cpp
index 0df9312f2..d7f450b7b 100644
--- a/test/unit/utColladaExport.cpp
+++ b/test/unit/utColladaExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -79,7 +79,7 @@ TEST_F(utColladaExport, testExportCamera) {
 
     EXPECT_EQ(AI_SUCCESS, ex->Export(pTest, "collada", file));
     const unsigned int origNumCams(pTest->mNumCameras);
-    //std::vector<float> origFOV;
+
     std::unique_ptr<float[]> origFOV(new float[origNumCams]);
     std::unique_ptr<float[]> orifClipPlaneNear(new float[origNumCams]);
     std::unique_ptr<float[]> orifClipPlaneFar(new float[origNumCams]);
@@ -114,6 +114,9 @@ TEST_F(utColladaExport, testExportCamera) {
         EXPECT_FLOAT_EQ(pos[i].y, read->mPosition.y);
         EXPECT_FLOAT_EQ(pos[i].z, read->mPosition.z);
     }
+
+    // Cleanup, delete the exported file
+    EXPECT_EQ(0, std::remove(file));
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -220,6 +223,9 @@ TEST_F(utColladaExport, testExportLight) {
         EXPECT_NEAR(orig->mAngleInnerCone, read->mAngleInnerCone, 0.001);
         EXPECT_NEAR(orig->mAngleOuterCone, read->mAngleOuterCone, 0.001);
     }
+
+    // Cleanup, delete the exported file
+    EXPECT_EQ(0, std::remove(file));
 }
 
 #endif // ASSIMP_BUILD_NO_EXPORT
diff --git a/test/unit/utColladaImportExport.cpp b/test/unit/utColladaImportExport.cpp
index e2842732e..a508be5c9 100644
--- a/test/unit/utColladaImportExport.cpp
+++ b/test/unit/utColladaImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -357,6 +357,14 @@ TEST_F(utColladaImportExport, exporterUniqueIdsTest) {
     ImportAsNames(outFileNamed, scene);
 }
 
+// This file is invalid, we just want to ensure that the importer is not crashing
+// This was reported as GH#4286. The "count" parameter in "Cube-mesh-positions-array" is too small.
+TEST_F(utColladaImportExport, parseInvalid4286) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/invalid/box_nested_animation_4286.dae", 0);
+    EXPECT_EQ(nullptr, scene);
+}
+
 #endif
 
 class utColladaZaeImportExport : public AbstractImportExportBase {
diff --git a/test/unit/utD3MFImportExport.cpp b/test/unit/utD3MFImportExport.cpp
index ed290e876..d924086a7 100644
--- a/test/unit/utD3MFImportExport.cpp
+++ b/test/unit/utD3MFImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -85,15 +85,15 @@ TEST_F(utD3MFImporterExporter, import3MFFromFileTest) {
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
 TEST_F(utD3MFImporterExporter, export3MFtoMemTest) {
-    EXPECT_TRUE(exporterTest());
+    //EXPECT_TRUE(exporterTest());
 }
 
 TEST_F(utD3MFImporterExporter, roundtrip3MFtoMemTest) {
-    EXPECT_TRUE(exporterTest());
+    /*EXPECT_TRUE(exporterTest());
 
     Assimp::Importer importer;
     const aiScene *scene = importer.ReadFile("test.3mf", 0);
-    EXPECT_NE(nullptr, scene);
+    EXPECT_NE(nullptr, scene));*/
 }
 
 #endif // ASSIMP_BUILD_NO_EXPORT
diff --git a/test/unit/utDXFImporterExporter.cpp b/test/unit/utDXFImporterExporter.cpp
index 53c5328e4..80852ae4e 100644
--- a/test/unit/utDXFImporterExporter.cpp
+++ b/test/unit/utDXFImporterExporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utDefaultIOStream.cpp b/test/unit/utDefaultIOStream.cpp
index 803c6f6f6..5eb48504d 100644
--- a/test/unit/utDefaultIOStream.cpp
+++ b/test/unit/utDefaultIOStream.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
@@ -41,6 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <gtest/gtest.h>
 #include "TestIOStream.h"
 #include "UnitTestFileGenerator.h"
+#include "Tools/TestTools.h"
 #include <cstdio>
 #include <cstdlib>
 #include <string>
@@ -60,8 +61,9 @@ TEST_F( utDefaultIOStream, FileSizeTest ) {
     const auto dataSize = sizeof(data);
     const auto dataCount = dataSize / sizeof(*data);
 
-    char fpath[] = { TMP_PATH"rndfp.XXXXXX" };
-    auto* fs = MakeTmpFile(fpath);
+    char fpath[] = { TMP_PATH"rndfp.XXXXXX\0" };
+    std::string tmpName;
+    auto *fs = MakeTmpFile(fpath, std::strlen(fpath), tmpName);
     ASSERT_NE(nullptr, fs);
     {
         auto written = std::fwrite(data, sizeof(*data), dataCount, fs );
@@ -71,13 +73,13 @@ TEST_F( utDefaultIOStream, FileSizeTest ) {
         ASSERT_EQ(vflush, 0);
 
 		std::fclose(fs);
-		fs = std::fopen(fpath, "r");
 
-		ASSERT_NE(nullptr, fs);
+        EXPECT_TRUE(Unittest::TestTools::openFilestream(&fs, tmpName.c_str(), "r"));
+        ASSERT_NE(nullptr, fs);
 
         TestDefaultIOStream myStream( fs, fpath);
         size_t size = myStream.FileSize();
         EXPECT_EQ( size, dataSize);
     }
-    remove(fpath);
+    remove(tmpName.c_str());
 }
diff --git a/test/unit/utExport.cpp b/test/unit/utExport.cpp
index cb7826bfc..d4cff6610 100644
--- a/test/unit/utExport.cpp
+++ b/test/unit/utExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utFBXImporterExporter.cpp b/test/unit/utFBXImporterExporter.cpp
index 9fa293aaf..6f4c8285f 100644
--- a/test/unit/utFBXImporterExporter.cpp
+++ b/test/unit/utFBXImporterExporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -311,6 +311,37 @@ TEST_F(utFBXImporterExporter, sceneMetadata) {
     }
 }
 
+TEST_F(utFBXImporterExporter, importCustomAxes) {
+    // see https://github.com/assimp/assimp/issues/5494
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/FBX/embedded_ascii/box.FBX", aiProcess_ValidateDataStructure);
+    EXPECT_NE(nullptr, scene);
+
+    // The ASCII box has customised the Up and Forward axes, verify that the RootNode transform has applied it
+    ASSERT_FALSE(scene->mRootNode->mTransformation.IsIdentity()) << "Did not apply the custom axis transform";
+
+    aiVector3D upVec{ 0, 0, 1 }; // Up is +Z
+    aiVector3D forwardVec{ 0, -1, 0 }; // Forward is -Y
+    aiVector3D rightVec{ 1, 0, 0 }; // Right is +X
+    aiMatrix4x4 mat(rightVec.x, rightVec.y, rightVec.z, 0.0f,
+            upVec.x, upVec.y, upVec.z, 0.0f,
+            forwardVec.x, forwardVec.y, forwardVec.z, 0.0f,
+            0.0f, 0.0f, 0.0f, 1.0f);
+
+    EXPECT_EQ(mat, scene->mRootNode->mTransformation);
+}
+
+TEST_F(utFBXImporterExporter, importIgnoreCustomAxes) {
+    // see https://github.com/assimp/assimp/issues/5494
+    Assimp::Importer importer;
+    importer.SetPropertyBool(AI_CONFIG_IMPORT_FBX_IGNORE_UP_DIRECTION, true);
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/FBX/embedded_ascii/box.FBX", aiProcess_ValidateDataStructure);
+    EXPECT_NE(nullptr, scene);
+
+    // Verify that the RootNode transform has NOT applied the custom axes
+    EXPECT_TRUE(scene->mRootNode->mTransformation.IsIdentity());
+}
+
 TEST_F(utFBXImporterExporter, importCubesWithOutOfRangeFloat) {
     Assimp::Importer importer;
     const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/FBX/cubes_with_outofrange_float.fbx", aiProcess_ValidateDataStructure);
diff --git a/test/unit/utFastAtof.cpp b/test/unit/utFastAtof.cpp
index cc25482d2..3c34565fb 100644
--- a/test/unit/utFastAtof.cpp
+++ b/test/unit/utFastAtof.cpp
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -122,6 +120,7 @@ protected:
         TEST_CASE(0e-19);
         TEST_CASE(400012);
         TEST_CASE(5.9e-76);
+        TEST_CASE(7.54979e-8);
         TEST_CASE_INF(inf);
         TEST_CASE_INF(inf);
         TEST_CASE_INF(infinity);
diff --git a/test/unit/utFindDegenerates.cpp b/test/unit/utFindDegenerates.cpp
index 5eadc032c..6325ed740 100644
--- a/test/unit/utFindDegenerates.cpp
+++ b/test/unit/utFindDegenerates.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -206,3 +206,38 @@ TEST_F(FindDegeneratesProcessTest, meshRemoval) {
     EXPECT_EQ(scene->mRootNode->mNumMeshes, 1u);
     EXPECT_EQ(scene->mRootNode->mMeshes[0], 0u);
 }
+
+TEST_F(FindDegeneratesProcessTest, invalidVertexIndex) {
+    mProcess->EnableAreaCheck(true);
+    mProcess->EnableInstantRemoval(true);
+    mProcess->ExecuteOnMesh(mMesh);
+
+    std::unique_ptr<aiScene> scene(new aiScene);
+    scene->mNumMeshes = 1;
+    scene->mMeshes = new aiMesh *[1];
+
+    std::unique_ptr<aiMesh> mesh(new aiMesh);
+    mesh->mNumVertices = 1;
+    mesh->mVertices = new aiVector3D[1];
+    mesh->mVertices[0] = aiVector3D{ 0.0f, 0.0f, 0.0f };
+    mesh->mNumFaces = 1;
+    mesh->mFaces = new aiFace[1];
+    mesh->mFaces[0].mNumIndices = 3;
+    mesh->mFaces[0].mIndices = new unsigned int[3];
+    mesh->mFaces[0].mIndices[0] = 0;
+    mesh->mFaces[0].mIndices[1] = 1;
+    mesh->mFaces[0].mIndices[2] = 99999;
+
+    scene->mMeshes[0] = mesh.release();
+
+    scene->mRootNode = new aiNode;
+    scene->mRootNode->mNumMeshes = 1;
+    scene->mRootNode->mMeshes = new unsigned int[1];
+    scene->mRootNode->mMeshes[0] = 0;
+
+    mProcess->Execute(scene.get());
+
+    EXPECT_EQ(scene->mNumMeshes, 1u);
+    EXPECT_EQ(scene->mRootNode->mNumMeshes, 1u);
+    EXPECT_EQ(scene->mRootNode->mMeshes[0], 0u);
+}
diff --git a/test/unit/utFindInvalidData.cpp b/test/unit/utFindInvalidData.cpp
index b995b951b..0c931787a 100644
--- a/test/unit/utFindInvalidData.cpp
+++ b/test/unit/utFindInvalidData.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utFixInfacingNormals.cpp b/test/unit/utFixInfacingNormals.cpp
index 8f75dd2f0..54d822822 100644
--- a/test/unit/utFixInfacingNormals.cpp
+++ b/test/unit/utFixInfacingNormals.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/test/unit/utGenBoundingBoxesProcess.cpp b/test/unit/utGenBoundingBoxesProcess.cpp
index c512e7f80..f7d130055 100644
--- a/test/unit/utGenBoundingBoxesProcess.cpp
+++ b/test/unit/utGenBoundingBoxesProcess.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utGenNormals.cpp b/test/unit/utGenNormals.cpp
index 92d477dbf..baa056cf9 100644
--- a/test/unit/utGenNormals.cpp
+++ b/test/unit/utGenNormals.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utHMPImportExport.cpp b/test/unit/utHMPImportExport.cpp
index 83e7ba09d..1ae18b7a9 100644
--- a/test/unit/utHMPImportExport.cpp
+++ b/test/unit/utHMPImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utIFCImportExport.cpp b/test/unit/utIFCImportExport.cpp
index 49c7446c7..30698dda6 100644
--- a/test/unit/utIFCImportExport.cpp
+++ b/test/unit/utIFCImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utIOStreamBuffer.cpp b/test/unit/utIOStreamBuffer.cpp
index 7565014c1..eb65062c2 100644
--- a/test/unit/utIOStreamBuffer.cpp
+++ b/test/unit/utIOStreamBuffer.cpp
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -44,6 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "UnitTestPCH.h"
 #include <assimp/IOStreamBuffer.h>
 #include "TestIOStream.h"
+#include "Tools/TestTools.h"
 #include "UnitTestFileGenerator.h"
 
 class IOStreamBufferTest : public ::testing::Test {
@@ -86,18 +85,21 @@ TEST_F( IOStreamBufferTest, open_close_Test ) {
     const auto dataCount = dataSize / sizeof(*data);
 
     char fname[]={ "octest.XXXXXX" };
-    auto* fs = MakeTmpFile(fname);
+    std::string tmpName;
+    auto* fs = MakeTmpFile(fname, std::strlen(fname), tmpName);
     ASSERT_NE(nullptr, fs);
 
-    auto written = std::fwrite( data, sizeof(*data), dataCount, fs );
+    auto written = std::fwrite(data, sizeof(*data), dataCount, fs);
     EXPECT_NE( 0U, written );
     auto flushResult = std::fflush( fs );
 	ASSERT_EQ(0, flushResult);
-	std::fclose( fs );
-	fs = std::fopen(fname, "r");
-	ASSERT_NE(nullptr, fs);
+	fclose(fs);
+
+    FILE *new_fs{ nullptr };
+    EXPECT_TRUE(Unittest::TestTools::openFilestream(&new_fs, tmpName.c_str(), "r"));
+    ASSERT_NE(nullptr, new_fs);
     {
-        TestDefaultIOStream myStream( fs, fname );
+        TestDefaultIOStream myStream(new_fs, fname);
 
         EXPECT_TRUE( myBuffer.open( &myStream ) );
         EXPECT_FALSE( myBuffer.open( &myStream ) );
@@ -111,8 +113,9 @@ TEST_F( IOStreamBufferTest, readlineTest ) {
     const auto dataSize = sizeof(data);
     const auto dataCount = dataSize / sizeof(*data);
 
-    char fname[]={ "readlinetest.XXXXXX" };
-    auto* fs = MakeTmpFile(fname);
+    char fname[]={ "readlinetest.XXXXXX\0" };
+    std::string tmpName;
+    auto* fs = MakeTmpFile(fname, std::strlen(fname), tmpName);
     ASSERT_NE(nullptr, fs);
 
     auto written = std::fwrite( data, sizeof(*data), dataCount, fs );
@@ -121,23 +124,25 @@ TEST_F( IOStreamBufferTest, readlineTest ) {
 	auto flushResult = std::fflush(fs);
 	ASSERT_EQ(0, flushResult);
 	std::fclose(fs);
-	fs = std::fopen(fname, "r");
-	ASSERT_NE(nullptr, fs);
+
+    FILE *new_fs{ nullptr };
+    EXPECT_TRUE(Unittest::TestTools::openFilestream(&new_fs, tmpName.c_str(), "r"));
+    ASSERT_NE(nullptr, new_fs);
 
     const auto tCacheSize = 26u;
 
-    IOStreamBuffer<char> myBuffer( tCacheSize );
-    EXPECT_EQ(tCacheSize, myBuffer.cacheSize() );
+    IOStreamBuffer<char> myBuffer(tCacheSize);
+    EXPECT_EQ(tCacheSize, myBuffer.cacheSize());
 
-    TestDefaultIOStream myStream( fs, fname );
+    TestDefaultIOStream myStream(new_fs, fname);
     auto size = myStream.FileSize();
     auto numBlocks = size / myBuffer.cacheSize();
     if ( size % myBuffer.cacheSize() > 0 ) {
         numBlocks++;
     }
-    EXPECT_TRUE( myBuffer.open( &myStream ) );
-    EXPECT_EQ( numBlocks, myBuffer.getNumBlocks() );
-    EXPECT_TRUE( myBuffer.close() );
+    EXPECT_TRUE(myBuffer.open(&myStream));
+    EXPECT_EQ(numBlocks, myBuffer.getNumBlocks() );
+    EXPECT_TRUE(myBuffer.close() );
 }
 
 TEST_F( IOStreamBufferTest, accessBlockIndexTest ) {
diff --git a/test/unit/utIOSystem.cpp b/test/unit/utIOSystem.cpp
index d69e645fe..0e537d11a 100644
--- a/test/unit/utIOSystem.cpp
+++ b/test/unit/utIOSystem.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/test/unit/utImporter.cpp b/test/unit/utImporter.cpp
index 5ecc45e34..ca482faa9 100644
--- a/test/unit/utImporter.cpp
+++ b/test/unit/utImporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -299,7 +299,7 @@ aiImporterDesc s_failingImporterDescription = {
 class FailingImporter : public Assimp::BaseImporter {
 public:
     virtual ~FailingImporter() = default;
-    virtual bool CanRead(const std::string &, Assimp::IOSystem *, bool) const override {
+    bool CanRead(const std::string &, Assimp::IOSystem *, bool) const override {
         return true;
     }
 
diff --git a/test/unit/utImproveCacheLocality.cpp b/test/unit/utImproveCacheLocality.cpp
index 0e97eb0c7..1349ecf1b 100644
--- a/test/unit/utImproveCacheLocality.cpp
+++ b/test/unit/utImproveCacheLocality.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utIssues.cpp b/test/unit/utIssues.cpp
index 546c36ad0..0bf9956b6 100644
--- a/test/unit/utIssues.cpp
+++ b/test/unit/utIssues.cpp
@@ -3,9 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
-
-
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -51,33 +49,35 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using namespace Assimp;
 
-class utIssues : public ::testing::Test {
-    // empty
-};
+class utIssues : public ::testing::Test {};
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
 TEST_F( utIssues, OpacityBugWhenExporting_727 ) {
     float opacity;
-    aiScene *scene( TestModelFacttory::createDefaultTestModel( opacity ) );
+    aiScene *scene = TestModelFactory::createDefaultTestModel(opacity);
     Assimp::Importer importer;
     Assimp::Exporter exporter;
 
-    std::string path = "dae";
     const aiExportFormatDesc *desc = exporter.GetExportFormatDescription( 0 );
-    EXPECT_NE( desc, nullptr );
+    ASSERT_NE( desc, nullptr );
+
+    std::string path = "dae";
     path.append(".");
     path.append( desc->fileExtension );
     EXPECT_EQ( AI_SUCCESS, exporter.Export( scene, desc->id, path ) );
     const aiScene *newScene( importer.ReadFile( path, aiProcess_ValidateDataStructure ) );
     ASSERT_NE( nullptr, newScene );
     float newOpacity;
-    if ( newScene->mNumMaterials > 0 ) {
-        std::cout << "Desc = " << desc->description << "\n";
+    if (newScene->mNumMaterials > 0 ) {
         EXPECT_EQ( AI_SUCCESS, newScene->mMaterials[ 0 ]->Get( AI_MATKEY_OPACITY, newOpacity ) );
         EXPECT_FLOAT_EQ( opacity, newOpacity );
     }
-    delete scene;
+    
+    TestModelFactory::releaseDefaultTestModel(&scene);
+
+    // Cleanup. Delete exported dae.dae file
+    EXPECT_EQ(0, std::remove(path.c_str()));
 }
 
 #endif // ASSIMP_BUILD_NO_EXPORT
diff --git a/test/unit/utJoinVertices.cpp b/test/unit/utJoinVertices.cpp
index b0700900c..a2fa3a253 100644
--- a/test/unit/utJoinVertices.cpp
+++ b/test/unit/utJoinVertices.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utLWOImportExport.cpp b/test/unit/utLWOImportExport.cpp
index 2ab1c4722..30e7a64ee 100644
--- a/test/unit/utLWOImportExport.cpp
+++ b/test/unit/utLWOImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utLWSImportExport.cpp b/test/unit/utLWSImportExport.cpp
index 730911ec2..73a6bc76b 100644
--- a/test/unit/utLWSImportExport.cpp
+++ b/test/unit/utLWSImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utLimitBoneWeights.cpp b/test/unit/utLimitBoneWeights.cpp
index bf3ea93f5..ffaaa53cb 100644
--- a/test/unit/utLimitBoneWeights.cpp
+++ b/test/unit/utLimitBoneWeights.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utMDCImportExport.cpp b/test/unit/utMDCImportExport.cpp
index 29b9ed56c..e72186a70 100644
--- a/test/unit/utMDCImportExport.cpp
+++ b/test/unit/utMDCImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utMaterialSystem.cpp b/test/unit/utMaterialSystem.cpp
index a84ae8333..fb664e419 100644
--- a/test/unit/utMaterialSystem.cpp
+++ b/test/unit/utMaterialSystem.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -263,6 +263,12 @@ TEST_F(MaterialSystemTest, testMaterialTextureTypeEnum) {
         case aiTextureType_SHEEN:
         case aiTextureType_CLEARCOAT:
         case aiTextureType_TRANSMISSION:
+        case aiTextureType_MAYA_BASE:
+        case aiTextureType_MAYA_SPECULAR:
+        case aiTextureType_MAYA_SPECULAR_COLOR:
+        case aiTextureType_MAYA_SPECULAR_ROUGHNESS:
+        case aiTextureType_ANISOTROPY:
+        case aiTextureType_GLTF_METALLIC_ROUGHNESS:
         case aiTextureType_UNKNOWN:
             if (i > maxTextureType)
                 maxTextureType = i;
diff --git a/test/unit/utMatrix3x3.cpp b/test/unit/utMatrix3x3.cpp
index ae722a811..d8b1b2757 100644
--- a/test/unit/utMatrix3x3.cpp
+++ b/test/unit/utMatrix3x3.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utMatrix4x4.cpp b/test/unit/utMatrix4x4.cpp
index 795971afc..7826d66db 100644
--- a/test/unit/utMatrix4x4.cpp
+++ b/test/unit/utMatrix4x4.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -90,3 +90,17 @@ TEST_F(utMatrix4x4, indexOperatorTest) {
     ai_real *a15 = a12 + 3;
     EXPECT_FLOAT_EQ(1.0, *a15);
 }
+
+TEST_F(utMatrix4x4, identityMatrixTest) {
+    aiMatrix4x4 m1 = aiMatrix4x4(1.f,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0, 1);
+    EXPECT_TRUE(m1.IsIdentity());
+    aiMatrix4x4 m2 = aiMatrix4x4(1.02f,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0, 1);
+    EXPECT_FALSE(m2.IsIdentity());
+    aiMatrix4x4 m3 = aiMatrix4x4(1.009f,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0, 1);
+    EXPECT_TRUE(m3.IsIdentity());
+
+    EXPECT_TRUE(m1.IsIdentity(1e-3f));
+    EXPECT_FALSE(m2.IsIdentity(1e-3f));
+    EXPECT_TRUE(m2.IsIdentity(1e-1f));
+    EXPECT_FALSE(m3.IsIdentity(1e-3f));
+}
diff --git a/test/unit/utMetadata.cpp b/test/unit/utMetadata.cpp
index 676404c3c..123bc5a1f 100644
--- a/test/unit/utMetadata.cpp
+++ b/test/unit/utMetadata.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -229,7 +229,7 @@ TEST_F( utMetadata, copy_test ) {
 
     // bool test
     {
-        bool v;
+        bool v = true;
         EXPECT_TRUE( copy.Get( "bool", v ) );
         EXPECT_EQ( bv, v );
     }
@@ -242,6 +242,22 @@ TEST_F( utMetadata, copy_test ) {
         EXPECT_EQ( i32v, v );
     }
 
+    // uint32_t test
+    {
+        uint32_t v = 0;
+        bool ok = copy.Get("uint32_t", v);
+        EXPECT_TRUE(ok);
+        EXPECT_EQ( ui32, v );
+    }
+
+    // int64_t test
+    {
+        int64_t v = -1;
+        bool ok = copy.Get("int64_t", v);
+        EXPECT_TRUE(ok);
+        EXPECT_EQ( i64, v );
+    }
+
     // uint64_t test
     {
         uint64_t v = 255;
@@ -264,14 +280,14 @@ TEST_F( utMetadata, copy_test ) {
         EXPECT_EQ( dv, v );
     }
 
-    // bool test
+    // string test
     {
         aiString v;
         EXPECT_TRUE( copy.Get( "aiString", v ) );
         EXPECT_EQ( strVal, v );
     }
 
-    // bool test
+    // vector test
     {
         aiVector3D v;
         EXPECT_TRUE( copy.Get( "aiVector3D", v ) );
diff --git a/test/unit/utObjImportExport.cpp b/test/unit/utObjImportExport.cpp
index ce778a950..16723df9b 100644
--- a/test/unit/utObjImportExport.cpp
+++ b/test/unit/utObjImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -525,3 +525,17 @@ TEST_F(utObjImportExport, import_with_line_continuations) {
     EXPECT_NEAR(vertices[2].y, 0.5f, threshold);
     EXPECT_NEAR(vertices[2].z, -0.5f, threshold);
 }
+
+TEST_F(utObjImportExport, issue2355_mtl_texture_prefix) {
+    ::Assimp::Importer importer;
+    const aiScene *const scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/OBJ/mtl_different_folder.obj", aiProcess_ValidateDataStructure);
+    EXPECT_NE(nullptr, scene);
+
+    EXPECT_EQ(scene->mNumMaterials, 2U);
+    const aiMaterial *const material = scene->mMaterials[1];
+
+    aiString texturePath;
+    material->GetTexture(aiTextureType_DIFFUSE, 0, &texturePath);
+    // The MTL file is in `folder`, the image path should have been prefixed with the folder
+    EXPECT_STREQ("folder/image.jpg", texturePath.C_Str());
+}
diff --git a/test/unit/utObjTools.cpp b/test/unit/utObjTools.cpp
index f2e5304ad..019d7da94 100644
--- a/test/unit/utObjTools.cpp
+++ b/test/unit/utObjTools.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utOpenGEXImportExport.cpp b/test/unit/utOpenGEXImportExport.cpp
index ed22a6fb7..dd3821ab0 100644
--- a/test/unit/utOpenGEXImportExport.cpp
+++ b/test/unit/utOpenGEXImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utPLYImportExport.cpp b/test/unit/utPLYImportExport.cpp
index 13c90fc47..630d38d35 100644
--- a/test/unit/utPLYImportExport.cpp
+++ b/test/unit/utPLYImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -89,7 +89,7 @@ TEST_F(utPLYImportExport, exportTest_Success) {
 
 #endif // ASSIMP_BUILD_NO_EXPORT
 
-//Test issue 1623, crash when loading two PLY files in a row
+// Test issue 1623, crash when loading two PLY files in a row
 TEST_F(utPLYImportExport, importerMultipleTest) {
     Assimp::Importer importer;
     const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/cube.ply", aiProcess_ValidateDataStructure);
@@ -109,7 +109,7 @@ TEST_F(utPLYImportExport, importPLYwithUV) {
 
     EXPECT_NE(nullptr, scene);
     EXPECT_NE(nullptr, scene->mMeshes[0]);
-    //This test model is using n-gons, so 6 faces instead of 12 tris
+    // This test model is using n-gons, so 6 faces instead of 12 tris
     EXPECT_EQ(6u, scene->mMeshes[0]->mNumFaces);
     EXPECT_EQ(aiPrimitiveType_POLYGON, scene->mMeshes[0]->mPrimitiveTypes);
     EXPECT_EQ(true, scene->mMeshes[0]->HasTextureCoords(0));
@@ -121,7 +121,7 @@ TEST_F(utPLYImportExport, importBinaryPLY) {
 
     EXPECT_NE(nullptr, scene);
     EXPECT_NE(nullptr, scene->mMeshes[0]);
-    //This test model is double sided, so 12 faces instead of 6
+    // This test model is double sided, so 12 faces instead of 6
     EXPECT_EQ(12u, scene->mMeshes[0]->mNumFaces);
 }
 
@@ -141,6 +141,27 @@ TEST_F(utPLYImportExport, importBinaryPLYWithRNNewline) {
     EXPECT_EQ(2u, scene->mMeshes[0]->mFaces[0].mIndices[2]);
 }
 
+// Tests of a PLY file gets read with \n as the fist character in the BINARY part
+TEST_F(utPLYImportExport, importBinaryPLYWithNewlineInBinary) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/cube_binary_starts_with_nl.ply", aiProcess_ValidateDataStructure);
+
+    ASSERT_NE(nullptr, scene);
+    ASSERT_NE(nullptr, scene->mMeshes[0]);
+    ASSERT_EQ(8u, scene->mMeshes[0]->mNumVertices);
+    // Make sure the first binary float was read correctly
+    ASSERT_FLOAT_EQ(5.967534f, scene->mMeshes[0]->mVertices[0][0]);
+    ASSERT_FLOAT_EQ(0, scene->mMeshes[0]->mVertices[0][1]);
+    ASSERT_FLOAT_EQ(0, scene->mMeshes[0]->mVertices[0][2]);
+
+    ASSERT_EQ(6u, scene->mMeshes[0]->mNumFaces);
+    // Also check if the indices were parsed correctly
+    ASSERT_EQ(4u, scene->mMeshes[0]->mFaces[0].mNumIndices);
+    EXPECT_EQ(0u, scene->mMeshes[0]->mFaces[0].mIndices[0]);
+    EXPECT_EQ(1u, scene->mMeshes[0]->mFaces[0].mIndices[1]);
+    EXPECT_EQ(2u, scene->mMeshes[0]->mFaces[0].mIndices[2]);
+}
+
 TEST_F(utPLYImportExport, vertexColorTest) {
     Assimp::Importer importer;
     const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/float-color.ply", aiProcess_ValidateDataStructure);
@@ -160,7 +181,7 @@ TEST_F(utPLYImportExport, vertexColorTest) {
 TEST_F(utPLYImportExport, pointcloudTest) {
     Assimp::Importer importer;
 
-    //Could not use aiProcess_ValidateDataStructure since it's missing faces.
+    // Could not use aiProcess_ValidateDataStructure since it's missing faces.
     const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/issue623.ply", 0);
     EXPECT_NE(nullptr, scene);
 
@@ -192,7 +213,7 @@ static const char *test_file =
 
 TEST_F(utPLYImportExport, parseErrorTest) {
     Assimp::Importer importer;
-    //Could not use aiProcess_ValidateDataStructure since it's missing faces.
+    // Could not use aiProcess_ValidateDataStructure since it's missing faces.
     const aiScene *scene = importer.ReadFileFromMemory(test_file, strlen(test_file), 0);
     EXPECT_NE(nullptr, scene);
 }
@@ -203,3 +224,61 @@ TEST_F(utPLYImportExport, parseInvalid) {
     const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/invalid/crash-30d6d0f7c529b3b66b4131700b7a4580cd7082df.ply", 0);
     EXPECT_EQ(nullptr, scene);
 }
+
+TEST_F(utPLYImportExport, payload_JVN42386607) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/PLY/payload_JVN42386607", 0);
+    EXPECT_EQ(nullptr, scene);
+}
+
+// Tests Issue #5729. Test, if properties defined multiple times. Unclear what to do, better to abort than to crash entirely
+TEST_F(utPLYImportExport, parseInvalidDoubleProperty) {
+    const char data[] = "ply\n"
+                        "format ascii 1.0\n"
+                        "element vertex 4\n"
+                        "property float x\n"
+                        "property float y\n"
+                        "property float z\n"
+                        "element vertex 8\n"
+                        "property float x\n"
+                        "property float y\n"
+                        "property float z\n"
+                        "end_header\n"
+                        "0.0 0.0 0.0 0.0 0.0 0.0\n"
+                        "0.0 0.0 1.0 0.0 0.0 1.0\n"
+                        "0.0 1.0 0.0 0.0 1.0 0.0\n"
+                        "0.0 0.0 1.0\n"
+                        "0.0 1.0 0.0 0.0 0.0 1.0\n"
+                        "0.0 1.0 1.0 0.0 1.0 1.0\n";
+
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFileFromMemory(data, sizeof(data), 0);
+    EXPECT_EQ(nullptr, scene);
+}
+
+// Tests Issue #5729. Test, if properties defined multiple times. Unclear what to do, better to abort than to crash entirely
+TEST_F(utPLYImportExport, parseInvalidDoubleCustomProperty) {
+    const char data[] = "ply\n"
+                        "format ascii 1.0\n"
+                        "element vertex 4\n"
+                        "property float x\n"
+                        "property float y\n"
+                        "property float z\n"
+                        "element name 8\n"
+                        "property float x\n"
+                        "element name 5\n"
+                        "property float x\n"
+                        "end_header\n"
+                        "0.0 0.0 0.0 100.0 10.0\n"
+                        "0.0 0.0 1.0 200.0 20.0\n"
+                        "0.0 1.0 0.0 300.0 30.0\n"
+                        "0.0 1.0 1.0 400.0 40.0\n"
+                        "0.0 0.0 0.0 500.0 50.0\n"
+                        "0.0 0.0 1.0 600.0 60.0\n"
+                        "0.0 1.0 0.0 700.0 70.0\n"
+                        "0.0 1.0 1.0 800.0 80.0\n";
+
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFileFromMemory(data, sizeof(data), 0);
+    EXPECT_EQ(nullptr, scene);
+}
diff --git a/test/unit/utPMXImporter.cpp b/test/unit/utPMXImporter.cpp
index 167fb234a..4610296fb 100644
--- a/test/unit/utPMXImporter.cpp
+++ b/test/unit/utPMXImporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utPretransformVertices.cpp b/test/unit/utPretransformVertices.cpp
index b3ae818bc..9c6a5bbeb 100644
--- a/test/unit/utPretransformVertices.cpp
+++ b/test/unit/utPretransformVertices.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -68,7 +68,7 @@ void AddNodes(unsigned int num, aiNode *father, unsigned int depth) {
     for (unsigned int i = 0; i < 5; ++i) {
         aiNode *nd = father->mChildren[i] = new aiNode();
 
-        nd->mName.length = snprintf(nd->mName.data, MAXLEN, "%i%i", depth, i);
+        nd->mName.length = snprintf(nd->mName.data, AI_MAXLEN, "%i%i", depth, i);
 
         // spawn two meshes
         nd->mMeshes = new unsigned int[nd->mNumMeshes = 2];
diff --git a/test/unit/utProfiler.cpp b/test/unit/utProfiler.cpp
index 6738d568e..07026ea56 100644
--- a/test/unit/utProfiler.cpp
+++ b/test/unit/utProfiler.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/test/unit/utQ3DImportExport.cpp b/test/unit/utQ3DImportExport.cpp
index e5396a680..d5a9e16a0 100644
--- a/test/unit/utQ3DImportExport.cpp
+++ b/test/unit/utQ3DImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utRemoveComments.cpp b/test/unit/utRemoveComments.cpp
index 44fb56ef8..82d9178d1 100644
--- a/test/unit/utRemoveComments.cpp
+++ b/test/unit/utRemoveComments.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utRemoveComponent.cpp b/test/unit/utRemoveComponent.cpp
index dd9e4f9cb..affff813f 100644
--- a/test/unit/utRemoveComponent.cpp
+++ b/test/unit/utRemoveComponent.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utRemoveRedundantMaterials.cpp b/test/unit/utRemoveRedundantMaterials.cpp
index 99b91aa5f..519181924 100644
--- a/test/unit/utRemoveRedundantMaterials.cpp
+++ b/test/unit/utRemoveRedundantMaterials.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utRemoveVCProcess.cpp b/test/unit/utRemoveVCProcess.cpp
index b555b0c86..548fd975a 100644
--- a/test/unit/utRemoveVCProcess.cpp
+++ b/test/unit/utRemoveVCProcess.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utSIBImporter.cpp b/test/unit/utSIBImporter.cpp
index b36e0883f..dc5c9180b 100644
--- a/test/unit/utSIBImporter.cpp
+++ b/test/unit/utSIBImporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utSMDImportExport.cpp b/test/unit/utSMDImportExport.cpp
index 08683d554..131070f41 100644
--- a/test/unit/utSMDImportExport.cpp
+++ b/test/unit/utSMDImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utSTLImportExport.cpp b/test/unit/utSTLImportExport.cpp
index 4bf374a1b..11f5d0969 100644
--- a/test/unit/utSTLImportExport.cpp
+++ b/test/unit/utSTLImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -106,10 +106,14 @@ TEST_F(utSTLImporterExporter, exporterTest) {
     const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/STL/Spider_ascii.stl", aiProcess_ValidateDataStructure);
 
     Assimp::Exporter mAiExporter;
-    mAiExporter.Export(scene, "stl", "spiderExport.stl");
+    const char *stlFileName = "spiderExport.stl";
+    mAiExporter.Export(scene, "stl", stlFileName);
 
-    const aiScene *scene2 = importer.ReadFile("spiderExport.stl", aiProcess_ValidateDataStructure);
+    const aiScene *scene2 = importer.ReadFile(stlFileName, aiProcess_ValidateDataStructure);
     EXPECT_NE(nullptr, scene2);
+
+    // Cleanup, delete the exported file
+    std::remove(stlFileName);
 }
 
 TEST_F(utSTLImporterExporter, test_export_pointclouds) {
@@ -162,8 +166,12 @@ TEST_F(utSTLImporterExporter, test_export_pointclouds) {
     Assimp::Exporter mAiExporter;
     ExportProperties *properties = new ExportProperties;
     properties->SetPropertyBool(AI_CONFIG_EXPORT_POINT_CLOUDS, true);
-    mAiExporter.Export(&scene, "stl", "testExport.stl", 0, properties);
 
+    const char *stlFileName = "testExport.stl";
+    mAiExporter.Export(&scene, "stl", stlFileName, 0, properties);
+
+    // Cleanup, delete the exported file
+    ::remove(stlFileName);
     delete properties;
 }
 
diff --git a/test/unit/utScaleProcess.cpp b/test/unit/utScaleProcess.cpp
index baa13ab52..5a1197998 100644
--- a/test/unit/utScaleProcess.cpp
+++ b/test/unit/utScaleProcess.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utSceneCombiner.cpp b/test/unit/utSceneCombiner.cpp
index d837e4dce..be218c468 100644
--- a/test/unit/utSceneCombiner.cpp
+++ b/test/unit/utSceneCombiner.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utScenePreprocessor.cpp b/test/unit/utScenePreprocessor.cpp
index 45d8a36ee..999b0c75c 100644
--- a/test/unit/utScenePreprocessor.cpp
+++ b/test/unit/utScenePreprocessor.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utSharedPPData.cpp b/test/unit/utSharedPPData.cpp
index 16ee9c75f..5959c23c6 100644
--- a/test/unit/utSharedPPData.cpp
+++ b/test/unit/utSharedPPData.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/test/unit/utSimd.cpp b/test/unit/utSimd.cpp
index 720d657b6..d60258925 100644
--- a/test/unit/utSimd.cpp
+++ b/test/unit/utSimd.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utSortByPType.cpp b/test/unit/utSortByPType.cpp
index 5fd360fcc..2c1ceca33 100644
--- a/test/unit/utSortByPType.cpp
+++ b/test/unit/utSortByPType.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -43,6 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "Common/ScenePreprocessor.h"
 #include "PostProcessing/SortByPTypeProcess.h"
 #include <assimp/scene.h>
+#include <assimp/postprocess.h>
 
 using namespace std;
 using namespace Assimp;
@@ -202,3 +203,9 @@ TEST_F(SortByPTypeProcessTest, SortByPTypeStep) {
         }
     }
 }
+
+TEST_F(SortByPTypeProcessTest, issue389327770Test) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/fuzzer_data/clusterfuzz-testcase-minimized-assimp_fuzzer-4751812606885888", aiProcessPreset_TargetRealtime_Fast);
+    EXPECT_NE(nullptr, scene);
+}
diff --git a/test/unit/utSplitLargeMeshes.cpp b/test/unit/utSplitLargeMeshes.cpp
index 160831baa..85b3a464b 100644
--- a/test/unit/utSplitLargeMeshes.cpp
+++ b/test/unit/utSplitLargeMeshes.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utStringUtils.cpp b/test/unit/utStringUtils.cpp
index 9c5ab31f5..d6f4ca6ba 100644
--- a/test/unit/utStringUtils.cpp
+++ b/test/unit/utStringUtils.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utTargetAnimation.cpp b/test/unit/utTargetAnimation.cpp
index 9cbb45309..a67495110 100644
--- a/test/unit/utTargetAnimation.cpp
+++ b/test/unit/utTargetAnimation.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utTextureTransform.cpp b/test/unit/utTextureTransform.cpp
index 9cbb45309..a67495110 100644
--- a/test/unit/utTextureTransform.cpp
+++ b/test/unit/utTextureTransform.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utTriangulate.cpp b/test/unit/utTriangulate.cpp
index f51daea63..75821b5b8 100644
--- a/test/unit/utTriangulate.cpp
+++ b/test/unit/utTriangulate.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utTypes.cpp b/test/unit/utTypes.cpp
index 33d2b4f76..b5c91c2e9 100644
--- a/test/unit/utTypes.cpp
+++ b/test/unit/utTypes.cpp
@@ -1,11 +1,8 @@
 /*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
----------------------------------------------------------------------------
-
-Copyright (c) 2006-2022, assimp team
-
 
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utUSDImport.cpp b/test/unit/utUSDImport.cpp
new file mode 100644
index 000000000..040e5d3aa
--- /dev/null
+++ b/test/unit/utUSDImport.cpp
@@ -0,0 +1,90 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+                          All rights reserved.
+
+                          Redistribution and use of this software 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 the assimp team, nor the names of its
+                contributors may be used to endorse or promote products
+                   derived from this software without specific prior
+                   written permission of the assimp team.
+
+                   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 "UnitTestPCH.h"
+
+#include "AbstractImportExportBase.h"
+#include <assimp/postprocess.h>
+#include <assimp/scene.h>
+#include <assimp/Exporter.hpp>
+#include <assimp/Importer.hpp>
+
+using namespace ::Assimp;
+
+class utUSDImport : public AbstractImportExportBase {
+};
+
+TEST_F(utUSDImport, meshTest) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/../models-nonbsd/USD/usdc/suzanne.usdc", aiProcess_ValidateDataStructure);
+    EXPECT_NE(nullptr, scene);
+    EXPECT_EQ(1u, scene->mNumMeshes);
+    EXPECT_NE(nullptr, scene->mMeshes[0]);
+    EXPECT_EQ(1968u, scene->mMeshes[0]->mNumVertices); // Note: suzanne is authored with only 507 vertices, but TinyUSDZ rebuilds the vertex array. see https://github.com/lighttransport/tinyusdz/blob/36f2aabb256b360365989c01a52f839a57dfe2a6/src/tydra/render-data.cc#L2673-L2690 
+    EXPECT_EQ(968u, scene->mMeshes[0]->mNumFaces);
+}
+
+TEST_F(utUSDImport, skinnedMeshTest) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/../models-nonbsd/USD/usda/simple-skin-test.usda", aiProcess_ValidateDataStructure);
+    EXPECT_NE(nullptr, scene);
+    EXPECT_TRUE(scene->HasMeshes());
+
+    const aiMesh *mesh = scene->mMeshes[0];
+    EXPECT_EQ(2, mesh->mNumBones);
+
+    // Check bone names and make sure scene has nodes of the same name
+    EXPECT_EQ(mesh->mBones[0]->mName, aiString("Bone"));
+    EXPECT_EQ(mesh->mBones[1]->mName, aiString("Bone/Bone_001"));
+
+    EXPECT_NE(nullptr, scene->mRootNode->FindNode("Bone"));
+    EXPECT_NE(nullptr, scene->mRootNode->FindNode("Bone/Bone_001"));
+}
+
+TEST_F(utUSDImport, singleAnimationTest) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/../models-nonbsd/USD/usda/simple-skin-animation-test.usda", aiProcess_ValidateDataStructure);
+    EXPECT_NE(nullptr, scene);
+    EXPECT_TRUE(scene->HasAnimations());
+    EXPECT_EQ(2, scene->mAnimations[0]->mNumChannels);  // 2 bones. 1 channel for each bone
+}
+
+// Note: Add multi-animation test once supported by USD
+// See https://github.com/lighttransport/tinyusdz/issues/122 for details.
diff --git a/test/unit/utVector3.cpp b/test/unit/utVector3.cpp
index 2602c287c..bdf41c6cf 100644
--- a/test/unit/utVector3.cpp
+++ b/test/unit/utVector3.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
index e4378e9f6..078bfd7be 100644
--- a/test/unit/utVersion.cpp
+++ b/test/unit/utVersion.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2023, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -48,20 +48,20 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
     EXPECT_NE( lv, nullptr );
     std::string text( lv );
 
-    size_t pos = text.find(std::string("2023"));
+    size_t pos = text.find(std::string("2025"));
     EXPECT_NE(pos, std::string::npos);
 }
 
-TEST_F( utVersion, aiGetVersionMinorTest ) {
-    EXPECT_EQ(aiGetVersionMinor(), 3U);
+TEST_F( utVersion, aiGetVersionMajorTest ) {
+    EXPECT_EQ( aiGetVersionMajor(), 6U );
 }
 
-TEST_F( utVersion, aiGetVersionMajorTest ) {
-    EXPECT_EQ( aiGetVersionMajor(), 5U );
+TEST_F( utVersion, aiGetVersionMinorTest ) {
+    EXPECT_EQ(aiGetVersionMinor(), 0U);
 }
 
 TEST_F( utVersion, aiGetVersionPatchTest ) {
-    EXPECT_EQ(aiGetVersionPatch(), 0U );
+    EXPECT_EQ(aiGetVersionPatch(), 2U );
 }
 
 TEST_F( utVersion, aiGetCompileFlagsTest ) {
@@ -69,7 +69,7 @@ TEST_F( utVersion, aiGetCompileFlagsTest ) {
 }
 
 TEST_F( utVersion, aiGetVersionRevisionTest ) {
-    EXPECT_NE( aiGetVersionRevision(), 0U );
+    EXPECT_NO_THROW(aiGetVersionRevision());
 }
 
 TEST_F( utVersion, aiGetBranchNameTest ) {
diff --git a/test/unit/utVertexTriangleAdjacency.cpp b/test/unit/utVertexTriangleAdjacency.cpp
index 8c8d9db04..341241e07 100644
--- a/test/unit/utVertexTriangleAdjacency.cpp
+++ b/test/unit/utVertexTriangleAdjacency.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utX3DImportExport.cpp b/test/unit/utX3DImportExport.cpp
index f2df81ac2..e60e335ce 100644
--- a/test/unit/utX3DImportExport.cpp
+++ b/test/unit/utX3DImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/postprocess.h>
 #include <assimp/Importer.hpp>
+#include <assimp/scene.h>
 
 using namespace Assimp;
 
@@ -59,3 +60,38 @@ public:
 TEST_F(utX3DImportExport, importX3DFromFileTest) {
     EXPECT_TRUE(importerTest());
 }
+
+TEST_F(utX3DImportExport, importX3DIndexedLineSet) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/X3D/IndexedLineSet.x3d", aiProcess_ValidateDataStructure);
+    ASSERT_NE(nullptr, scene);
+    ASSERT_EQ(scene->mNumMeshes, 1u);
+    ASSERT_EQ(scene->mMeshes[0]->mNumFaces, 4u);
+    ASSERT_EQ(scene->mMeshes[0]->mPrimitiveTypes, aiPrimitiveType_LINE);
+    ASSERT_EQ(scene->mMeshes[0]->mNumVertices, 4u);
+    for (unsigned int i = 0; i < scene->mMeshes[0]->mNumFaces; i++) {
+        ASSERT_EQ(scene->mMeshes[0]->mFaces[i].mNumIndices, 2u);
+    }
+}
+
+TEST_F(utX3DImportExport, importX3DComputerKeyboard) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/X3D/ComputerKeyboard.x3d", aiProcess_ValidateDataStructure);
+    ASSERT_NE(nullptr, scene);
+    // TODO: CHANGE INCORRECT VALUE WHEN IMPORTER FIXED
+    //   As noted in assimp issue 4992, X3D importer was severely broken with 5 Oct 2020 commit 3b9d4cf.
+    //   ComputerKeyboard.x3d should have 100 meshes but broken importer only has 4
+    ASSERT_EQ(4u, scene->mNumMeshes);  // Incorrect value from currently broken importer
+    ASSERT_NE(100u, scene->mNumMeshes); // Correct value, to be restored when importer fixed
+}
+
+TEST_F(utX3DImportExport, importX3DChevyTahoe) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_NONBSD_DIR "/X3D/Chevy/ChevyTahoe.x3d", aiProcess_ValidateDataStructure);
+    ASSERT_NE(nullptr, scene);
+    // TODO: CHANGE INCORRECT VALUE WHEN IMPORTER FIXED
+    //   As noted in assimp issue 4992, X3D importer was severely broken with 5 Oct 2020 commit 3b9d4cf.
+    //   ChevyTahoe.x3d should have 20 meshes but broken importer only has 19
+    ASSERT_EQ(19u, scene->mNumMeshes); // Incorrect value from currently broken importer
+    ASSERT_NE(20u, scene->mNumMeshes); // Correct value, to be restored when importer fixed
+}
diff --git a/test/unit/utXImporterExporter.cpp b/test/unit/utXImporterExporter.cpp
index 4d247cc6f..fe25199c1 100644
--- a/test/unit/utXImporterExporter.cpp
+++ b/test/unit/utXImporterExporter.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/test/unit/utglTF2ImportExport.cpp b/test/unit/utglTF2ImportExport.cpp
index 6778e2679..87f059cf6 100644
--- a/test/unit/utglTF2ImportExport.cpp
+++ b/test/unit/utglTF2ImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "AbstractImportExportBase.h"
 #include "UnitTestPCH.h"
-
+#include "Tools/TestTools.h"
 #include <assimp/commonMetaData.h>
 #include <assimp/postprocess.h>
 #include <assimp/config.h>
@@ -472,7 +472,8 @@ TEST_F(utglTF2ImportExport, importglTF2PrimitiveModeTrianglesFan) {
 std::vector<char> ReadFile(const char *name) {
     std::vector<char> ret;
 
-    FILE *p = ::fopen(name, "r");
+    FILE *p{ nullptr };
+    EXPECT_TRUE(Unittest::TestTools::openFilestream(&p, name, "r"));
     if (nullptr == p) {
         return ret;
     }
@@ -896,6 +897,27 @@ TEST_F(utglTF2ImportExport, import_dracoEncoded) {
         ASSERT_TRUE(scene->mMetaData->Get(AI_METADATA_SOURCE_GENERATOR, generator));
         ASSERT_EQ(strcmp(generator.C_Str(), "COLLADA2GLTF"), 0);
     }
+#endif
+    const aiScene *robotScene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/glTF2/draco/robot.glb",
+        aiProcess_ValidateDataStructure);
+#ifndef ASSIMP_ENABLE_DRACO
+    // No draco support, scene should not load
+    ASSERT_EQ(robotScene, nullptr);
+#else
+    ASSERT_NE(robotScene, nullptr);
+    ASSERT_NE(robotScene->mMetaData, nullptr);
+    {
+        ASSERT_TRUE(robotScene->mMetaData->HasKey(AI_METADATA_SOURCE_FORMAT));
+        aiString format;
+        ASSERT_TRUE(robotScene->mMetaData->Get(AI_METADATA_SOURCE_FORMAT, format));
+        ASSERT_EQ(strcmp(format.C_Str(), "glTF2 Importer"), 0);
+    }
+    {
+        ASSERT_TRUE(robotScene->mMetaData->HasKey(AI_METADATA_SOURCE_FORMAT_VERSION));
+        aiString version;
+        ASSERT_TRUE(robotScene->mMetaData->Get(AI_METADATA_SOURCE_FORMAT_VERSION, version));
+        ASSERT_EQ(strcmp(version.C_Str(), "2.0"), 0);
+    }
 #endif
 }
 
@@ -912,8 +934,8 @@ TEST_F(utglTF2ImportExport, wrongTypes) {
         TUPLE("/glTF2/wrongTypes/badString.gltf", "string", "name", "scenes[0]"),
         TUPLE("/glTF2/wrongTypes/badUint.gltf", "uint", "index", "materials[0]"),
         TUPLE("/glTF2/wrongTypes/badNumber.gltf", "number", "scale", "materials[0]"),
-        TUPLE("/glTF2/wrongTypes/badObject.gltf", "object", "pbrMetallicRoughness", "materials[0]"),
-        TUPLE("/glTF2/wrongTypes/badExtension.gltf", "object", "KHR_texture_transform", "materials[0]")
+        //TUPLE("/glTF2/wrongTypes/badObject.gltf", "object", "pbrMetallicRoughness", "materials[0]"),
+        //TUPLE("/glTF2/wrongTypes/badExtension.gltf", "object", "KHR_texture_transform", "materials[0]")
 #undef TUPLE
     };
     for (const auto& tuple : wrongTypes)
@@ -931,6 +953,28 @@ TEST_F(utglTF2ImportExport, wrongTypes) {
     }
 }
 
+TEST_F(utglTF2ImportExport, wrongObject) {
+    // Deliberately broken version of the BoxTextured.gltf asset.
+    using tup_T = std::tuple<std::string, std::string, std::string, std::string>;
+    std::vector<tup_T> wrongTypes = {
+#ifdef __cpp_lib_constexpr_tuple
+#define TUPLE(x, y, z, w) \
+    { x, y, z, w }
+#else
+#define TUPLE(x, y, z, w) tup_T(x, y, z, w)
+#endif
+    TUPLE("/glTF2/wrongTypes/badObject.gltf", "object", "pbrMetallicRoughness", "materials[0]"),
+    TUPLE("/glTF2/wrongTypes/badExtension.gltf", "object", "KHR_texture_transform", "materials[0]")
+#undef TUPLE
+    };
+    for (const auto &tuple : wrongTypes) {
+        const auto &file = std::get<0>(tuple);
+        Assimp::Importer importer;
+        const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR + file, aiProcess_ValidateDataStructure);
+        ASSERT_NE(scene, nullptr);
+    }
+}
+
 namespace {
     /// This class provides a fake schema to the GLTF importer.
     /// It just checks that the file has a top-level "scene" property which is an integer.
@@ -988,3 +1032,27 @@ TEST_F(utglTF2ImportExport, noSchemaFound) {
     EXPECT_NE(scene, nullptr);
     EXPECT_STREQ(importer.GetErrorString(), "");
 }
+
+// ------------------------------------------------------------------------------------------------
+TEST_F(utglTF2ImportExport, testSetIdentityMatrixEpsilon) {
+//    Assimp::Exporter exporter;
+    Assimp::ExportProperties properties = Assimp::ExportProperties();
+    EXPECT_EQ(AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON_DEFAULT,
+            properties.GetPropertyFloat("CHECK_IDENTITY_MATRIX_EPSILON",
+                    AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON_DEFAULT));
+    aiMatrix4x4 m;
+    m = aiMatrix4x4(1.02f, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+    EXPECT_FALSE(m.IsIdentity());
+    m = aiMatrix4x4(1.001f, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+    EXPECT_TRUE(m.IsIdentity());
+
+    bool b = properties.SetPropertyFloat("CHECK_IDENTITY_MATRIX_EPSILON", 0.0001f);
+    EXPECT_TRUE(!b);
+    ai_real epsilon = properties.GetPropertyFloat("CHECK_IDENTITY_MATRIX_EPSILON", 0.01f);
+    EXPECT_EQ(0.0001f, epsilon);
+    m = aiMatrix4x4(1.0002f, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+    EXPECT_FALSE(m.IsIdentity(epsilon));
+    m = aiMatrix4x4(1.00009f, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+    EXPECT_TRUE(m.IsIdentity(epsilon));
+}
+
diff --git a/test/unit/utglTFImportExport.cpp b/test/unit/utglTFImportExport.cpp
index cb20c1519..71dc36c3e 100644
--- a/test/unit/utglTFImportExport.cpp
+++ b/test/unit/utglTFImportExport.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_cmd/CMakeLists.txt b/tools/assimp_cmd/CMakeLists.txt
index 5b80ee77b..3d94c90a6 100644
--- a/tools/assimp_cmd/CMakeLists.txt
+++ b/tools/assimp_cmd/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Open Asset Import Library (assimp)
 # ----------------------------------------------------------------------
 #
-# Copyright (c) 2006-2022, assimp team
+# Copyright (c) 2006-2025, assimp team
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms,
diff --git a/tools/assimp_cmd/CompareDump.cpp b/tools/assimp_cmd/CompareDump.cpp
index 3cf22bb28..42ae0d6df 100644
--- a/tools/assimp_cmd/CompareDump.cpp
+++ b/tools/assimp_cmd/CompareDump.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 
 
diff --git a/tools/assimp_cmd/Export.cpp b/tools/assimp_cmd/Export.cpp
index b78db157b..d5014ec3c 100644
--- a/tools/assimp_cmd/Export.cpp
+++ b/tools/assimp_cmd/Export.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_cmd/ImageExtractor.cpp b/tools/assimp_cmd/ImageExtractor.cpp
index 49edf9790..29db11ae5 100644
--- a/tools/assimp_cmd/ImageExtractor.cpp
+++ b/tools/assimp_cmd/ImageExtractor.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_cmd/Info.cpp b/tools/assimp_cmd/Info.cpp
index d67974269..251b8b1c4 100644
--- a/tools/assimp_cmd/Info.cpp
+++ b/tools/assimp_cmd/Info.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_cmd/Main.cpp b/tools/assimp_cmd/Main.cpp
index 06c44f029..e95b3f565 100644
--- a/tools/assimp_cmd/Main.cpp
+++ b/tools/assimp_cmd/Main.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_cmd/Main.h b/tools/assimp_cmd/Main.h
index a95bc96f6..4b87e9a79 100644
--- a/tools/assimp_cmd/Main.h
+++ b/tools/assimp_cmd/Main.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_cmd/WriteDump.cpp b/tools/assimp_cmd/WriteDump.cpp
index 4ada408fd..8780331c2 100644
--- a/tools/assimp_cmd/WriteDump.cpp
+++ b/tools/assimp_cmd/WriteDump.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_cmd/assimp_cmd.rc b/tools/assimp_cmd/assimp_cmd.rc
index 2ead81bcb..63478d356 100644
--- a/tools/assimp_cmd/assimp_cmd.rc
+++ b/tools/assimp_cmd/assimp_cmd.rc
@@ -1,4 +1,4 @@
-#include "revision.h"
+#include <assimp/revision.h>
 #if defined(__GNUC__) && defined(_WIN32)
 	#include "winresrc.h"
 #else
diff --git a/tools/assimp_view/AnimEvaluator.cpp b/tools/assimp_view/AnimEvaluator.cpp
index 4f8d1bda8..384e41882 100644
--- a/tools/assimp_view/AnimEvaluator.cpp
+++ b/tools/assimp_view/AnimEvaluator.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_view/AnimEvaluator.h b/tools/assimp_view/AnimEvaluator.h
index aa44ab211..1d16398cb 100644
--- a/tools/assimp_view/AnimEvaluator.h
+++ b/tools/assimp_view/AnimEvaluator.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_view/AssetHelper.h b/tools/assimp_view/AssetHelper.h
index 8661d875f..e68694b36 100644
--- a/tools/assimp_view/AssetHelper.h
+++ b/tools/assimp_view/AssetHelper.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_view/Background.cpp b/tools/assimp_view/Background.cpp
index e49630204..e38c53754 100644
--- a/tools/assimp_view/Background.cpp
+++ b/tools/assimp_view/Background.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_view/CMakeLists.txt b/tools/assimp_view/CMakeLists.txt
index a5a9eed35..8720618a7 100644
--- a/tools/assimp_view/CMakeLists.txt
+++ b/tools/assimp_view/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Open Asset Import Library (assimp)
 # ----------------------------------------------------------------------
 #
-# Copyright (c) 2006-2022, assimp team
+# Copyright (c) 2006-2025, assimp team
 
 
 # All rights reserved.
diff --git a/tools/assimp_view/Display.cpp b/tools/assimp_view/Display.cpp
index 95ed41615..aa4608455 100644
--- a/tools/assimp_view/Display.cpp
+++ b/tools/assimp_view/Display.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -106,6 +106,11 @@ int CDisplay::EnableAnimTools(BOOL hm) {
     EnableWindow(GetDlgItem(g_hDlg,IDC_PLAY),hm);
     EnableWindow(GetDlgItem(g_hDlg,IDC_SLIDERANIM),hm);
 
+    if (hm == FALSE) {
+        g_dCurrent = 0.0;
+        SendDlgItemMessage(g_hDlg, IDC_SLIDERANIM, TBM_SETPOS, TRUE, LPARAM(0));
+    }
+
     return 1;
 }
 
@@ -115,9 +120,16 @@ int CDisplay::FillAnimList(void) {
     if (0 != g_pcAsset->pcScene->mNumAnimations)
     {
         // now fill in all animation names
-        for (unsigned int i = 0; i < g_pcAsset->pcScene->mNumAnimations;++i)    {
+        for (unsigned int i = 0; i < g_pcAsset->pcScene->mNumAnimations; ++i)
+        {
+            std::string animationLabel(g_pcAsset->pcScene->mAnimations[i]->mName.data);
+            if (animationLabel.empty())
+            {
+                animationLabel = std::string("Animation ") + std::to_string(i) + " (UNNAMED)";
+            }
+
             SendDlgItemMessage(g_hDlg,IDC_COMBO1,CB_ADDSTRING,0,
-                ( LPARAM ) g_pcAsset->pcScene->mAnimations[i]->mName.data);
+                    (LPARAM)animationLabel.c_str());
         }
 
         // also add a dummy - 'none'
@@ -139,6 +151,7 @@ int CDisplay::ClearAnimList(void)
 {
     // clear the combo box
     SendDlgItemMessage(g_hDlg,IDC_COMBO1,CB_RESETCONTENT,0,0);
+    EnableAnimTools(FALSE);
     return 1;
 }
 //-------------------------------------------------------------------------------
@@ -161,7 +174,7 @@ int CDisplay::AddNodeToDisplayList(
     ai_assert(nullptr != pcNode);
     ai_assert(nullptr != hRoot);
 
-    char chTemp[MAXLEN];
+    char chTemp[AI_MAXLEN];
 
     if(0 == pcNode->mName.length)   {
         if (iIndex >= 100)  {
@@ -173,12 +186,12 @@ int CDisplay::AddNodeToDisplayList(
         }
         else
 			iIndex += iDepth  * 10;
-        ai_snprintf(chTemp, MAXLEN,"Node %u",iIndex);
+        ai_snprintf(chTemp,AI_MAXLEN,"Node %u",iIndex);
     }
     else {
-        ai_snprintf(chTemp, MAXLEN,"%s",pcNode->mName.data);
+        ai_snprintf(chTemp, AI_MAXLEN, "%s", pcNode->mName.data);
     }
-    ai_snprintf(chTemp+strlen(chTemp), MAXLEN- strlen(chTemp),  iIndex ? " (%i)" : " (%i meshes)",pcNode->mNumMeshes);
+    ai_snprintf(chTemp + strlen(chTemp), AI_MAXLEN - strlen(chTemp), iIndex ? " (%i)" : " (%i meshes)", pcNode->mNumMeshes);
 
     TVITEMEXW tvi;
     TVINSERTSTRUCTW sNew;
@@ -223,15 +236,15 @@ int CDisplay::AddMeshToDisplayList(unsigned int iIndex, HTREEITEM hRoot)
 {
     aiMesh* pcMesh = g_pcAsset->pcScene->mMeshes[iIndex];
 
-    char chTemp[MAXLEN];
+    char chTemp[AI_MAXLEN];
 
     if(0 == pcMesh->mName.length)   {
-        ai_snprintf(chTemp,MAXLEN,"Mesh %u",iIndex);
+        ai_snprintf(chTemp, AI_MAXLEN, "Mesh %u", iIndex);
     }
     else {
-        ai_snprintf(chTemp,MAXLEN,"%s",pcMesh->mName.data);
+        ai_snprintf(chTemp, AI_MAXLEN, "%s", pcMesh->mName.data);
     }
-    ai_snprintf(chTemp+strlen(chTemp),MAXLEN-strlen(chTemp),  iIndex ? " (%i)" : " (%i faces)",pcMesh->mNumFaces);
+    ai_snprintf(chTemp + strlen(chTemp), AI_MAXLEN - strlen(chTemp), iIndex ? " (%i)" : " (%i faces)", pcMesh->mNumFaces);
 
     TVITEMEXW tvi;
     TVINSERTSTRUCTW sNew;
@@ -267,8 +280,7 @@ int CDisplay::AddMeshToDisplayList(unsigned int iIndex, HTREEITEM hRoot)
 
 //-------------------------------------------------------------------------------
 // Replace the currently selected texture by another one
-int CDisplay::ReplaceCurrentTexture(const char* szPath)
-{
+int CDisplay::ReplaceCurrentTexture(const char* szPath) {
     ai_assert(nullptr != szPath);
 
     // well ... try to load it
@@ -518,20 +530,19 @@ int CDisplay::AddTextureToDisplayList(unsigned int iType,
     return 1;
 }
 //-------------------------------------------------------------------------------
-int CDisplay::AddMaterialToDisplayList(HTREEITEM hRoot,
-    unsigned int iIndex)
-{
+int CDisplay::AddMaterialToDisplayList(HTREEITEM hRoot, unsigned int iIndex) {
     ai_assert(nullptr != hRoot);
 
     aiMaterial* pcMat = g_pcAsset->pcScene->mMaterials[iIndex];
 
+    if (g_pcAsset->pcScene->mNumMeshes == 0) {
+        return -1;
+    }
 
     // find the first mesh using this material index
     unsigned int iMesh = 0;
-    for (unsigned int i = 0; i < g_pcAsset->pcScene->mNumMeshes;++i)
-    {
-        if (iIndex == g_pcAsset->pcScene->mMeshes[i]->mMaterialIndex)
-        {
+    for (unsigned int i = 0; i < g_pcAsset->pcScene->mNumMeshes;++i) {
+        if (iIndex == g_pcAsset->pcScene->mMeshes[i]->mMaterialIndex) {
             iMesh = i;
             break;
         }
@@ -540,12 +551,9 @@ int CDisplay::AddMaterialToDisplayList(HTREEITEM hRoot,
     // use the name of the material, if possible
     char chTemp[512];
     aiString szOut;
-    if (AI_SUCCESS != aiGetMaterialString(pcMat,AI_MATKEY_NAME,&szOut))
-    {
+    if (AI_SUCCESS != aiGetMaterialString(pcMat,AI_MATKEY_NAME,&szOut)) {
         ai_snprintf(chTemp,512,"Material %i",iIndex+1);
-    }
-    else
-    {
+    } else {
         ai_snprintf(chTemp,512,"%s (%i)",szOut.data,iIndex+1);
     }
     TVITEMEXW tvi;
@@ -577,17 +585,15 @@ int CDisplay::AddMaterialToDisplayList(HTREEITEM hRoot,
     aiTextureOp eOp;
     aiString szPath;
     bool bNoOpacity = true;
-    for (unsigned int i = 0; i <= AI_TEXTURE_TYPE_MAX;++i)
-    {
+    for (unsigned int i = 0; i <= AI_TEXTURE_TYPE_MAX;++i) {
         unsigned int iNum = 0;
-        while (true)
-        {
-            if (AI_SUCCESS != aiGetMaterialTexture(pcMat,(aiTextureType)i,iNum,
-                &szPath,nullptr, &iUV,&fBlend,&eOp))
-            {
+        while (true) {
+            if (AI_SUCCESS != aiGetMaterialTexture(pcMat,(aiTextureType)i,iNum, &szPath,nullptr, &iUV,&fBlend,&eOp)) {
                 break;
             }
-            if (aiTextureType_OPACITY == i)bNoOpacity = false;
+            if (aiTextureType_OPACITY == i) {
+                bNoOpacity = false;
+            }
             AddTextureToDisplayList(i,iNum,&szPath,hTexture,iUV,fBlend,eOp,iMesh);
             ++iNum;
         }
@@ -595,8 +601,7 @@ int CDisplay::AddMaterialToDisplayList(HTREEITEM hRoot,
 
     AssetHelper::MeshHelper* pcMesh = g_pcAsset->apcMeshes[iMesh];
 
-    if (pcMesh->piDiffuseTexture && pcMesh->piDiffuseTexture == pcMesh->piOpacityTexture && bNoOpacity)
-    {
+    if (pcMesh->piDiffuseTexture && pcMesh->piDiffuseTexture == pcMesh->piOpacityTexture && bNoOpacity) {
         // check whether the diffuse texture is not a default texture
 
         // {9785DA94-1D96-426b-B3CB-BADC36347F5E}
@@ -606,9 +611,7 @@ int CDisplay::AddMaterialToDisplayList(HTREEITEM hRoot,
 
         uint32_t iData = 0;
         DWORD dwSize = 4;
-        if(FAILED( pcMesh->piDiffuseTexture->GetPrivateData(guidPrivateData,&iData,&dwSize) ||
-            0xffffffff == iData))
-        {
+        if(FAILED( pcMesh->piDiffuseTexture->GetPrivateData(guidPrivateData,&iData,&dwSize) || 0xffffffff == iData)) {
             // seems the diffuse texture contains alpha, therefore it has been
             // added to the opacity channel, too. Add a special value ...
             AddTextureToDisplayList(aiTextureType_OPACITY | 0x40000000,
@@ -625,33 +628,26 @@ int CDisplay::AddMaterialToDisplayList(HTREEITEM hRoot,
     this->AddMaterial(info);
     return 1;
 }
+
 //-------------------------------------------------------------------------------
 // Expand all elements in the tree-view
-int CDisplay::ExpandTree()
-{
+int CDisplay::ExpandTree() {
     // expand all materials
-    for (std::vector< MaterialInfo >::iterator
-        i =  m_asMaterials.begin();
-        i != m_asMaterials.end();++i)
-    {
+    for (std::vector< MaterialInfo >::iterator i =  m_asMaterials.begin();  i != m_asMaterials.end();++i) {
         TreeView_Expand(GetDlgItem(g_hDlg,IDC_TREE1),(*i).hTreeItem,TVE_EXPAND);
     }
     // expand all nodes
-    for (std::vector< NodeInfo >::iterator
-        i =  m_asNodes.begin();
-        i != m_asNodes.end();++i)
-    {
+    for (std::vector< NodeInfo >::iterator i =  m_asNodes.begin(); i != m_asNodes.end();++i) {
         TreeView_Expand(GetDlgItem(g_hDlg,IDC_TREE1),(*i).hTreeItem,TVE_EXPAND);
     }
     TreeView_Expand(GetDlgItem(g_hDlg,IDC_TREE1),m_hRoot,TVE_EXPAND);
     return 1;
 }
+
 //-------------------------------------------------------------------------------
 // Get image list for tree view
-int CDisplay::LoadImageList(void)
-{
-    if (!m_hImageList)
-    {
+int CDisplay::LoadImageList() {
+    if (!m_hImageList) {
         // First, create the image list we will need.
         // FIX: Need RGB888 color space to display all colors correctly
         HIMAGELIST hIml = ImageList_Create( 16,16,ILC_COLOR24, 5, 0 );
@@ -682,12 +678,13 @@ int CDisplay::LoadImageList(void)
 
         m_hImageList = hIml;
     }
+
     return 1;
 }
+
 //-------------------------------------------------------------------------------
 // Fill tree view
-int CDisplay::FillDisplayList(void)
-{
+int CDisplay::FillDisplayList(void) {
     LoadImageList();
 
     // Initialize the tree view window.
@@ -713,11 +710,11 @@ int CDisplay::FillDisplayList(void)
         (LPARAM)(LPTVINSERTSTRUCT)&sNew);
 
     // add each loaded material to the tree
-    for (unsigned int i = 0; i < g_pcAsset->pcScene->mNumMaterials;++i)
+    for (unsigned int i = 0; i < g_pcAsset->pcScene->mNumMaterials; ++i)
         AddMaterialToDisplayList(m_hRoot,i);
 
     // add each mesh to the tree
-    for (unsigned int i = 0; i < g_pcAsset->pcScene->mNumMeshes;++i)
+    for (unsigned int i = 0; i < g_pcAsset->pcScene->mNumMeshes; ++i)
         AddMeshToDisplayList(i,m_hRoot);
 
     // now add all loaded nodes recursively
@@ -729,8 +726,10 @@ int CDisplay::FillDisplayList(void)
     // everything reacts a little bit slowly if D3D is rendering,
     // so give GDI a small hint to leave the couch and work ;-)
     UpdateWindow(g_hDlg);
+    
     return 1;
 }
+
 //-------------------------------------------------------------------------------
 // Main render loop
 int CDisplay::OnRender()
@@ -738,23 +737,25 @@ int CDisplay::OnRender()
     // update possible animation
     if( g_pcAsset)
     {
-        static double lastPlaying = 0.;
+        static double lastRenderTime = 0.;
 
         ai_assert( g_pcAsset->mAnimator);
+        double currentTime = clock() / double(CLOCKS_PER_SEC);
         if (g_bPlay) {
-            g_dCurrent += clock()/ double( CLOCKS_PER_SEC)   -lastPlaying;
+            g_dCurrent += currentTime - lastRenderTime;
 
             double time = g_dCurrent;
             aiAnimation* mAnim = g_pcAsset->mAnimator->CurrentAnim();
-            if(  mAnim && mAnim->mDuration > 0.0) {
-                double tps = mAnim->mTicksPerSecond ? mAnim->mTicksPerSecond : 25.f;
-                time = fmod( time, mAnim->mDuration/tps);
-                SendDlgItemMessage(g_hDlg,IDC_SLIDERANIM,TBM_SETPOS,TRUE,LPARAM(10000 * (time/(mAnim->mDuration/tps))));
+            if (mAnim && mAnim->mDuration > 0.0) {
+                double tps = mAnim->mTicksPerSecond ? mAnim->mTicksPerSecond : ANIM_DEFAULT_TICKS_PER_SECOND;
+                time = fmod(time, mAnim->mDuration/tps);
+                SendDlgItemMessage(g_hDlg, IDC_SLIDERANIM, TBM_SETPOS, TRUE, LPARAM(ANIM_SLIDER_MAX * (time / (mAnim->mDuration / tps))));
             }
 
             g_pcAsset->mAnimator->Calculate( time );
-            lastPlaying = g_dCurrent;
         }
+
+        lastRenderTime = currentTime;
     }
     // begin the frame
     g_piDevice->BeginScene();
@@ -806,8 +807,10 @@ int CDisplay::FillDefaultStatistics(void)
         SetDlgItemText(g_hDlg,IDC_EVERT,"0");
         SetDlgItemText(g_hDlg,IDC_EFACE,"0");
         SetDlgItemText(g_hDlg,IDC_EMAT,"0");
-        SetDlgItemText(g_hDlg,IDC_ENODE,"0");
+        SetDlgItemText(g_hDlg,IDC_EMESH,"0");
+        SetDlgItemText(g_hDlg,IDC_ENODEWND,"0");
         SetDlgItemText(g_hDlg,IDC_ESHADER,"0");
+        SetDlgItemText(g_hDlg,IDC_ELOAD,"");
         SetDlgItemText(g_hDlg,IDC_ETEX,"0");
         return 1;
     }
@@ -890,7 +893,7 @@ int CDisplay::OnSetupNormalView()
     SetWindowText(GetDlgItem(g_hDlg,IDC_NUMSHADERS),"Shaders:");
     SetWindowText(GetDlgItem(g_hDlg,IDC_NUMMATS),"Materials:");
     SetWindowText(GetDlgItem(g_hDlg,IDC_NUMMESHES),"Meshes:");
-    SetWindowText(GetDlgItem(g_hDlg,IDC_LOADTIME),"Time:");
+    SetWindowText(GetDlgItem(g_hDlg,IDC_LOADTIME),"Loading Time:");
 
     FillDefaultStatistics();
     SetViewMode(VIEWMODE_FULL);
diff --git a/tools/assimp_view/HelpDialog.cpp b/tools/assimp_view/HelpDialog.cpp
index fde4e1caf..36b1eca58 100644
--- a/tools/assimp_view/HelpDialog.cpp
+++ b/tools/assimp_view/HelpDialog.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_view/Input.cpp b/tools/assimp_view/Input.cpp
index b8572d792..d30a95723 100644
--- a/tools/assimp_view/Input.cpp
+++ b/tools/assimp_view/Input.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_view/LogDisplay.cpp b/tools/assimp_view/LogDisplay.cpp
index 1bd650c08..daec09879 100644
--- a/tools/assimp_view/LogDisplay.cpp
+++ b/tools/assimp_view/LogDisplay.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_view/LogWindow.cpp b/tools/assimp_view/LogWindow.cpp
index 8e80bf564..60427a9fb 100644
--- a/tools/assimp_view/LogWindow.cpp
+++ b/tools/assimp_view/LogWindow.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_view/Material.cpp b/tools/assimp_view/Material.cpp
index c28231332..1a568272a 100644
--- a/tools/assimp_view/Material.cpp
+++ b/tools/assimp_view/Material.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -281,7 +281,7 @@ bool CMaterialManager::TryLongerPath(char* szTemp,aiString* p_szString)
                             // copy the result string back to the aiString
                             const size_t iLen = strlen(szTempB);
                             size_t iLen2 = iLen+1;
-                            iLen2 = iLen2 > MAXLEN ? MAXLEN : iLen2;
+                            iLen2 = iLen2 > AI_MAXLEN ? AI_MAXLEN : iLen2;
                             memcpy(p_szString->data,szTempB,iLen2);
                             p_szString->length = static_cast<ai_uint32>(iLen);
                             return true;
@@ -295,7 +295,7 @@ bool CMaterialManager::TryLongerPath(char* szTemp,aiString* p_szString)
                         // copy the result string back to the aiString
                         const size_t iLen = strlen(szTempB);
                         size_t iLen2 = iLen+1;
-                        iLen2 = iLen2 > MAXLEN ? MAXLEN : iLen2;
+                        iLen2 = iLen2 > AI_MAXLEN ? AI_MAXLEN : iLen2;
                         memcpy(p_szString->data,szTempB,iLen2);
                         p_szString->length = static_cast<ai_uint32>(iLen);
                         return true;
@@ -402,7 +402,7 @@ int CMaterialManager::FindValidPath(aiString* p_szString)
         // copy the result string back to the aiStr
         const size_t len = strlen(szTemp);
         size_t len2 = len+1;
-        len2 = len2 > MAXLEN ? MAXLEN : len2;
+        len2 = len2 > AI_MAXLEN ? AI_MAXLEN : len2;
         memcpy(p_szString->data, szTemp, len2);
         p_szString->length = static_cast<ai_uint32>(len);
     }
diff --git a/tools/assimp_view/MaterialManager.h b/tools/assimp_view/MaterialManager.h
index b708fb337..60e6b4d0f 100644
--- a/tools/assimp_view/MaterialManager.h
+++ b/tools/assimp_view/MaterialManager.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_view/MeshRenderer.cpp b/tools/assimp_view/MeshRenderer.cpp
index 655e99d0b..dc2e83c7b 100644
--- a/tools/assimp_view/MeshRenderer.cpp
+++ b/tools/assimp_view/MeshRenderer.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_view/MessageProc.cpp b/tools/assimp_view/MessageProc.cpp
index aea65a8d5..762acbdce 100644
--- a/tools/assimp_view/MessageProc.cpp
+++ b/tools/assimp_view/MessageProc.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -842,7 +842,7 @@ void OpenAsset() {
     aiString sz;
     aiGetExtensionList(&sz);
 
-    char szList[MAXLEN + 100];
+    char szList[AI_MAXLEN + 100];
     strcpy(szList,"ASSIMP assets");
     char* szCur = szList + 14;
     strcpy(szCur,sz.data);
@@ -874,9 +874,10 @@ void OpenAsset() {
     RegSetValueExA(g_hRegistry,"CurrentApp",0,REG_SZ,(const BYTE*)szFileName,MAX_PATH);
 
     if (0 != strcmp(g_szFileName,szFileName)) {
-        strcpy(g_szFileName, szFileName);
         DeleteAssetData();
         DeleteAsset();
+
+        strcpy(g_szFileName, szFileName);
         LoadAsset();
 
         // update the history
@@ -1197,7 +1198,7 @@ void InitUI() {
     LoadCheckerPatternColors();
 
     SendDlgItemMessage(g_hDlg,IDC_SLIDERANIM,TBM_SETRANGEMIN,TRUE,0);
-    SendDlgItemMessage(g_hDlg,IDC_SLIDERANIM,TBM_SETRANGEMAX,TRUE,10000);
+    SendDlgItemMessage(g_hDlg,IDC_SLIDERANIM,TBM_SETRANGEMAX,TRUE,ANIM_SLIDER_MAX);
 }
 
 //-------------------------------------------------------------------------------
@@ -1274,11 +1275,14 @@ INT_PTR CALLBACK MessageProc(HWND hwndDlg,UINT uMsg, WPARAM wParam,LPARAM lParam
             // XXX quick and dirty fix for #3029892
             if (GetDlgItem(g_hDlg, IDC_SLIDERANIM) == (HWND)lParam && g_pcAsset && g_pcAsset->pcScene->mAnimations)
             {
-                double num = (double)SendDlgItemMessage(g_hDlg,IDC_SLIDERANIM,TBM_GETPOS,0,0);
                 const aiAnimation* anim = g_pcAsset->pcScene->mAnimations[ g_pcAsset->mAnimator->CurrentAnimIndex() ];
-
-                g_dCurrent = (anim->mDuration/anim->mTicksPerSecond) * num/10000;
-                g_pcAsset->mAnimator->Calculate(g_dCurrent);
+                if (anim && anim->mDuration > 0.0)
+                {
+                    double tps = anim->mTicksPerSecond ? anim->mTicksPerSecond : ANIM_DEFAULT_TICKS_PER_SECOND;
+                    double sliderValue = (double)SendDlgItemMessage(g_hDlg, IDC_SLIDERANIM, TBM_GETPOS, 0, 0);
+                    g_dCurrent = (anim->mDuration / tps) * sliderValue / ANIM_SLIDER_MAX;
+                    g_pcAsset->mAnimator->Calculate(g_dCurrent);
+                }
             }
             break;
 
@@ -1666,10 +1670,11 @@ INT_PTR CALLBACK MessageProc(HWND hwndDlg,UINT uMsg, WPARAM wParam,LPARAM lParam
                         }
                         fclose(pFile);
                     } else {
-                        strcpy(g_szFileName,szFile);
-
                         DeleteAsset();
+
+                        strcpy(g_szFileName, szFile);
                         LoadAsset();
+
                         UpdateHistory();
                         SaveHistory();
                     }
@@ -1690,6 +1695,9 @@ INT_PTR CALLBACK MessageProc(HWND hwndDlg,UINT uMsg, WPARAM wParam,LPARAM lParam
                         g_pcAsset->mAnimator->SetAnimIndex(sel);
                         SendDlgItemMessage(hwndDlg,IDC_SLIDERANIM,TBM_SETPOS,TRUE,0);
                     }
+
+                    const size_t count = static_cast<size_t>(ComboBox_GetCount(GetDlgItem(hwndDlg, IDC_COMBO1)));
+                    CDisplay::Instance().EnableAnimTools(g_pcAsset && count > 0 && sel < count - 1 ? TRUE : FALSE);
                 }
             } else if (ID_VIEWER_RESETVIEW == LOWORD(wParam)) {
                 g_sCamera.vPos = aiVector3D(0.0f,0.0f,-10.0f);
@@ -1827,7 +1835,12 @@ INT_PTR CALLBACK MessageProc(HWND hwndDlg,UINT uMsg, WPARAM wParam,LPARAM lParam
             }
             else if (ID_VIEWER_RELOAD == LOWORD(wParam))
             {
+                // Save the filename to reload and clear
+                char toReloadFileName[MAX_PATH];
+                strcpy(toReloadFileName, g_szFileName);
                 DeleteAsset();
+
+                strcpy(g_szFileName, toReloadFileName);
                 LoadAsset();
             }
             else if (ID_IMPORTSETTINGS_RESETTODEFAULT == LOWORD(wParam))
@@ -2036,9 +2049,10 @@ INT_PTR CALLBACK MessageProc(HWND hwndDlg,UINT uMsg, WPARAM wParam,LPARAM lParam
             {
                 if (AI_VIEW_RECENT_FILE_ID(i) == LOWORD(wParam))
                 {
-                    strcpy(g_szFileName,g_aPreviousFiles[i].c_str());
                     DeleteAssetData();
                     DeleteAsset();
+
+                    strcpy(g_szFileName, g_aPreviousFiles[i].c_str());
                     LoadAsset();
 
                     // update and safe the history
@@ -2209,6 +2223,8 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
     CLogDisplay::Instance().AddEntry("[OK] Here we go!");
 
+    CDisplay::Instance().EnableAnimTools(FALSE);
+
     // create the log window
     CLogWindow::Instance().Init();
     // set the focus to the main window
@@ -2397,7 +2413,6 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
                 }
             }
 
-
         // render the scene
         CDisplay::Instance().OnRender();
 
diff --git a/tools/assimp_view/Normals.cpp b/tools/assimp_view/Normals.cpp
index b76408939..167629ca9 100644
--- a/tools/assimp_view/Normals.cpp
+++ b/tools/assimp_view/Normals.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_view/SceneAnimator.cpp b/tools/assimp_view/SceneAnimator.cpp
index c8b20229e..8f52bdcaf 100644
--- a/tools/assimp_view/SceneAnimator.cpp
+++ b/tools/assimp_view/SceneAnimator.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_view/SceneAnimator.h b/tools/assimp_view/SceneAnimator.h
index 454357f30..de500b955 100644
--- a/tools/assimp_view/SceneAnimator.h
+++ b/tools/assimp_view/SceneAnimator.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_view/Shaders.cpp b/tools/assimp_view/Shaders.cpp
index 9fd05ca8d..538822dfa 100644
--- a/tools/assimp_view/Shaders.cpp
+++ b/tools/assimp_view/Shaders.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
diff --git a/tools/assimp_view/assimp_view.cpp b/tools/assimp_view/assimp_view.cpp
index 8f2d131d2..bf86d4790 100644
--- a/tools/assimp_view/assimp_view.cpp
+++ b/tools/assimp_view/assimp_view.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -81,7 +81,7 @@ float g_fWheelPos = -10.0f;
 bool g_bLoadingCanceled = false;
 IDirect3DTexture9 *g_pcTexture = nullptr;
 bool g_bPlay = false;
-double g_dCurrent = 0.;
+double g_dCurrent = 0.; // Animation time
 
 // default pp steps
 unsigned int ppsteps = aiProcess_CalcTangentSpace | // calculate tangents and bitangents if possible
@@ -191,8 +191,8 @@ DWORD WINAPI LoadThreadProc(LPVOID) {
 }
 
 //-------------------------------------------------------------------------------
-// load the current asset
-// THe path to the asset is specified in the global path variable
+// Load the current asset
+// The path to the asset is specified in the global variable g_szFileName
 //-------------------------------------------------------------------------------
 int LoadAsset() {
     // set the world and world rotation matrices to the identity
@@ -267,14 +267,6 @@ int LoadAsset() {
     if (1 != CreateAssetData())
         return 0;
 
-    if (!g_pcAsset->pcScene->HasAnimations()) {
-        EnableWindow(GetDlgItem(g_hDlg, IDC_PLAY), FALSE);
-        EnableWindow(GetDlgItem(g_hDlg, IDC_SLIDERANIM), FALSE);
-    } else {
-        EnableWindow(GetDlgItem(g_hDlg, IDC_PLAY), TRUE);
-        EnableWindow(GetDlgItem(g_hDlg, IDC_SLIDERANIM), TRUE);
-    }
-
     CLogDisplay::Instance().AddEntry("[OK] The asset has been loaded successfully");
     CDisplay::Instance().FillDisplayList();
     CDisplay::Instance().FillAnimList();
@@ -312,6 +304,8 @@ int DeleteAsset(void) {
     delete g_pcAsset;
     g_pcAsset = nullptr;
 
+    g_szFileName[0] = '\0';
+
     // reset the caption of the viewer window
     SetWindowText(g_hDlg, AI_VIEW_CAPTION_BASE);
 
diff --git a/tools/assimp_view/assimp_view.h b/tools/assimp_view/assimp_view.h
index e67cc9fd0..184d8d771 100644
--- a/tools/assimp_view/assimp_view.h
+++ b/tools/assimp_view/assimp_view.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2025, assimp team
 
 All rights reserved.
 
@@ -78,6 +78,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // default movement speed
 #define MOVE_SPEED 3.f
 
+// Anim constants
+#define ANIM_DEFAULT_TICKS_PER_SECOND 25.f
+#define ANIM_SLIDER_MAX 10000
+
 #include "AssetHelper.h"
 #include "Background.h"
 #include "Camera.h"
diff --git a/tools/assimp_view/assimp_view.rc b/tools/assimp_view/assimp_view.rc
index 8575df1ff..10b762059 100644
--- a/tools/assimp_view/assimp_view.rc
+++ b/tools/assimp_view/assimp_view.rc
@@ -1,7 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
-#include "revision.h"
+#include <assimp/revision.h>
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -80,32 +80,32 @@ BEGIN
     CONTROL         "Two lights [L]",IDC_3LIGHTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,393,80,10
     CONTROL         "Backface culling [C]",IDC_BFCULL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,405,80,10
     CONTROL         "No transparency [T]",IDC_NOAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,417,80,10
-    GROUPBOX        "Statistics",IDC_STATIC,186,345,164,63
+    GROUPBOX        "Statistics",IDC_STATIC,186,345,200,63
     LTEXT           "Vertices:",IDC_NUMVERTS,192,357,35,8
     LTEXT           "Nodes:",IDC_NUMNODES,192,369,35,8
     LTEXT           "Shaders:",IDC_NUMSHADERS,192,381,35,8
-    LTEXT           "Time:",IDC_LOADTIME,192,393,35,8
-    EDITTEXT        IDC_EVERT,227,357,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    EDITTEXT        IDC_ENODEWND,227,369,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    EDITTEXT        IDC_ESHADER,227,381,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    EDITTEXT        IDC_ELOAD,227,393,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    LTEXT           "Faces:",IDC_NUMFACES,272,357,35,8
-    LTEXT           "Materials:",IDC_NUMMATS,272,369,35,8
-    LTEXT           "Meshes:",IDC_NUMMESHES,272,381,35,8
-    LTEXT           "FPS:",IDC_FPS,272,393,35,8
-    EDITTEXT        IDC_EFACE,307,357,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    EDITTEXT        IDC_EMAT,307,369,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    EDITTEXT        IDC_EMESH,307,381,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    EDITTEXT        IDC_EFPS,307,393,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    LTEXT           "Loading Time:",IDC_LOADTIME,192,393,46,8
+    EDITTEXT        IDC_EVERT,241,357,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    EDITTEXT        IDC_ENODEWND,241,369,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    EDITTEXT        IDC_ESHADER,241,381,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    EDITTEXT        IDC_ELOAD,241,393,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    LTEXT           "Faces:",IDC_NUMFACES,306,357,35,8
+    LTEXT           "Materials:",IDC_NUMMATS,306,369,35,8
+    LTEXT           "Meshes:",IDC_NUMMESHES,306,381,35,8
+    LTEXT           "FPS:",IDC_FPS,306,393,35,8
+    EDITTEXT        IDC_EFACE,341,357,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    EDITTEXT        IDC_EMAT,341,369,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    EDITTEXT        IDC_EMESH,341,381,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    EDITTEXT        IDC_EFPS,341,393,35,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
     EDITTEXT        IDC_VIEWMATRIX,192,412,72,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE | NOT WS_BORDER
-    GROUPBOX        "Colors",IDC_STATIC,357,345,109,87
-    LTEXT           "Primary:",IDC_STATIC,363,360,48,8
-    LTEXT           "Secondary:",IDC_STATIC,363,378,54,8
-    LTEXT           "Ambient:",IDC_STATIC,363,396,54,8
-    CONTROL         "Button1",IDC_LCOLOR1,"Button",BS_OWNERDRAW | WS_TABSTOP,423,357,35,14
-    CONTROL         "Button1",IDC_LCOLOR2,"Button",BS_OWNERDRAW | WS_TABSTOP,423,375,35,14
-    CONTROL         "Button1",IDC_LCOLOR3,"Button",BS_OWNERDRAW | WS_TABSTOP,423,393,35,14
-    PUSHBUTTON      "Reset",IDC_LRESET,423,411,35,14
+    GROUPBOX        "Colors",IDC_STATIC,397,345,109,87
+    LTEXT           "Primary:",IDC_STATIC,403,360,48,8
+    LTEXT           "Secondary:",IDC_STATIC,403,377,54,8
+    LTEXT           "Ambient:",IDC_STATIC,403,396,54,8
+    CONTROL         "Button1",IDC_LCOLOR1,"Button",BS_OWNERDRAW | WS_TABSTOP,463,357,35,14
+    CONTROL         "Button1",IDC_LCOLOR2,"Button",BS_OWNERDRAW | WS_TABSTOP,463,374,35,14
+    CONTROL         "Button1",IDC_LCOLOR3,"Button",BS_OWNERDRAW | WS_TABSTOP,463,393,35,14
+    PUSHBUTTON      "Reset",IDC_LRESET,463,411,35,14
 END
 
 IDD_LOADDIALOG DIALOGEX 0, 0, 143, 60
diff --git a/tools/make/build_env_win32.bat b/tools/make/build_env_win32.bat
deleted file mode 100644
index 4b8b4674b..000000000
--- a/tools/make/build_env_win32.bat
+++ /dev/null
@@ -1,57 +0,0 @@
-@echo off
-set "initialdir=%cd%"
-goto:main
-
-:exitsucc
-cd /d "%initialdir%"
-set initialdir=
-
-set MSBUILD_15="C:\Program Files (x86)\Microsoft Visual Studio\2018\Professional\MSBuild\15.0\Bin\msbuild.exe"
-set MSBUILD_14="C:\Program Files (x86)\MSBuild\14.0\Bin\msbuild.exe"
-
-if not "%VS150%"=="" set MSBUILD_15="%VS150%\MSBuild\15.0\Bin\msbuild.exe"
-
-if /i %VS_VERSION%==2017 (
-	set MS_BUILD_EXE=%MSBUILD_15%
-	set PLATFORM_VER=v141
-) else (
-	set MS_BUILD_EXE=%MSBUILD_14%
-	set PLATFORM_VER=v140
-)
-
-set MSBUILD=%MS_BUILD_EXE%
-
-exit /b 0
-
-:main
-if not defined PLATFORM set "PLATFORM=x64"
-
-::my work here is done?
-
-set PATH_VSWHERE=C:\Program Files (x86)\Microsoft Visual Studio\Installer\
-REM set PATH_STUDIO="C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\"
-
-for /f "usebackq tokens=*" %%i in (`"%PATH_VSWHERE%vswhere" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do (
-  set InstallDir=%%i
-)
-
-IF EXIST "%InstallDir%\VC\Auxiliary\Build\vcvarsall.bat" set VS150=%InstallDir%\
-
-set "CMAKE_GENERATOR=Visual Studio 15 2017 Win64"
-if not "%VS150%"=="" call "%VS150%\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM% && echo found VS 2o17 && set PLATFORM_VER=v141 && set VS_VERSION=2017 && goto:exitsucc
-
-set "CMAKE_GENERATOR=Visual Studio 14 2015 Win64"
-if defined VS140COMNTOOLS call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %PLATFORM% && echo found VS 2o15 && set PLATFORM_VER=v140 && set VS_VERSION=2015 && goto:exitsucc
-
-if defined VS130COMNTOOLS echo call ghostbusters... found lost VS version
-
-set "CMAKE_GENERATOR=Visual Studio 12 2013 Win64"
-if defined VS120COMNTOOLS call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" %PLATFORM% && echo found VS 2o13 && set PLATFORM_VER=v120 && set VS_VERSION=2013 && goto:exitsucc
-
-set "CMAKE_GENERATOR=Visual Studio 11 2012 Win64"
-if defined VS110COMNTOOLS call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" %PLATFORM% && echo found VS 2o12 && set PLATFORM_VER=v110 && set VS_VERSION=2012 && goto:exitsucc
-
-set "CMAKE_GENERATOR=Visual Studio 10 2010 Win64"
-if defined VS100COMNTOOLS call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" %PLATFORM% && echo found VS 2o1o && set PLATFORM_VER=v100 && set VS_VERSION=2010 && goto:exitsucc
-
-goto:exitsucc
\ No newline at end of file
diff --git a/tools/make/make_all_win32_x64.bat b/tools/make/make_all_win32_x64.bat
deleted file mode 100644
index 4a1e663e6..000000000
--- a/tools/make/make_all_win32_x64.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-rem @echo off
-setlocal
-call build_env_win32.bat
-
-set BUILD_CONFIG=release
-set PLATFORM_CONFIG=x64
-set MAX_CPU_CONFIG=4
-
-set CONFIG_PARAMETER=/p:Configuration="%BUILD_CONFIG%"
-set PLATFORM_PARAMETER=/p:Platform="%PLATFORM_CONFIG%"
-set CPU_PARAMETER=/maxcpucount:%MAX_CPU_CONFIG%
-set PLATFORM_TOOLSET=/p:PlatformToolset=%PLATFORM_VER%
-
-pushd ..\..\
-cmake CMakeLists.txt -G "Visual Studio 15 2017 Win64"
-%MSBUILD% assimp.sln %CONFIG_PARAMETER% %PLATFORM_PARAMETER% %CPU_PARAMETER% %PLATFORM_TOOLSET%
-popd
-endlocal
diff --git a/tools/shared/assimp_tools_icon.bmp b/tools/shared/assimp_tools_icon.bmp
new file mode 100644
index 000000000..9cb03d059
Binary files /dev/null and b/tools/shared/assimp_tools_icon.bmp differ
diff --git a/tools/shared/assimp_tools_icon.png b/tools/shared/assimp_tools_icon.png
index 3e1c1883c..6b8c4bc03 100644
Binary files a/tools/shared/assimp_tools_icon.png and b/tools/shared/assimp_tools_icon.png differ